From 2c2413760b6467bf62402dba7338bd3bbcbd7341 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 20 五月 2025 14:20:38 +0800
Subject: [PATCH] 添加产量报表功能页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Tasking.java | 88 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 7 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Tasking.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Tasking.java
index 8a41a33..bd8b58f 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Tasking.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Tasking.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -23,7 +25,7 @@
/**
* 鐜荤拑鍞竴ID锛堝寳鐜伙級涓婚敭
*/
- @TableId(value = "glass_id", type = IdType.AUTO)
+ @TableId(value = "glass_id", type = IdType.AUTO)
private Long glassId;
/**
@@ -102,19 +104,91 @@
private Integer isSilkScreen;
/**
- * 浠诲姟鐘舵�併�愮瓑寰�/宸ヤ綔/瀹屾垚銆�
+ * 浠诲姟鎵ц鐘舵�併�愮瓑寰�/宸ヤ綔/瀹屾垚銆�
*/
private String workState;
- /**
- * 褰撳墠鎵�鍦ㄥ伐鑹�
- */
- private String currentCraft;
+// /**
+// * 褰撳墠鎵�鍦ㄥ伐鑹�
+// */
+// private String currentCraft;
/**
- * 鐘舵�併�愮嚎涓�/绾夸笅銆�
+ * 褰撳墠鎵�鍦ㄥ伐鑹� id (绾胯矾ID)
+ */
+ private Long lineConfigurationId;
+
+ /**
+ * 鐢熶骇鐘舵�併�愮嚎涓�/绾夸笅銆�
*/
private String state;
+ /**
+ * 鐜荤拑鐘舵�併�愭甯�/鐮存崯銆�
+ */
+ private String glassState;
+
+ /**
+ * R瑙�1-1(鍙充笅瑙�)
+ */
+ private Double r_1_1;
+
+ /**
+ * R瑙�1-2(鍙充笅瑙�)
+ */
+ private Double r_1_2;
+
+ /**
+ * R瑙�2-1(鍙充笂瑙�)
+ */
+ private Double r_2_1;
+
+ /**
+ * R瑙�2-2(鍙充笂瑙�)
+ */
+ private Double r_2_2;
+
+ /**
+ * R瑙�3-1(宸︿笂瑙�)
+ */
+ private Double r_3_1;
+
+ /**
+ * R瑙�3-2(宸︿笂瑙�)
+ */
+ private Double r_3_2;
+
+ /**
+ * R瑙�4-1(宸︿笅瑙�)
+ */
+ private Double r_4_1;
+
+ /**
+ * R瑙�4-2(宸︿笅瑙�)
+ */
+ private Double r_4_2;
+ /**
+ * 鎬昏〃ID
+ */
+ private Long primitiveTaskId;
+
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
+ private Date operationRecordTime;
+
+ /**
+ * 鎿嶄綔鑰�
+ */
+ private String operationRecord;
+
+ /**
+ * 鎿嶄綔绫诲瀷 銆愬紑濮�/缁撴潫銆�
+ */
+ private String operationMode;
+ /**
+ * 搴撲綅
+ */
+ private String warehouse;
}
--
Gitblit v1.8.0