From bfc97f036688f34e7c1451d68e3f6fc242f99929 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 12 五月 2023 16:07:46 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |  431 +++++++++++++++++++++++++----------------------------
 1 files changed, 202 insertions(+), 229 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 cc41e1d..31b4b1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -102,39 +102,30 @@
             for (DevpSlave.Sta inSta : devp.getInSta()) {
                 // 鑾峰彇鏉$爜鎵弿浠俊鎭�
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
-
                 if (barcodeThread == null) {
                     continue;
                 }
                 String barcode = barcodeThread.getBarcode();
 
+                ////鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+                //WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
+                //if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
+                //    log.error("101鎴�104鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
+                //    continue;
+                //}
 
-                //101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
-                if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
-                    BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
-                    if (barcodeThread1 != null) {
+                if (!Cools.isEmpty(barcode)) {
+                    log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                         continue;
                     }
-                    barcode = barcodeThread1.getBarcode();
-                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
-                        BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
-                        if (barcodeThread2 != null) {
-                            barcode = barcodeThread2.getBarcode();
-
-                        }
-                    }
-//                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
-//                        barcode = "";
-//                        continue;
-//                    }
-                }
-
-                if (!Cools.isEmpty(barcode) && !"NoRead".equals(barcode)) {
-                    log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
-//                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
-//                        continue;
-//                    }
                 } else {
+                    // led 寮傚父鏄剧ず
+                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+                    if (ledThread != null) {
+                        String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+                    }
                     continue;
                 }
 
@@ -152,24 +143,6 @@
                     continue;
                 }
                 if (inSta.getStaNo() == 104 && devpThread.ioModeOf1F2 == IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 111 && devpThread.ioModeOf1F3 == IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 114 && devpThread.ioModeOf1F4 == IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 201 && devpThread.ioModeOf2F1 == IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 204 && devpThread.ioModeOf2F2 == IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 301 && devpThread.ioModeOf3F1 == IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 304 && devpThread.ioModeOf3F2 == IoModeType.PAKOUT_MODE) {
                     continue;
                 }
 
@@ -193,11 +166,15 @@
 //                    }
 
                     // 鍒ゆ柇閲嶅宸ヤ綔妗�
-                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
-                    if (wrkMast != null) {
-                        log.error("宸ヤ綔妗d腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
-                        continue;
+                    WrkMast wrkMast = new WrkMast();
+                    if (barcode.length() == 8) {
+                        wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
+                        if (wrkMast != null) {
+                            log.error("宸ヤ綔妗d腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
+                            continue;
+                        }
                     }
+
 //                    // 鑾峰彇鍏ュ簱閫氱煡妗�
 //                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
 //                    if (waitPakins.isEmpty()) {
@@ -217,11 +194,13 @@
                         param.setFull(staProtocol.isFull());
                         String response = new HttpHandler.Builder()
                                 .setUri(wmsUrl)
-                                .setPath("/rpc/pakin/loc/v1")
+                                .setPath("/rpc/ ")
                                 .setJson(JSON.toJSONString(param))
                                 .build()
                                 .doPost();
                         JSONObject jsonObject = JSON.parseObject(response);
+//                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+//                        Integer code = jsonObject.getInteger("code");
                         if (jsonObject.getInteger("code").equals(200)) {
                             StartupDto dto = jsonObject.getObject("data", StartupDto.class);
 
@@ -236,6 +215,40 @@
                         } else {
                             log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                         }
+//                        if (jsonObject.getInteger("code").equals(200)) {
+//                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+//
+//                            barcodeThread.setBarcode("");
+//                            staProtocol.setWorkNo(dto.getWorkNo().shortValue());
+//                            staProtocol.setStaNo(dto.getStaNo().shortValue());
+//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
+//
+//                            ledThread.errorReset();
+//
+//                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+//                            if (!result) {
+//                                throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+//                            }
+//                        } else if(code == 500){
+//                            if (ledThread != null) {
+//                                String errorMsg = jsonObject.getString("msg");
+//                                if (!Cools.isEmpty(errorMsg)) {
+//                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+//                                }
+//                            }
+//                            log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+//                        } else if (code == 700) {
+//                            staProtocol.setWorkNo((short) 9995);
+//                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
+//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
+//                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+//
+//                            // led 寮傚父鏄剧ず
+//                            if (ledThread != null) {
+//                                String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
+//                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+//                            }
+//                        }
 
 
 //                        // 妫�绱㈠簱浣�
@@ -333,24 +346,6 @@
                 if (inSta.getStaNo() == 101 && devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
                     continue;
                 }
-                if (inSta.getStaNo() == 114 && devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 111 && devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 204 && devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 201 && devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 301 && devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (inSta.getStaNo() == 304 && devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
 
                 // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
                 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
@@ -397,15 +392,16 @@
             for (DevpSlave.Sta pickSta : devp.getPickSta()) {
                 // 鑾峰彇鏉$爜鎵弿浠俊鎭�
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+
                 if (barcodeThread == null) {
                     continue;
                 }
                 String barcode = barcodeThread.getBarcode();
-                if(!Cools.isEmpty(barcode)) {
+
+
+
+                if (!Cools.isEmpty(barcode)) {
                     log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
-                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
-                        continue;
-                    }
                 } else {
                     continue;
                 }
@@ -419,33 +415,29 @@
                     staProtocol = staProtocol.clone();
                 }
 
-//                // 鍏ュ嚭搴撴ā寮忓垽鏂�
-//                if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
 
                 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
 //                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                     WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
+                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
                     if (wrkMast == null) {
                         wrkMast = wrkMastMapper.selectPickStep(barcode);
                     }
                     if (wrkMast == null) {
                         // 鏃犳嫞鏂欐暟鎹�
+
+                        if (ledThread != null) {
+                            String errorMsg = "鏆傛棤鎷f枡淇℃伅锛侊紒锛�";
+                            MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
+                        }
                         continue;
                     }
                     if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
                             || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
                         continue;
                     }
+                    ledThread.errorReset();
 
-                    // 鎷c�佺洏銆佸苟 浣滀笟绔欒浆鎹�
-//                    int stnNo = 0;
-//                    if (wrkMast.getStaNo() == 109) {
-//                        stnNo = 127;
-//                    } else if (wrkMast.getStaNo() == 113) {
-//                        stnNo = 128;
-//                    } else {
-//                        log.error("{}鍙蜂换鍔℃暟鎹紓甯革紒", wrkMast.getWrkNo());
-//                    }
                     // 鑾峰彇鐩爣绔�
                     Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                             .eq("type_no", wrkMast.getIoType() - 50)
@@ -474,7 +466,19 @@
                         wrkMast.setIoTime(now);
                         wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
                         wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
-                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+
+                        Integer sourceStaNo = 0;
+                        switch (wrkMast.getStaNo()){
+                            case 100:
+                                sourceStaNo = 101;
+                                break;
+                            case 103:
+                                sourceStaNo = 104;
+                                break;
+                        }
+
+                        wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+//                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
                         wrkMast.setStaNo(staNo); // 鐩爣绔�
                         wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
                         wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
@@ -828,6 +832,11 @@
             // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
 //            WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
             List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
+            //            鑾峰彇宸ヤ綔鐘舵�佷负14鐨勫伐浣滄。
+            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
+            if ( wrkMast1 !=null) {
+                continue;
+            }
             for (WrkMast wrkMast : wrkMasts) {
                 if (wrkMast == null) {
                     continue;
@@ -858,24 +867,6 @@
                     continue;
                 }
                 if (wrkMast.getStaNo() == 103 && devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (wrkMast.getStaNo() == 110 && devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (wrkMast.getStaNo() == 113 && devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (wrkMast.getStaNo() == 200 && devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (wrkMast.getStaNo() == 203 && devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (wrkMast.getStaNo() == 300 && devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
-                    continue;
-                }
-                if (wrkMast.getStaNo() == 303 && devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
                     continue;
                 }
 
@@ -935,7 +926,7 @@
                             continue;
                         } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
                             WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
-                            if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
+                            if (null != waitWrkMast && (waitWrkMast.getWrkSts() == 4 || waitWrkMast.getWrkSts() == 5)) {
                                 continue;
                             }
                         }
@@ -1347,7 +1338,7 @@
 
                 // 绔欑偣鏉′欢鍒ゆ柇
                 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
-                        && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990
+                        && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() >= 9990
                         && staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {
 
                     try {
@@ -1795,8 +1786,11 @@
                     }
 
                     LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
-                    LocMast loc = locMastService.queryDemoLoc(crn.getId());
-                    if (null == sourceLoc || null == loc) {
+                    if (null == sourceLoc ) {
+                        continue;
+                    }
+                    LocMast loc = locMastService.queryDemoLoc0(crn.getId(),sourceLoc.getLocType1());
+                    if ( null == loc) {
                         continue;
                     }
 
@@ -1854,6 +1848,111 @@
                     // 淇敼鐩爣搴撲綅鐘舵��
                     if (loc.getLocSts().equals("O")) {
                         loc.setLocSts("S"); // S.鍏ュ簱棰勭害
+                        loc.setModiTime(new Date());
+                        if (!locMastService.updateById(loc)) {
+                            throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+                        }
+                    } else {
+                        throw new CoolException("绉昏浆澶辫触");
+                    }
+
+                }
+            }
+        } catch (Exception e) {
+            log.error("鍫嗗灈鏈烘紨绀�  ===>> 搴撲綅绉昏浆澶辫触", e);
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+    }
+    /**
+     * 鍫嗗灈鏈烘紨绀�  ===>> 鎵�鏈夊簱浣嶈疆璇�
+     */
+    public synchronized void crnDemoOfLocMove2() {
+        try {
+            for (CrnSlave crn : slaveProperties.getCrn()) {
+                if (!crn.getDemo()) {
+                    continue;
+                }   // 蹇呴』涓烘紨绀虹姸鎬�
+
+                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+                if (crnProtocol == null) {
+                    continue;
+                }
+
+                // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+                if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
+                    // 鑾峰彇绉诲簱宸ヤ綔妗d俊鎭�
+                    WrkMast wrkMast = wrkMastMapper.selectLocMove(crn.getId());
+                    if (null != wrkMast) {
+                        continue;
+                    }
+
+
+                    LocMast sourceLoc = locMastService.queryDemoSourceLoc1(crn.getId());
+                    if (null == sourceLoc ) {
+                        continue;
+                    }
+                    LocMast loc = locMastService.queryDemoLoc2(crn.getId(),sourceLoc.getLocType1());
+                    if ( null == loc) {
+                        continue;
+                    }
+
+                    String sourceLocNo = sourceLoc.getLocNo();
+                    String locNo = loc.getLocNo();
+
+                    // 鑾峰彇宸ヤ綔鍙�
+                    int workNo = commonService.getWorkNo(0);
+                    // 淇濆瓨宸ヤ綔妗�
+                    wrkMast = new WrkMast();
+                    wrkMast.setWrkNo(workNo);
+                    wrkMast.setIoTime(new Date());
+                    wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+                    wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+                    wrkMast.setIoPri(13D);
+                    wrkMast.setCrnNo(crn.getId());
+                    wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
+                    wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
+                    wrkMast.setFullPlt("N"); // 婊℃澘锛歒
+                    wrkMast.setPicking("N"); // 鎷f枡
+                    wrkMast.setExitMk("N"); // 閫�鍑�
+                    wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
+                    wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
+                    wrkMast.setLinkMis("N");
+                    wrkMast.setAppeTime(new Date());
+                    wrkMast.setModiTime(new Date());
+                    int res = wrkMastMapper.insert(wrkMast);
+                    if (res == 0) {
+                        throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+                    }
+                    // 宸ヤ綔妗f槑缁嗕繚瀛�
+//                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
+//                for (LocDetl locDetl : locDetls) {
+//                    WrkDetl wrkDetl = new WrkDetl();
+//                    wrkDetl.setWrkNo(workNo);
+//                    wrkDetl.setIoTime(new Date());
+//                    wrkDetl.setAnfme(locDetl.getAnfme());
+//                    VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
+//                    wrkDetl.setAppeTime(new Date());
+//                    wrkDetl.setModiTime(new Date());
+//                    if (!wrkDetlService.insert(wrkDetl)) {
+//                        throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�");
+//                    }
+//                }
+                    // 淇敼婧愬簱浣嶇姸鎬�
+                    if (sourceLoc.getLocSts().equals("D")) {
+                        sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
+                        sourceLoc.setModiTime(new Date());
+                        if (!locMastService.updateById(sourceLoc)) {
+                            throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
+                        }
+                    } else {
+                        throw new CoolException("婧愬簱浣嶅嚭搴撳け璐�");
+                    }
+                    // 淇敼鐩爣搴撲綅鐘舵��
+                    if (loc.getLocSts().equals("O")) {
+                        loc.setLocSts("S"); // S.鍏ュ簱棰勭害
+                        loc.setCtnKind(1);
                         loc.setModiTime(new Date());
                         if (!locMastService.updateById(loc)) {
                             throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
@@ -1942,24 +2041,6 @@
                         case 104:
                             staNo = 106;
                             break;
-                        case 111:
-                            staNo = 112;
-                            break;
-                        case 114:
-                            staNo = 116;
-                            break;
-                        case 201:
-                            staNo = 202;
-                            break;
-                        case 204:
-                            staNo = 205;
-                            break;
-                        case 301:
-                            staNo = 302;
-                            break;
-                        case 304:
-                            staNo = 305;
-                            break;
                     }
                     WrkMast pakout = wrkMastMapper.selectWorkingPakout(staNo);
                     switch (inSta.getStaNo()) {
@@ -1997,114 +2078,6 @@
                             } else {
                                 // 鍏ュ簱妯″紡
                                 devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE;
-                            }
-                            break;
-                        case 111: // 1F3
-                            if (pakout != null) {
-                                if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
-                                    // 鍑哄簱鍒囨崲涓�
-                                    devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING;
-                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
-                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
-                                            && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
-                                            && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
-                                        // 鍑哄簱妯″紡
-                                        devpThread.ioModeOf1F3 = IoModeType.PAKOUT_MODE;
-                                    }
-                                }
-                            } else {
-                                // 鍏ュ簱妯″紡
-                                devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE;
-                            }
-                            break;
-                        case 114: // 1F4
-                            if (pakout != null) {
-                                if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
-                                    // 鍑哄簱鍒囨崲涓�
-                                    devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING;
-                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
-                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
-                                            && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
-                                            && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
-                                        // 鍑哄簱妯″紡
-                                        devpThread.ioModeOf1F4 = IoModeType.PAKOUT_MODE;
-                                    }
-                                }
-                            } else {
-                                // 鍏ュ簱妯″紡
-                                devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE;
-                            }
-                            break;
-                        case 201: // 2F1
-                            if (pakout != null) {
-                                if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
-                                    // 鍑哄簱鍒囨崲涓�
-                                    devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING;
-                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
-                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
-                                            && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
-                                            && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
-                                        // 鍑哄簱妯″紡
-                                        devpThread.ioModeOf2F1 = IoModeType.PAKOUT_MODE;
-                                    }
-                                }
-                            } else {
-                                // 鍏ュ簱妯″紡
-                                devpThread.ioModeOf2F1 = IoModeType.PAKIN_MODE;
-                            }
-                            break;
-                        case 204: // 2F2
-                            if (pakout != null) {
-                                if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
-                                    // 鍑哄簱鍒囨崲涓�
-                                    devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING;
-                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
-                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
-                                            && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
-                                            && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
-                                        // 鍑哄簱妯″紡
-                                        devpThread.ioModeOf2F2 = IoModeType.PAKOUT_MODE;
-                                    }
-                                }
-                            } else {
-                                // 鍏ュ簱妯″紡
-                                devpThread.ioModeOf2F2 = IoModeType.PAKIN_MODE;
-                            }
-                            break;
-                        case 301: // 3F1
-                            if (pakout != null) {
-                                if (devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
-                                    // 鍑哄簱鍒囨崲涓�
-                                    devpThread.ioModeOf3F1 = IoModeType.PAKOUT_BOOTING;
-                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
-                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
-                                            && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
-                                            && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
-                                        // 鍑哄簱妯″紡
-                                        devpThread.ioModeOf3F1 = IoModeType.PAKOUT_MODE;
-                                    }
-                                }
-                            } else {
-                                // 鍏ュ簱妯″紡
-                                devpThread.ioModeOf3F1 = IoModeType.PAKIN_MODE;
-                            }
-                            break;
-                        case 304: // 3F2
-                            if (pakout != null) {
-                                if (devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
-                                    // 鍑哄簱鍒囨崲涓�
-                                    devpThread.ioModeOf3F2 = IoModeType.PAKOUT_BOOTING;
-                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
-                                    if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
-                                            && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
-                                            && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
-                                        // 鍑哄簱妯″紡
-                                        devpThread.ioModeOf3F2 = IoModeType.PAKOUT_MODE;
-                                    }
-                                }
-                            } else {
-                                // 鍏ュ簱妯″紡
-                                devpThread.ioModeOf3F2 = IoModeType.PAKIN_MODE;
                             }
                             break;
                     }

--
Gitblit v1.9.1