From 759cd0e706e252e907955073eed8e4935b21d9c8 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:13:48 +0800
Subject: [PATCH] 1.修复拣料回库时拣料出库转历史档 2.生成移动任务修复 3.完善agv搬运入库出库申请

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 36a6490..3c25a97 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -238,7 +238,7 @@
 
         //澶栧舰妫�娴�
         Integer[] arr={401,402};
-        OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.700.0", (short) (arr.length*6));
+        OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.702.0", (short) (arr.length*6));
         for (int i = 0; i < arr.length; i++) {
             StaProtocol staProtocol1 = station.get(arr[i]);
             if(resultErr1.IsSuccess){
@@ -350,12 +350,12 @@
         if (null == staProtocol) {
             return;
         }
-        ArrayList<Integer> staNos = getStaNo();
-        int index = staNos.indexOf(staProtocol.getSiteId());
-        if(staProtocol.getSiteId() == 307){
-            index = 0;
+
+        int index = 0;
+        if(staProtocol.getSiteId() == 402){
+            index = 1;
         }
-        OperateResult writeResult1 = siemensS7Net.Write("DB100.500" + index,  1);    // 鎵爜鍣ㄨЕ鍙�
+        OperateResult writeResult1 = siemensS7Net.Write("DB100.500." + index,  true);    // 鎵爜鍣ㄨЕ鍙�
         if (!writeResult1.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));

--
Gitblit v1.9.1