From 32cafd54c82586c749734505359d25f696ee158f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 14 三月 2024 16:55:29 +0800
Subject: [PATCH] 报工查询删除

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 bb4f0f4..2f26649 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
@@ -3,7 +3,10 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.sd.DeliveryDetail;
 import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderGlassDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -59,6 +62,7 @@
     //鍖呰鏂瑰紡
     private String packagingMethod;
     //鎶ュ伐鏃堕棿
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime reportingWorkTime;
     //瀹℃牳鏃堕棿
     private LocalDate examineTime;
@@ -83,4 +87,15 @@
 //    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 String completedArea;
+    //娆$牬闈㈢Н
+    @TableField(select = false,exist= false)
+    private String wornArea;
 }

--
Gitblit v1.8.0