From 96bb13d8410b5fef19154bf314b988fd67a98816 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 17 十一月 2025 13:41:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 412410d..69c5cfe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2029,7 +2029,7 @@
                             BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                             String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
                             BasErrLog basErrLog = new BasErrLog(
-                                    null,    // 缂栧彿
+                                    crnProtocol.getUuid(),    // 缂栧彿
                                     wrkMast.getWrkNo(),    // 宸ヤ綔鍙�
                                     now,    // 鍙戠敓鏃堕棿
                                     null,    // 缁撴潫鏃堕棿
@@ -2077,7 +2077,7 @@
                             BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                             String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
                             BasErrLog basErrLog = new BasErrLog(
-                                    null,    // 缂栧彿
+                                    crnProtocol.getUuid(),    // 缂栧彿
                                     null,    // 宸ヤ綔鍙�
                                     now,    // 鍙戠敓鏃堕棿
                                     null,    // 缁撴潫鏃堕棿
@@ -3302,6 +3302,9 @@
             // 鑾峰彇RGV淇℃伅
             RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
             RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+            if (rgvProtocol == null) {
+                continue;
+            }
             if (rgvProtocol.getStatusType1() != RgvStatusType.IDLE && rgvProtocol.getModeType() != RgvModeType.AUTO) {
                 continue;
             }
@@ -3518,6 +3521,7 @@
                 basRgv.setPakAll("1");
                 basRgvService.updateById(basRgv);
                 rgvThread.setPakMk(true);
+
             }
 //            List<WrkMastSta> wrkMastStaPakingNum = wrkMastStaService.selectPakingWrkNum(basRgv.getRgvNo());
 //            if(wrkMastStaPakingNum.size() <1){
@@ -3537,6 +3541,7 @@
             // 鑾峰彇鍫嗗灈鏈轰俊鎭�
             RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
             RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+
             if (rgvProtocol == null) {
                 continue;
             }
@@ -3547,6 +3552,8 @@
                 continue;
             }
             if(rgvProtocol.getStatusType1() == RgvStatusType.WORKING){
+                rgvThread.setPaking(true);
+            }else if(rgvProtocol.getTaskNo1() == 0 && rgvProtocol.getTaskNo2() == 0 && rgvProtocol.getStatusType1() == RgvStatusType.IDLE){
                 rgvThread.setPaking(true);
             }
             if(rgvProtocol.isLoaded1ing() && rgvProtocol.isLoaded2ing()){
@@ -3704,7 +3711,7 @@
 
                 if(wrkMastSta3 != null ){
                     List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
-                    if(wrkMastStaPaking.size() < 1 ){//宸叉湁鏍囪涓嶅啀鏍囪
+                    if(wrkMastStaPaking.size() < 1 && !wrkMastSta3.getWrkNo().equals(wrkMastSta.getWrkNo())){//宸叉湁鏍囪涓嶅啀鏍囪
                         wrkMastSta3.setMk(1);
                         basRgv.setPakAll("0");
                         basRgvService.updateById(basRgv);
@@ -3836,8 +3843,13 @@
             wrkMastSta.setWorkSta(wrkMastSta1 !=null ? 2 : 1);//鑻�1鍙峰伐浣嶆湁浠诲姟缁�2鍙峰伐浣�
             wrkMastSta.setRgvNo((int) rgvProtocol.getRgvNo());
             boolean sign = false;
+
             sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
             if (sign){
+                if(wrkMastSta.getMk() == 1){//鑻ュ凡鎵ц
+                    basRgv.setPakAll("1");
+                    basRgvService.updateById(basRgv);
+                }
                 if(LEFT_POSITION.contains(wrkMastSta.getStaEnd())){
                     basRgv.setPakToCrn("0");
                     basRgvService.updateById(basRgv);
@@ -3847,7 +3859,7 @@
                         }
                     }
                 }
-                if(wrkMastSta3 != null ){
+                if(wrkMastSta3 != null &&  !wrkMastSta3.getWrkNo().equals(wrkMastSta.getWrkNo())){
                     List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
                     if(wrkMastStaPaking.size() < 1){
                         wrkMastSta3.setMk(1);
@@ -3855,7 +3867,7 @@
                         basRgvService.updateById(basRgv);
                         try{
                             wrkMastStaMapper.updateById(wrkMastSta3);
-                            log.error("閿佸畾鐩搁殧绔欑偣浠诲姟");
+                            log.error("閿佸畾鐩搁殧绔欑偣浠诲姟:"+ wrkMastSta3.getWrkNo());
                         }catch (Exception e){
                             log.error("閿佸畾鐩搁殧绔欑偣浠诲姟澶辫触");
                         }

--
Gitblit v1.9.1