From 260ad701e251aaa71a1bf5531bd98d93cb91c2bf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 十一月 2025 11:18:57 +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 |   99 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 99 insertions(+), 0 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
new file mode 100644
index 0000000..57cba52
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
@@ -0,0 +1,99 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+public class ReportingWorkDetail {
+    @TableId(type = IdType.AUTO)
+    //鑷ID
+    private Integer id;
+    //鎶ュ伐缂栧彿
+    private String reportingWorkId;
+    //浜у搧搴忓彿
+    private String orderNumber;
+    //宸ヨ壓纭搴忓彿
+    private String technologyNumber;
+    //瀹屽伐鏁伴噺
+    private int completedQuantity;
+    //娆＄牬鏁伴噺
+    private int breakageQuantity;
+    //娆＄牬鍘熷洜
+    private String breakageReason;
+    //绫诲瀷
+    private String breakageType;
+    //瀹�
+    private Double childWidth;
+    //楂�
+    private Double childHeight;
+    //鍙埄鐢�
+    private Integer available;
+    //閫�鍥炲伐搴�
+    private String returnProcess;
+    //璐ｄ换宸ュ簭
+    private String responsibleProcess;
+    //璐ｄ换浜哄憳
+    private String responsiblePersonnel;
+    //璐ｄ换鐝粍
+    private String responsibleTeam;
+    //璐ｄ换璁惧
+    private String responsibleEquipment;
+    //璐ㄦ鍛�
+    private String qualityInspector;
+    //琛ョ墖鐘舵��
+    private Integer patchStatus;
+    //鍦ㄥ埗鍝佸悕绉�
+    private String workProgress;
+    //璐ㄦ鐘舵��
+    private Integer qualityInsStatus;
+    //鎶ュ伐绫诲瀷
+    private Integer type;
+
+    /*杩斿伐閮ㄥ垎*/
+    //杩斿伐鐝粍
+    private String reworkTeam;
+    //寰呰繑宸ユ暟閲�
+    private Integer waitReworkQuantity;
+    //杩斿伐瀹℃牳鐘舵��
+    private Integer reviewStatus;
+    //杩斿伐瀹℃牳浜�
+    private String reviewer;
+    //杩斿伐鏃堕棿
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate reworkTime;
+    //杩斿伐鏇存柊鏃堕棿
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate reworkUpdateTime;
+    //杩斿伐闈㈢Н
+   // private double reworkArea;
+
+    //鎶ュ伐淇敼鐢ㄨˉ鐗囩姸鎬�
+    @TableField(select = false,exist= false)
+    private String patchStatusOther;
+
+    //娆＄牬鍒楄〃
+    @TableField(select = false,exist= false)
+    private List<DamageDetails>
+    damageDetails;
+
+
+    //澶栭敭鎶ュ伐涓昏〃
+    @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