From 50a3a5b853b0a6cd86696902f54ca88b4754537d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 08:01:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 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 e3dfe47..832d87b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -701,25 +701,29 @@
      * 缁戝畾灏忚溅鏂规硶
      */
     public synchronized void rgvBindSte2() {
-        for (RgvSlave rgv : slaveProperties.getRgv()) {
-            List<WrkMast> wrkMasts = wrkMastMapper.selectWaitBindRGVRgvNo(rgv.getId());
-            if (!Cools.isEmpty(wrkMasts) && wrkMasts.size()!=0){
-                continue;
-            }
-            List<WrkMast> wrkMasts2 = wrkMastMapper.selectWaitBindRgvNo2(rgv.getId());
-            for (WrkMast wrkMast : wrkMasts2) {
-                if (wrkMastMapper.selectWaitBindRgvNoOneWrkNo(wrkMast.getWrkNo())!=null){
+        try{
+            for (RgvSlave rgv : slaveProperties.getRgv()) {
+                List<WrkMast> wrkMasts = wrkMastMapper.selectWaitBindRGVRgvNo(rgv.getId());
+                if (!Cools.isEmpty(wrkMasts) && wrkMasts.size()!=0){
                     continue;
                 }
-                //鐩爣绔�
-                BasDevp basDevp = basDevpService.selectById(wrkMast.getRgvDstaNo());
-                if (Cools.isEmpty(basDevp) || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("N") || basDevp.getWrkNo()!=0){
-                    continue;
+                List<WrkMast> wrkMasts2 = wrkMastMapper.selectWaitBindRgvNo2(rgv.getId());
+                for (WrkMast wrkMast : wrkMasts2) {
+                    if (wrkMastMapper.selectWaitBindRgvNoOneWrkNo(wrkMast.getWrkNo())!=null){
+                        continue;
+                    }
+                    //鐩爣绔�
+                    BasDevp basDevp = basDevpService.selectById(wrkMast.getRgvDstaNo());
+                    if (Cools.isEmpty(basDevp) || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("N") || basDevp.getWrkNo()!=0){
+                        continue;
+                    }
+                    wrkMastMapper.insertRgvMast(wrkMast.getWrkNo());
+                    wrkMastMapper.updateRgvMast(wrkMast.getWrkNo());
+                    break;
                 }
-                wrkMastMapper.insertRgvMast(wrkMast.getWrkNo());
-                wrkMastMapper.updateRgvMast(wrkMast.getWrkNo());
-                break;
             }
+        }catch (Exception e){
+            log.error("灏忚溅鎼繍浠诲姟寮傚父锛歿}", e.getMessage());
         }
     }
 

--
Gitblit v1.9.1