From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java |   64 ++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
index 86d5256..a1c945e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
@@ -1,10 +1,16 @@
 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.time.LocalDateTime;
+
 @Data
 public class ReportingWork {
     @TableId(type = IdType.AUTO)
@@ -29,19 +35,19 @@
     //鏈伐搴�
     private String thisProcess;
     //涓婂伐搴忔暟閲�
-    private Integer thisProcessQuantity;
+    private int thisProcessQuantity;
     //鏈伐搴忓畬宸ユ暟閲�
-    private Integer thisCompletedQuantity;
+    private int thisCompletedQuantity;
     //鏈伐搴忔鐮存暟閲�
-    private Integer thisWornQuantity;
+    private int thisWornQuantity;
     //涓嬪伐搴�
     private String nextProcess;
     //鐝
     private String classes;
     //鐝粍缂栧彿
-    private String teamsgroupsId;
+    private String teamsGroupsId;
     //鐝粍鍚嶇О
-    private String teamsgroupsName;
+    private String teamsGroupsName;
     //鎶ュ伐鐘舵��
     private Integer reportingWorkState;
     //瀹℃牳浜�
@@ -51,20 +57,54 @@
     //澶囨敞
     private String notes;
     //璐ㄦ鍛�
-    private String qualityInsPector;
+    private String qualityInspector;
     //鍖呰鏂瑰紡
     private String packagingMethod;
     //鎶ュ伐鏃堕棿
-    private LocalDate reportingWorkTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime reportingWorkTime;
     //瀹℃牳鏃堕棿
-    private LocalDate examineTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime examineTime;
     //璐ㄦ鏃堕棿
-    private LocalDate qualityInsTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime qualityInsTime;
     //寤虹珛鏃堕棿
-    private LocalDate createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
     //淇敼鏃堕棿
-    private LocalDate updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime updateTime;
 
+    //鍒涘缓鑰�
+    private String creatorId ;
+    private String creator ;
+
+
+    @TableField(select = false,exist= false)
+    private Order order;
     //澶栭敭娴佺▼鍗¤〃
+    @TableField(select = false,exist= false)
     private FlowCard flowCard;
+//    @TableField(select = false,exist= false)
+//    private ReportingWork reportingWork;
+    @TableField(select = false,exist= false)
+    private  ReportingWorkDetail reportingWorkDetail;
+
+    @TableField(select = false,exist= false)
+    private OrderGlassDetail orderGlassDetail;
+
+    @TableField(select = false,exist= false)
+    private DamageDetails damageDetails;
+
+    @TableField(select = false,exist= false)
+    private OrderDetail orderDetail ;
+
+
+    //瀹氫箟鐨勫畬宸ラ潰绉�
+    @TableField(select = false,exist= false)
+    private String completedArea;
+    //娆＄牬闈㈢Н
+    @TableField(select = false,exist= false)
+    private String wornArea;
 }

--
Gitblit v1.8.0