From 0cb523849fa0461f09353b062b70fb6fcf5e697b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 21 十一月 2023 14:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   36 ++++++++++++++++++++++++------------
 src/main/java/com/zy/core/enums/CrnStatusType.java     |   14 ++++++++++----
 src/main/java/com/zy/asrs/entity/WrkMast.java          |    2 +-
 src/main/webapp/views/deviceOperate/crnOperate.html    |    2 +-
 src/main/java/com/zy/core/enums/CrnModeType.java       |    6 +++---
 5 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 9ac98fe..db2e4c4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -314,7 +314,7 @@
      * wms浠诲姟鍙�
      */
     @ApiModelProperty(value= "wms浠诲姟鍙�")
-    @TableField("task_no")
+    @TableField("wms_wrk_no")
     private String taskNo;
 
     /**
diff --git a/src/main/java/com/zy/core/enums/CrnModeType.java b/src/main/java/com/zy/core/enums/CrnModeType.java
index 0b75045..d7b6111 100644
--- a/src/main/java/com/zy/core/enums/CrnModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnModeType.java
@@ -2,10 +2,10 @@
 
 public enum CrnModeType {
 
-    NONE(0, "鏈�夋嫨"),
-    AUTO(1, "鑷姩"),
+    NONE(0, "鍏虫満"),
+    AUTO(3, "鑷姩"),
     HALF_AUTO(2, "鍗婅嚜鍔�"),
-    HAND(3, "鎵嬪姩"),
+    HAND(1, "鎵嬪姩"),
     STOP(4, "缁翠慨"),
     ;
 
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 1229af0..ccb723e 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -20,10 +20,16 @@
 
     IDLE(0, "绌洪棽锛屾棤浠诲姟"),
     NONE_MOVING(1, "鏃犺揣琛岃蛋"),
-    FETCHING(2, "鍙栬揣"),
-    MOVING(3, "鏈夎揣琛岃蛋"),
-    PUTTING(4, "鏀捐揣"),
-    PUT_COMPLETE(5, "鏀捐揣瀹屾垚"),
+    FETCHING(2, "妫�鏌ヤ换鍔℃暟鎹�"),
+    MOVING(3, "瀹氫綅鍒板彇璐т綅"),
+    //PUTTING(4, "鏀捐揣"),
+    PUT_COMPLETE(7, "鍙栬揣瀹屾垚"),
+    MOVE_THE_SHIPPING_LOCATION(8, "绉诲姩鍒版斁璐т綅缃�"),
+    PUTTING(9, "鏀捐揣涓�"),
+    HANDLING_COMPLETED(10, "鎼繍瀹屾垚"),
+    EMPTY_AVOIDANCE(11, "绌鸿浇閬胯"),
+    SOS(99, "鎶ヨ"),
+    OTHER(100, "鍏朵粬"),
     ;
 
     public Integer id;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 4c3f48b..ea7b1f4 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -141,21 +141,33 @@
      * 璇诲彇鐘舵��
      */
     private void readStatus(){
-        OperateResultExOne<byte[]> result = siemensNet.Read("DB11.2", (short) 104);
+
+        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
         if (result.IsSuccess) {
             if (null == crnProtocol) {
                 crnProtocol = new CrnProtocol();
             }
-            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));   // 2
-            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2)); // 4
-            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 4)); // 6
-            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 6)); // 8
-            crnProtocol.setValid(siemensNet.getByteTransform().TransInt16(result.Content, 8));  // 10
-
-            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 14)); // 16
-            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 16));   // 18
-            crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18));   // 20
-            crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20));  // 22
+            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
+            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
+            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
+            crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
+            crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+            crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+            crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+//            crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+//            crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+//            crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+//            crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+//            crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
 
             // 寮傚父
             crnProtocol.setAlarm1(0);
@@ -400,7 +412,7 @@
         array[8] = command.getDestinationStaNo();
 
         // 浣滀笟淇℃伅
-        OperateResult result = siemensNet.Write("DB10.0", array);
+        OperateResult result = siemensNet.Write("DB100.0", array);
         // 浠诲姟鍙� + 瀹屾垚浣�
         short[] array2 = new short[2];
         array2[0] = command.getTaskNo();
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 44887dd..50f23e9 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -22,7 +22,7 @@
 				</el-table-column>
 				<el-table-column property="statusType" label="妯″紡">
 				</el-table-column>
-				<el-table-column property="wrkStatus" label="浠诲姟鐘舵��">
+				<el-table-column property="wrkStatus$" label="浠诲姟鐘舵��">
 				</el-table-column>
 				<el-table-column property="deviceStatus" label="璁惧鐘舵��">
 				</el-table-column>

--
Gitblit v1.9.1