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 | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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..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
@@ -4,9 +4,11 @@
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
@@ -33,11 +35,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,15 +61,20 @@
//鍖呰鏂瑰紡
private String packagingMethod;
//鎶ュ伐鏃堕棿
+ @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 ;
@@ -83,4 +90,21 @@
// 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