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 | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 110 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
new file mode 100644
index 0000000..a1c945e
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java
@@ -0,0 +1,110 @@
+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.LocalDateTime;
+
+@Data
+public class ReportingWork {
+ @TableId(type = IdType.AUTO)
+ //鑷id
+ private Integer id;
+ //鎶ュ伐缂栧彿
+ private String reportingWorkId;
+ //閿�鍞崟鍙�
+ private String orderId;
+ //鐢熶骇璁㈠崟鍙�
+ private String productionId;
+ //娴佺▼鍗″彿
+ private String processId;
+ //璁惧缂栧彿
+ private String deviceId;
+ //璁惧鍚嶇О
+ private String deviceName;
+ //涓婂伐搴�
+ private String previousProcess;
+ //涓婂伐搴忔暟閲�
+ private Integer previousProcessQuantity;
+ //鏈伐搴�
+ private String thisProcess;
+ //涓婂伐搴忔暟閲�
+ private int thisProcessQuantity;
+ //鏈伐搴忓畬宸ユ暟閲�
+ private int thisCompletedQuantity;
+ //鏈伐搴忔鐮存暟閲�
+ private int thisWornQuantity;
+ //涓嬪伐搴�
+ private String nextProcess;
+ //鐝
+ private String classes;
+ //鐝粍缂栧彿
+ private String teamsGroupsId;
+ //鐝粍鍚嶇О
+ private String teamsGroupsName;
+ //鎶ュ伐鐘舵��
+ private Integer reportingWorkState;
+ //瀹℃牳浜�
+ private String reviewed;
+ //瀹℃牳鐘舵��
+ private Integer reviewedState;
+ //澶囨敞
+ private String notes;
+ //璐ㄦ鍛�
+ private String qualityInspector;
+ //鍖呰鏂瑰紡
+ private String packagingMethod;
+ //鎶ュ伐鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportingWorkTime;
+ //瀹℃牳鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime examineTime;
+ //璐ㄦ鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime qualityInsTime;
+ //寤虹珛鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+ //淇敼鏃堕棿
+ @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