From e1769fa6dad08ec33ab9472c5865c9f91c8e76d0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 二月 2025 13:27:51 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   37 +++++++++++++++++++++++++++++++++++--
 src/main/java/com/zy/core/MainProcess.java                  |    3 ++-
 2 files changed, 37 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 91b1630..bd7f25e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4650,6 +4650,41 @@
     /**
      *  ste鍏呯數浠诲姟鍒涘缓   //瀹屾垚
      */
+    public synchronized void armNoStartTwoLo() {
+        int[] staNos =new int[]{215,219};
+        for (int staNo : staNos){
+            try{
+                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+                StaProtocol staProtocol = devpThread.getStation().get(staNo);
+                if (staProtocol == null) {
+                    continue;
+                } else {
+                    staProtocol = staProtocol.clone();
+                }
+
+                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0){
+                    RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("armNo"+staNo);
+                    if (!Cools.isEmpty(rgvOneSign) && rgvOneSign.getRgvOneSign() == 1){
+                        int workNo = commonService.getWorkNo(6);
+                        StaProtocol staProtocolnew = new StaProtocol();
+                        staProtocolnew.setSiteId(staNo);
+                        staProtocolnew.setWorkNo(workNo);
+                        staProtocolnew.setStaNo(staNo==215? 217:221);
+                        boolean result2 = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocolnew));
+                        if (!result2) {
+                            log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", 2);
+                        }
+                        if (!staProtocol.isLoading()){
+                            updateRgvOneSign("armNo"+staNo,0);
+                        }
+                    }
+                }
+            }catch (Exception e){
+                log.error("绔欑偣"+staNo+"2妤兼満姊拌噦鐮佸灈鍚庢爣璁版竻闄ゅけ璐ワ紝寮傚父淇℃伅锛�"+e);
+            }
+        }
+    }
+
     public synchronized void armNoCleanUpTwoLo() {
         int[] staNos =new int[]{215,219};
         for (int staNo : staNos){
@@ -4671,8 +4706,6 @@
     }
 
     public void updateRgvOneSign(String signType,Integer oneSign){
-        RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
-
         try{
             RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
             if (!Cools.isEmpty(rgvOneSign)){
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 39eccda..dcd461a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -63,7 +63,7 @@
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�   1妤兼媶鍨涗綅缃�
                     mainService.stnToCrnStnPick2();
                     // 2妤�212鍛煎彨绌烘澘
-                    mainService.stnToCrnStnPick3Auto(i);
+//                    mainService.stnToCrnStnPick3Auto(i);
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -137,6 +137,7 @@
                     //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
                     mainService.stackingCompletionDriveTrayOk3();
 
+                    mainService.armNoStartTwoLo();
                     mainService.armNoCleanUpTwoLo();
 
 

--
Gitblit v1.9.1