From af106fa3c1b10682c5c409d72c9219fe1e3d2901 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 07 九月 2024 12:02:48 +0800
Subject: [PATCH] 输送线指令优化

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |    1 -
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   21 ++++++++++++---------
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |    2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 285ed9a..316b2eb 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -33,7 +33,6 @@
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.properties.SystemProperties;
 import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.MelsecCrnThread;
 import com.zy.core.thread.ScaleThread;
 import com.zy.core.thread.SiemensCrnThread;
 import lombok.extern.slf4j.Slf4j;
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 6127602..99f127d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -234,22 +234,25 @@
                     }
                     if (wrkMast != null) {
                         News.error("" + mark + " - 4" + " - 宸ヤ綔妗d腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
-                        staProtocol.setWorkNo((short) 9999);
-                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
+                        Integer wrkNo = wrkMast.getWrkNo();
+                        barcodeThread.setBarcode("");
+                        staProtocol.setWorkNo(Short.parseShort(wrkNo + ""));
+                        staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                         devpThread.setPakMk(staProtocol.getSiteId(), false);
                         boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-                        if (!result) {
-                            throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
-                        }
+                        log.info("杈撻�佺嚎涓嬪彂(瀛樺湪璁惧涓婅蛋鐨勫伐浣滄。锛岀洿鎺ヤ笅鍙戯紒))锛�" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
 
-                        // led 寮傚父鏄剧ず
-                        if (ledThread != null) {
-                            String errorMsg = "宸ヤ綔妗e凡瀛樺湪璇ユ潯鐮佸彿===>>" + barcode;
-                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
+                        ledThread.errorReset();
+                        log.info("缁勬墭璇锋眰鍚嶭ED閿欒娓呴櫎");
+
+                        if (!result) {
+                            log.error("杈撻�佺嚎涓嬪彂(瀛樺湪璁惧涓婅蛋鐨勫伐浣滄。锛岀洿鎺ヤ笅鍙戯紒)==>鏇存柊plc绔欑偣淇℃伅澶辫触");
+//                            throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
                         }
                         continue;
                     }
 
+
                     try {
                         LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
 
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b2ff97d..20bee5f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -400,7 +400,7 @@
             if (wrkNoFlag && staNoFlag) {
                 break;
             }
-        } while (writeCount < 5);
+        } while (writeCount < 12);
 
         if (!write.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());

--
Gitblit v1.9.1