From ab6ac91b7ed9ae3f9c68766f499ece11585c8859 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 30 六月 2025 08:56:20 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
index bf4fef3..079c6e0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
@@ -1,9 +1,19 @@
package com.example.erp.entity.pp;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderGlassDetail;
import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
@Data
public class ReportingWorkDetail {
+ @TableId(type = IdType.AUTO)
//鑷ID
private Integer id;
//鎶ュ伐缂栧彿
@@ -13,11 +23,17 @@
//宸ヨ壓纭搴忓彿
private String technologyNumber;
//瀹屽伐鏁伴噺
- private Integer completedQuantity;
+ private int completedQuantity;
//娆＄牬鏁伴噺
- private Integer breakageNumber;
+ private int breakageQuantity;
//娆＄牬鍘熷洜
private String breakageReason;
+ //绫诲瀷
+ private String breakageType;
+ //瀹�
+ private Double childWidth;
+ //楂�
+ private Double childHeight;
//鍙埄鐢�
private Integer available;
//閫�鍥炲伐搴�
@@ -41,7 +57,40 @@
//鎶ュ伐绫诲瀷
private Integer type;
+ /*杩斿伐閮ㄥ垎*/
+ //杩斿伐鐝粍
+ private String reworkTeam;
+ //寰呰繑宸ユ暟閲�
+ private Integer waitReworkQuantity;
+ //杩斿伐瀹℃牳鐘舵��
+ private Integer reviewStatus;
+ //杩斿伐瀹℃牳浜�
+ private String reviewer;
+ //杩斿伐鏃堕棿
+ private LocalDate reworkTime;
+ //杩斿伐鏇存柊鏃堕棿
+ private LocalDate reworkUpdateTime;
+ //杩斿伐闈㈢Н
+ // private double reworkArea;
+
+ //鎶ュ伐淇敼鐢ㄨˉ鐗囩姸鎬�
+ @TableField(select = false,exist= false)
+ private String patchStatusOther;
+
+ //娆＄牬鍒楄〃
+ @TableField(select = false,exist= false)
+ private List<DamageDetails>
+ damageDetails;
+
+
//澶栭敭鎶ュ伐涓昏〃
- private ReportingWork reportingWork;
+ @TableField(select = false,exist= false)
+ private ReportingWork reportingWork;
+ @TableField(select = false,exist= false)
+ private Order order;
+ @TableField(select = false,exist= false)
+ private OrderDetail orderDetail;
+ @TableField(select = false,exist= false)
+ private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0