From 03d195c0c3d017d350ba8355134fcebb7309f675 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 30 三月 2025 12:49:05 +0800
Subject: [PATCH] #输送线超重优化

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 src/main/java/com/zy/core/MainProcess.java                  |    2 +-
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |    6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 40067e5..c270c19 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -320,7 +320,7 @@
                                     staProtocol.setStaNo((short)107);
                                 }else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
                                     staProtocol.setStaNo((short)109);
-                                }else{
+                                }else if (staProtocol.getWorkNo()>=9876 && staProtocol.getWorkNo() <= 9900){
                                     staProtocol.setStaNo((short)110);
                                 }
                                 devpThread.setPakMk(staProtocol.getSiteId(), false);
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3d90ddb..d600b5f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -69,7 +69,7 @@
 //                    mainService.shiftTargetToCyclePoint();
 //                    mainService.shiftCyclePointToTarget();
                     i++;
-                    if (i > maxCount) {
+                    if (i > 2) {
                         //鐜舰寰幆鍑芥暟
                         mainService.shiftTargetToCyclePoint();
                         mainService.shiftCyclePointToTarget();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a194dda..0fa8c85 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -584,11 +584,14 @@
                 plcAddressStaNo = "DB73." + (4 * 6 + 4);
                 break;
         }
+
+
         // **鍐欏叆鏂颁换鍔�**
         if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
             writeFlag = true;
             log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
         }
+
         // **鍐欏叆澶辫触澶勭悊**
         handleWriteFailure(staProtocol, writeFlag);
     }
@@ -618,9 +621,10 @@
      * 鍐欏叆鏂颁换鍔″埌 PLC 骞堕獙璇佹槸鍚︽垚鍔�
      */
     private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, StaProtocol staProtocol) throws InterruptedException {
-        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());
         OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, staProtocol.getStaNo());
 
+        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());
+
         if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
             Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板��
             OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);

--
Gitblit v1.9.1