From 3d10ceed030be39cc520aa453e36e695b1638b81 Mon Sep 17 00:00:00 2001
From: DELL <DELL@qq.com>
Date: 星期四, 18 九月 2025 15:50:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/NyLiftThread.java |   48 ++++++++++++++++++------------------------------
 1 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index 9221ceb..8135de8 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -114,60 +114,48 @@
         if (commandObj.getInteger("mode") == 3) {
             //鍙栨斁璐�
             short[] array = new short[4];
-            array[0] = commandObj.getShort("taskNO");//浠诲姟鍙�
-            array[1] = commandObj.getShort("mode");//浠诲姟妯″紡
-            array[2] = commandObj.getShort("pick");//鍙栬揣鏁版嵁
-            array[3] = commandObj.getShort("put");//鏀捐揣鏁版嵁
+            array[0] = 1;//浠诲姟绫诲瀷
+            array[1] = commandObj.getShort("pick");//婧愮珯
+            array[2] = commandObj.getShort("put");//鐩爣绔�
+            array[3] = commandObj.getShort("taskNo");//浠诲姟鍙�
             resultData.put("commandData", array);
 
-            result = siemensS7Net.Write("DB103.0", array);
+            result = siemensS7Net.Write("DB83.0", array);
             if (result.IsSuccess) {
-                result2 = siemensS7Net.Write("DB103.8", (short) 1);
-                if (result2.IsSuccess) {
-                    resultData.put("result", "success");
-                }
+                resultData.put("result", "success");
             }
 
             resultData.put("commandResult1", JSON.toJSONString(result));
-            resultData.put("commandResult2", JSON.toJSONString(result2));
         } else if (commandObj.getInteger("mode") == 4) {
             //灏忚溅鎹㈠眰
             short[] array = new short[4];
-            array[0] = commandObj.getShort("taskNO");//浠诲姟鍙�
-            array[1] = commandObj.getShort("mode");//浠诲姟妯″紡
-            array[2] = commandObj.getShort("pick");//鍙栬揣鏁版嵁
-            array[3] = commandObj.getShort("put");//鏀捐揣鏁版嵁
+            array[0] = 2;//浠诲姟绫诲瀷
+            array[1] = commandObj.getShort("pick");//婧愮珯
+            array[2] = commandObj.getShort("put");//鐩爣绔�
+            array[3] = commandObj.getShort("taskNo");//浠诲姟鍙�
             resultData.put("commandData", array);
 
-            result = siemensS7Net.Write("DB103.0", array);
+            result = siemensS7Net.Write("DB83.0", array);
             if (result.IsSuccess) {
-                result2 = siemensS7Net.Write("DB103.8", (short) 1);
-                if (result2.IsSuccess) {
-                    resultData.put("result", "success");
-                }
+                resultData.put("result", "success");
             }
 
             resultData.put("commandResult1", JSON.toJSONString(result));
-            resultData.put("commandResult2", JSON.toJSONString(result2));
         } else if (commandObj.getInteger("mode") == 5) {
             //鎻愬崌鏈虹Щ鍔�
             short[] array = new short[4];
-            array[0] = commandObj.getShort("taskNO");//浠诲姟鍙�
-            array[1] = commandObj.getShort("mode");//浠诲姟妯″紡
-            array[2] = commandObj.getShort("pick");//鍙栬揣鏁版嵁
-            array[3] = commandObj.getShort("put");//鏀捐揣鏁版嵁
+            array[0] = 2;//浠诲姟绫诲瀷
+            array[1] = commandObj.getShort("pick");//婧愮珯
+            array[2] = commandObj.getShort("put");//鐩爣绔�
+            array[3] = commandObj.getShort("taskNo");//浠诲姟鍙�
             resultData.put("commandData", array);
 
-            result = siemensS7Net.Write("DB103.0", array);
+            result = siemensS7Net.Write("DB83.0", array);
             if (result.IsSuccess) {
-                result2 = siemensS7Net.Write("DB103.8", (short) 1);
-                if (result2.IsSuccess) {
-                    resultData.put("result", "success");
-                }
+                resultData.put("result", "success");
             }
 
             resultData.put("commandResult1", JSON.toJSONString(result));
-            resultData.put("commandResult2", JSON.toJSONString(result2));
         } else if (commandObj.getInteger("mode") == 9996) {
             //澶嶄綅
             short[] array = new short[1];

--
Gitblit v1.9.1