From 2d69236d4361213ebd98b57aca4f36b6d299754f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 15 十一月 2023 09:09:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   69 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 19 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..8bfa67d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8,10 +8,7 @@
 import com.core.common.DateUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
-import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.BasRgvErrMapper;
-import com.zy.asrs.mapper.WaitPakinMapper;
-import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.mapper.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
 import com.zy.asrs.utils.VersionUtils;
@@ -96,6 +93,8 @@
     private BasRgvPathService basRgvPathService;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private WrkMastStaMapper wrkMastStaMapper;
 
     @Value("${wms.url}")
     private String wmsUrl;
@@ -701,25 +700,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());
         }
     }
 
@@ -3802,4 +3805,32 @@
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
     }
+
+    /**
+     *  瀹屾垚灏忚溅浠诲姟
+     */
+    public synchronized void rgvCompleteWrkMastSta() {
+
+    }
+    /**
+     * 鎵ц灏忚溅鎼繍浠诲姟
+     */
+    public synchronized void rgvRunWrkMastSta() {
+        Integer signCount = 0;
+        for (RgvSlave rgvSlave:slaveProperties.getRgv()){
+
+            if (true){//rgv鍙敤
+                signCount++;
+            }
+        }
+        List<WrkMastSta> wrkMastStas = wrkMastStaMapper.selectAllWrkMastStaList();
+        for (WrkMastSta wrkMastSta : wrkMastStas) {
+            // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+            if (true) {
+
+            }
+        }
+    }
+
+
 }

--
Gitblit v1.9.1