From f2a5a09c879849110b42c46297ab4c080500e61d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 03 四月 2025 07:28:03 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/PrimitiveTask.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/PrimitiveTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/PrimitiveTask.java
index 4d1d432..1086153 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/PrimitiveTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/PrimitiveTask.java
@@ -168,28 +168,18 @@
private Date endTime;
/**
- * 缁撴潫鏃� 浠诲姟鎵ц鐘舵�併�愮瓑寰�/宸ヤ綔/瀹屾垚銆�
- */
- private String workState;
-
- /**
- * 缁撴潫鏃� 鎵�鍦ㄥ伐鑹� id (绾胯矾ID)
- */
- private Long lineConfigurationId;
-
- /**
- * 缁撴潫鏃� 鐢熶骇鐘舵�併�愮嚎涓�/绾夸笅銆�
- */
- private String state;
-
- /**
- * 缁撴潫鏃� 鐜荤拑鐘舵�併�愭甯�/鐮存崯銆�
- */
- private String glassState;
-
- /**
* 棰嗗彇绾胯矾
*/
private Integer getLine;
+ /**
+ * 琛ュ崟鏁伴噺
+ */
+ private Integer unusualCount;
+
+ /**
+ * 涓婄墖鏁伴噺
+ */
+ private Integer loadCount;
+
}
--
Gitblit v1.8.0