From c136e33dd6aab00015d3e40fee00349eff2bf137 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 14 九月 2024 09:20:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Tasking.java | 23 ++++++++++++++++-------
1 files changed, 16 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 1181f1d..13b918e 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
@@ -23,7 +23,7 @@
/**
* 鐜荤拑鍞竴ID锛堝寳鐜伙級涓婚敭
*/
- @TableId(value = "glass_id", type = IdType.AUTO)
+ @TableId(value = "glass_id", type = IdType.AUTO)
private Long glassId;
/**
@@ -102,20 +102,29 @@
private Integer isSilkScreen;
/**
- * 浠诲姟鐘舵�併�愮瓑寰�/宸ヤ綔/瀹屾垚銆�
+ * 浠诲姟鎵ц鐘舵�併�愮瓑寰�/宸ヤ綔/瀹屾垚銆�
*/
private String workState;
- /**
- * 褰撳墠鎵�鍦ㄥ伐鑹�
- */
- private String currentCraft;
+// /**
+// * 褰撳墠鎵�鍦ㄥ伐鑹�
+// */
+// private String currentCraft;
/**
- * 鐘舵�併�愮嚎涓�/绾夸笅銆�
+ * 褰撳墠鎵�鍦ㄥ伐鑹� id (绾胯矾ID)
+ */
+ private Long lineConfigurationId;
+
+ /**
+ * 鐢熶骇鐘舵�併�愮嚎涓�/绾夸笅銆�
*/
private String state;
+ /**
+ * 鐜荤拑鐘舵�併�愭甯�/鐮存崯銆�
+ */
+ private String glassState;
}
--
Gitblit v1.8.0