From 5a5e59f8aaa2a030511ef245886bf6d1db9bf774 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 15 三月 2024 14:40:14 +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 | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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..8801554 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;
@@ -33,11 +36,11 @@
//鏈伐搴�
private String thisProcess;
//涓婂伐搴忔暟閲�
- private Integer thisProcessQuantity;
+ private int thisProcessQuantity;
//鏈伐搴忓畬宸ユ暟閲�
- private Integer thisCompletedQuantity;
+ private int thisCompletedQuantity;
//鏈伐搴忔鐮存暟閲�
- private Integer thisWornQuantity;
+ private int thisWornQuantity;
//涓嬪伐搴�
private String nextProcess;
//鐝
@@ -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