From 6c9369ab9b7da99687857004470e8d7824eb69ae Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 03 九月 2025 08:02:00 +0800
Subject: [PATCH] 修改plc连接读取失败导致无法重新链接

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/Tasking.java |   96 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 88 insertions(+), 8 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..23d5f7f 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
@@ -1,10 +1,13 @@
 package com.mes.md.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -23,7 +26,7 @@
     /**
      * 鐜荤拑鍞竴ID锛堝寳鐜伙級涓婚敭
      */
-      @TableId(value = "glass_id", type = IdType.AUTO)
+    @TableId(value = "glass_id", type = IdType.AUTO)
     private Long glassId;
 
     /**
@@ -102,20 +105,97 @@
     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;
+
+    /**
+     * 浜у搧绫诲瀷
+     */
+    @TableField(value = "JPZX")
+    private Integer JPZX;
 
 }

--
Gitblit v1.8.0