From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 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 404f103..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,11 +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)
@@ -30,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;
//鐝
@@ -52,25 +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;
- private ReportingWork reportingWork;
-
+// @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