From acabc19b58ebdfd71fdd3e9a279989005e7c9e79 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 02 十二月 2022 15:16:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   92 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 84 insertions(+), 8 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 6351c95..f397953 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -63,6 +63,8 @@
     @Autowired
     private WrkMastMapper wrkMastMapper;
     @Autowired
+    private WrkMastService wrkMastService;
+    @Autowired
     private WrkDetlService wrkDetlService;
     @Autowired
     private LocMastService locMastService;
@@ -609,6 +611,7 @@
 
                         // 鏇存柊宸ヤ綔妗g姸鎬佷负 17.鍑哄簱瀹屾垚
                         wrkMast.setWrkSts(17L);
+                        wrkMast.setSteNo(0);
                         wrkMast.setCrnEndTime(new Date());
                         if (wrkMastMapper.updateById(wrkMast) != 0) {
                             // 澶嶄綅鍫嗗灈鏈�
@@ -712,6 +715,18 @@
 //                log.error("{}绔欑偣鏌ヨ鏃犲緟鍏ュ簱鏁版嵁 宸ヤ綔鍙�={}", crnStn.getStaNo(), staProtocol.getWorkNo());
                 continue;
             }
+
+            // 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
+            BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
+            if(basSte == null) continue;
+            WrkMast one1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+                    .eq("ste_no",basSte.getSteNo())
+                    .last(" and wrk_sts > 10"));
+            if(one1 != null){
+                log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜鍑哄簱浠诲姟宸茬粦瀹氬皬杞�!", wrkMast.getWrkNo());
+                continue;
+            }
+
             if (wrkMast.getWrkSts() < 3) {
                 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                         && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
@@ -902,6 +917,17 @@
                 continue;
             }
 
+            // 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
+            BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
+            if(basSte == null) continue;
+            WrkMast one1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+                    .eq("ste_no",basSte.getSteNo())
+                    .last(" and wrk_sts < 10"));
+            if(one1 != null){
+                log.error("{}鍑哄簱浠诲姟鏃犳硶浣滀笟锛屽洜鍏ュ簱浠诲姟宸茬粦瀹氬皬杞�!", wrkMast.getWrkNo());
+                continue;
+            }
+
             //鍔犲己鍒ゆ柇锛岀‘淇濆洜鍑哄簱瀵艰嚧鐨勭Щ搴撴暣濂椾换鍔″叏閮ㄧ粨鏉熷悗锛屾墠鑳芥墽琛屼笅涓�绗斿嚭搴撲换鍔°�傚彧鏈夊簱浣嶅畬鎴愮Щ搴撳洖鍘诲叏閮ㄤ换鍔″悗锛屾墠璁や负褰撶粍鍑哄簱浠诲姟瀹屾垚
             WrkMast one = wrkMastMapper.selectLocMoveData(slave.getId());
             if(!Cools.isEmpty(one)){
@@ -917,7 +943,6 @@
                         || Utils.getLev(wrkMast.getSourceLocNo()) != Utils.getLev(one.getLocNo()))){
                     continue;
                 }
-                log.info("");
             }
 
             //鍑哄簱搴撲綅涓嶆槸鏈�澶栧眰搴撲綅锛屽垽鏂祬搴撲綅缁勬槸鍚﹂兘涓虹┖锛屾垨瀛樺湪搴撲綅绉昏浆浠诲姟
@@ -1184,6 +1209,23 @@
         if (null == wrkMast) {
             return;
         }
+        // 杩囨护
+        if (null != wrkMastMapper.selectPakin(slave.getId(), null)) {
+            log.error("{}鍑哄簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍏ュ簱涓换鍔�!", wrkMast.getWrkNo());
+            return;
+        }
+
+        // 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
+        BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
+        if(basSte == null) return;
+        WrkMast one = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+                .eq("ste_no",basSte.getSteNo())
+                .last(" and io_type != 11 and wrk_sts < 10"));
+        if(one != null){
+            log.error("{}绉诲簱浠诲姟鏃犳硶浣滀笟锛屽洜鍏ュ簱浠诲姟宸茬粦瀹氬皬杞�!", wrkMast.getWrkNo());
+            return;
+        }
+
         // 鑾峰彇婧愬簱浣嶄俊鎭�
         LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
         if (null == sourceLoc) {
@@ -1367,7 +1409,13 @@
         if (wrkMast.getWrkSts() == 17) {
             //鏌ユ壘搴撲綅
             boolean flag = false;
-            String[] deeplocs  = Utils.getDeepLocs(wrkMast.getSourceLocNo());
+//            append
+            Integer row = Utils.getGroupRow(wrkMast.getSourceLocNo());
+            Integer bay = Utils.getBay(wrkMast.getSourceLocNo());
+            Integer lev = Utils.getLev(wrkMast.getSourceLocNo());
+
+            String locNo = Utils.append(row, bay, lev);
+            String[] deeplocs  = Utils.getDeepLocs(locNo);
             if(!Cools.isEmpty(deeplocs)){
                 for(String deepLocNo : deeplocs) {
                     LocMast deepLoc = locMastService.selectById(deepLocNo);
@@ -1383,7 +1431,7 @@
                         wrkMast.setIoPri((double)9999);
                         wrkMast.setWrkSts(2L);
                         wrkMast.setLocNo(deepLocNo);
-                        wrkMast.setSteNo(null);
+                        wrkMast.setSteNo(0);
                         wrkMast.setModiTime(new Date());
                         if (wrkMastMapper.updateById(wrkMast) == 0) {
                             log.error("淇敼宸ヤ綔妗g姸鎬� 17.绉诲簱瀹屾垚 => 2.绉诲簱鍐嶅叆搴撲腑 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
@@ -1461,10 +1509,23 @@
                 // 鏈夊皬杞�
                 if (steNo != null) {
                     // 灏忚溅琛岃蛋鍒板爢鍨涙満寰呮惉绉荤偣
-                    if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
+                    if (wrkMast.getWrkSts() == 2L && (wrkMast.getSteNo() == null || wrkMast.getSteNo() == 0)) {
                         // 娌℃湁鍏朵粬浠诲姟
                         if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
-                            this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
+                            SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
+                            SteProtocol steProtocol = steThread.getSteProtocol();
+                            if (steProtocol == null) { return; }
+                            if(steProtocol.getLoca()==3 || steProtocol.getLoca()==4){
+                                //灏忚溅宸茬粡鍦ㄥ緟鏈轰綅鏃讹紝鏃犻渶涓嬪彂鍒板緟鏈轰綅浠诲姟锛岀洿鎺ユ洿鏂扮姸鎬佸井3锛屽悓鏃剁粦瀹氬皬杞�
+                                wrkMast.setWrkSts(3L);
+                                wrkMast.setSteNo(steNo);
+                                wrkMast.setModiTime(new Date());
+                                if (wrkMastMapper.updateById(wrkMast) == 0) {
+                                    log.error("淇敼宸ヤ綔妗g姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+                                }
+                            } else {
+                                this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
+                            }
                         }
                     }
                     // 鍫嗗灈鏈哄皢璐ф斁鑷冲皬杞︿笂 3.灏忚溅寰呮惉锛堝皬杞︿笉鐢ㄦ惉杩愶紝宸茬粡鍦ㄥ綋鍓嶇粍搴撲綅锛� / 6.灏忚溅寰呭叆  ===>> 7.鍚婅溅鍏ュ簱涓�
@@ -1509,7 +1570,7 @@
                     }
                     // 娌℃湁灏忚溅
                 } else {
-                    if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
+                    if (wrkMast.getWrkSts() == 2L && (wrkMast.getSteNo() == null || wrkMast.getSteNo() == 0)) {
                         // 瀵绘壘褰撳墠鍫嗗灈鏈哄搴旂殑灏忚溅
                         SteThread steThread = queryIdleCar(wrkMast);
                         if (steThread != null) {
@@ -2472,8 +2533,9 @@
 //                        }
                         if (locMastService.isOutMost(wrkMast.getLocNo())) {
                             wrkMast.setWrkSts(17L);
+                            wrkMast.setSteNo(0);
                             // 榛樿鐩爣搴撲綅鏄┖鏉�
-                            String locSts = "D";
+                            String locSts = "";
                             // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
                             if (wrkMast.getEmptyMk().equals("N")) {
                                 locSts = "F";
@@ -2483,6 +2545,11 @@
                                     continue;
                                 }
                             }
+                            if(Cools.isEmpty(locSts)){
+                                log.error("搴撲綅绉昏浆 ===>> 搴撳瓨鐘舵�佷负绌猴紱[婧愬簱浣�={}],[鐩爣搴撲綅={}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
+                                continue;
+                            }
+
                             // 淇敼婧愬簱浣嶇姸鎬� ==> O
                             LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                             if (null != sourceLoc) {
@@ -3577,10 +3644,19 @@
                     rows = "18,19";
                     break;
             }
-            LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no",crn.getId())
+            LocMast loc = null;
+            List<LocMast> locs = locMastService.selectList(new EntityWrapper<LocMast>().eq("crn_no",crn.getId())
                                                 .eq("loc_type1",shallowLoc.getLocType1())
                                                 .eq("loc_sts","O")
                                                 .last(" and row1 in (" + rows + ") order by bay1,lev1"));
+            for (LocMast one : locs){
+                if(Utils.getGroupRow(one.getLocNo()) != Utils.getGroupRow(shallowLoc.getLocNo())
+                    || Utils.getBay(one.getLocNo()) != Utils.getBay(shallowLoc.getLocNo())
+                    || Utils.getLev(one.getLocNo()) != Utils.getLev(shallowLoc.getLocNo())){
+                    loc = one;
+                    break;
+                }
+            }
 
             if (null == loc) {
                 log.error("娣卞簱浣嶅嚭搴� --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());

--
Gitblit v1.9.1