From 32b4da424d646d1753f91208d12f22edceb75192 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 18:19:07 +0800
Subject: [PATCH] #盘点逻辑修改

---
 src/main/java/com/zy/asrs/utils/Utils.java                  |   48 +++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |  425 +++++++++++++++++++++++++++++------------------
 src/main/resources/application.yml                          |   60 +++---
 3 files changed, 337 insertions(+), 196 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 619b607..47a376a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -416,64 +416,40 @@
                 }
                 if (staProtocol.isAutoing()
                         && staProtocol.isLoading()
-//                        && (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999)
-//                        && staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
+                        && staProtocol.isInEnable()
+                        && (staProtocol.getWorkNo() > 0)
                         && staProtocol.isPakMk()){
 
-                    // 鑾峰彇鏉$爜鎵弿浠俊鎭�
-                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
-                    if (barcodeThread == null) {
+                    WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
+                    if (wrkMast == null) {//鎵句笉鍒板伐浣滄。
                         continue;
                     }
-                    String barcode = barcodeThread.getBarcode();
-
-                    WrkMast wrkMast = null;
-                    wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
-                    if (wrkMast == null) {
-                        continue;
-                    }
-//                    if (staProtocol.getWorkNo() == 9996) {
-//                        String barcode = barcodeThread.getBarcode();
-//                        if(!Cools.isEmpty(barcode)) {
-//                            News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
-//                            if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
-//                                staProtocol.setWorkNo((short) 32002);
-//                                staProtocol.setStaNo(pickSta.getBackSta().shortValue());
-//                                devpThread.setPakMk(staProtocol.getSiteId(), false);
-//                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//
-//                                // led 寮傚父鏄剧ず
-//                                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
-//                                if (ledThread != null) {
-//                                    String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
-//                                    MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
-//                                }
-//                                continue;
-//                            }
-//                        } else {
-//                            staProtocol.setWorkNo((short) 32002);
-//                            staProtocol.setStaNo(pickSta.getBackSta().shortValue());
-//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
-//                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//
-//                            // led 寮傚父鏄剧ず
-//                            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
-//                            if (ledThread != null) {
-//                                String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
-//                                MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
-//                            }
-//                            continue;
-//                        }
-//                        wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
-//                        if (null == wrkMast) {
-//                            News.error("{}鏉$爜閿欒锛屾殏鏃犳嫞鏂欎换鍔★紒", barcode);
-//                        }
-//                    }
 
                     if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
-                        || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
+                            || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
                         continue;
                     }
+
+                    //*********************鍚屽簱浣嶇粍鏍¢獙*********************
+                    boolean flag = false;
+                    String th = "";
+                    List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getLocNo());
+                    for (String loc : innerLoc) {
+                        LocMast locMast = locMastService.selectById(loc);
+                        if (locMast == null) {
+                            continue;
+                        }
+
+                        if (!locMast.getLocSts().equals("F")) {
+                            flag = true;
+                            th = loc + "搴撲綅瀛樺湪闈炵┖娴呭簱浣�";
+                            break;
+                        }
+                    }
+                    if (flag) {
+                        throw new CoolException(th);
+                    }
+                    //*********************鍚屽簱浣嶇粍鏍¢獙*********************
 
                     // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
                     if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
@@ -511,126 +487,249 @@
                     if (!locMastService.updateById(locMast)) {
                         throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
                     }
-                    barcodeThread.setBarcode("");//娓呯悊鏉$爜
 
-//                    try {
-//                        // 璁块棶 WMS 鑾峰彇鍏ュ簱搴撲綅
-//                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
-//                        SearchLocParam param = new SearchLocParam();
-//                        param.setWrkNo(wrkMast.getWrkNo());
-//                        param.setIoType(wrkMast.getIoType());
-//                        param.setSourceStaNo(pickSta.getStaNo());
-////                        param.setLocType1(locTypeDto.getLocType1());
-//                        String response = new HttpHandler.Builder()
-//                                .setUri(wmsUrl)
-//                                .setPath("/rpc/pakin/loc/v1")
-//                                .setJson(JSON.toJSONString(param))
-//                                .build()
-//                                .doPost();
-//                        JSONObject jsonObject = JSON.parseObject(response);
-//                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
-//                        Integer code = jsonObject.getInteger("code");
-//                        if (code.equals(200)) {
-//                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-//
-////                            // 鑾峰彇鐩爣绔�
-////                            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-////                                    .eq("type_no", wrkMast.getIoType() - 50)
-////                                    .eq("stn_no", pickSta.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
-////                                    .eq("crn_no", dto.getCrnNo()); // 鍫嗗灈鏈哄彿
-////                            StaDesc staDesc = staDescService.selectOne(wrapper);
-////                            if (Cools.isEmpty(staDesc)) {
-////                                News.error("鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
-////                                continue;
-////                            }
-////                            // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
-////                            Integer staNo = staDesc.getCrnStn();
-//
-//                            // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
-////                        if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
-////                            throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。澶辫触");
-////                        }
-//                            // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-//                            if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
-//                                throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
-//                            }
-//
-//                            String sourceLocNo = wrkMast.getSourceLocNo().trim();
-//                            LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
-//                            if (liftStaProtocol == null) {
-//                                continue;
-//                            }
-//
-//                            // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
-//                            wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
-//                            wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
-//                            wrkMast.setSourceStaNo(pickSta.getStaNo()); // 婧愮珯
-////                            wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
-////                            wrkMast.setCrnNo(dto.getCrnNo());
-//                            wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
-//                            wrkMast.setLocNo(sourceLocNo); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
-//                            wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
-//                            wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
-//                            wrkMast.setModiTime(new Date());
-//                            if (wrkMastMapper.updateById(wrkMast) == 0) {
-//                                throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
-//                            }
-//                            if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
-//                                throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
-//                            }
-//
-//                            // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴�
-//                            LocMast locMast = locMastService.selectById(sourceLocNo);
-//                            locMast.setLocSts("Q");
-//                            locMast.setModiTime(new Date());
-//                            if (!locMastService.updateById(locMast)) {
-//                                throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
-//                            }
-//
-////                            // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
-////                            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
-////                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
-////                            devpThread.setPakMk(staProtocol.getSiteId(), false);
-////                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-////                            if (!result) {
-////                                News.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
-////                            }
-//
-//                            barcodeThread.setBarcode("");//娓呯悊鏉$爜
-//
-//                        } else if (code == 500){
-//                            if (ledThread != null) {
-//                                String errorMsg = jsonObject.getString("msg");
-//                                if (!Cools.isEmpty(errorMsg)) {
-//                                    MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
-//                                }
-//                            }
-//                            News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
-//                        } else {
-////                            staProtocol.setWorkNo((short) 32002);
-////                            staProtocol.setStaNo(pickSta.getBackSta().shortValue());
-////                            devpThread.setPakMk(staProtocol.getSiteId(), false);
-////                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//
-//                            // led 寮傚父鏄剧ず
-//                            if (ledThread != null) {
-//                                String errorMsg = jsonObject.getString("msg");
-////                                String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
-//                                MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
-//                            }
-//                        }
-//
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//                    }
-
+                    staProtocol.setStaNo(pickSta.getBackSta().shortValue());//鍐欏叆鐩爣绔�
+                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                 }
             }
 
         }
     }
 
+//    /**
+//     * 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+//     */
+//    @Transactional
+//    public synchronized void stnToCrnStnPick(){
+//        for (DevpSlave devp : slaveProperties.getDevp()) {
+//            // 閬嶅巻鎷f枡鍏ュ簱鍙�
+//            for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
+//
+//                // 鑾峰彇鎷f枡鍏ュ簱绔欎俊鎭�
+//                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+//                StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
+//                if (staProtocol == null) {
+//                    continue;
+//                } else {
+//                    staProtocol = staProtocol.clone();
+//                }
+//                if (staProtocol.isAutoing()
+//                        && staProtocol.isLoading()
+////                        && (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999)
+////                        && staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
+//                        && staProtocol.isPakMk()){
+//
+//                    // 鑾峰彇鏉$爜鎵弿浠俊鎭�
+//                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+//                    if (barcodeThread == null) {
+//                        continue;
+//                    }
+//                    String barcode = barcodeThread.getBarcode();
+//
+//                    WrkMast wrkMast = null;
+//                    wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
+//                    if (wrkMast == null) {
+//                        continue;
+//                    }
+////                    if (staProtocol.getWorkNo() == 9996) {
+////                        String barcode = barcodeThread.getBarcode();
+////                        if(!Cools.isEmpty(barcode)) {
+////                            News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
+////                            if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
+////                                staProtocol.setWorkNo((short) 32002);
+////                                staProtocol.setStaNo(pickSta.getBackSta().shortValue());
+////                                devpThread.setPakMk(staProtocol.getSiteId(), false);
+////                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+////
+////                                // led 寮傚父鏄剧ず
+////                                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
+////                                if (ledThread != null) {
+////                                    String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+////                                    MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
+////                                }
+////                                continue;
+////                            }
+////                        } else {
+////                            staProtocol.setWorkNo((short) 32002);
+////                            staProtocol.setStaNo(pickSta.getBackSta().shortValue());
+////                            devpThread.setPakMk(staProtocol.getSiteId(), false);
+////                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+////
+////                            // led 寮傚父鏄剧ず
+////                            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
+////                            if (ledThread != null) {
+////                                String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+////                                MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
+////                            }
+////                            continue;
+////                        }
+////                        wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
+////                        if (null == wrkMast) {
+////                            News.error("{}鏉$爜閿欒锛屾殏鏃犳嫞鏂欎换鍔★紒", barcode);
+////                        }
+////                    }
+//
+//                    if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
+//                        || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
+//                        continue;
+//                    }
+//
+//                    // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+//                    if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
+//                        throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
+//                    }
+//
+//                    String sourceLocNo = wrkMast.getSourceLocNo().trim();
+//                    LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+//                    if (liftStaProtocol == null) {
+//                        continue;
+//                    }
+//
+//                    // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
+//                    wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+//                    wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+//                    wrkMast.setSourceStaNo(pickSta.getStaNo()); // 婧愮珯
+////                            wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
+////                            wrkMast.setCrnNo(dto.getCrnNo());
+//                    wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
+//                    wrkMast.setLocNo(sourceLocNo); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+//                    wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
+//                    wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
+//                    wrkMast.setModiTime(new Date());
+//                    if (wrkMastMapper.updateById(wrkMast) == 0) {
+//                        throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+//                    }
+//                    if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
+//                        throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+//                    }
+//
+//                    // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+//                    LocMast locMast = locMastService.selectById(sourceLocNo);
+//                    locMast.setLocSts("Q");
+//                    locMast.setModiTime(new Date());
+//                    if (!locMastService.updateById(locMast)) {
+//                        throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+//                    }
+//                    barcodeThread.setBarcode("");//娓呯悊鏉$爜
+//
+////                    try {
+////                        // 璁块棶 WMS 鑾峰彇鍏ュ簱搴撲綅
+////                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
+////                        SearchLocParam param = new SearchLocParam();
+////                        param.setWrkNo(wrkMast.getWrkNo());
+////                        param.setIoType(wrkMast.getIoType());
+////                        param.setSourceStaNo(pickSta.getStaNo());
+//////                        param.setLocType1(locTypeDto.getLocType1());
+////                        String response = new HttpHandler.Builder()
+////                                .setUri(wmsUrl)
+////                                .setPath("/rpc/pakin/loc/v1")
+////                                .setJson(JSON.toJSONString(param))
+////                                .build()
+////                                .doPost();
+////                        JSONObject jsonObject = JSON.parseObject(response);
+////                        LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
+////                        Integer code = jsonObject.getInteger("code");
+////                        if (code.equals(200)) {
+////                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+////
+//////                            // 鑾峰彇鐩爣绔�
+//////                            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+//////                                    .eq("type_no", wrkMast.getIoType() - 50)
+//////                                    .eq("stn_no", pickSta.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
+//////                                    .eq("crn_no", dto.getCrnNo()); // 鍫嗗灈鏈哄彿
+//////                            StaDesc staDesc = staDescService.selectOne(wrapper);
+//////                            if (Cools.isEmpty(staDesc)) {
+//////                                News.error("鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
+//////                                continue;
+//////                            }
+//////                            // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
+//////                            Integer staNo = staDesc.getCrnStn();
+////
+////                            // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
+//////                        if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
+//////                            throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。澶辫触");
+//////                        }
+////                            // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+////                            if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
+////                                throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
+////                            }
+////
+////                            String sourceLocNo = wrkMast.getSourceLocNo().trim();
+////                            LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+////                            if (liftStaProtocol == null) {
+////                                continue;
+////                            }
+////
+////                            // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
+////                            wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+////                            wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+////                            wrkMast.setSourceStaNo(pickSta.getStaNo()); // 婧愮珯
+//////                            wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
+//////                            wrkMast.setCrnNo(dto.getCrnNo());
+////                            wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
+////                            wrkMast.setLocNo(sourceLocNo); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+////                            wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
+////                            wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
+////                            wrkMast.setModiTime(new Date());
+////                            if (wrkMastMapper.updateById(wrkMast) == 0) {
+////                                throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+////                            }
+////                            if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
+////                                throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+////                            }
+////
+////                            // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+////                            LocMast locMast = locMastService.selectById(sourceLocNo);
+////                            locMast.setLocSts("Q");
+////                            locMast.setModiTime(new Date());
+////                            if (!locMastService.updateById(locMast)) {
+////                                throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+////                            }
+////
+//////                            // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+//////                            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+//////                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+//////                            devpThread.setPakMk(staProtocol.getSiteId(), false);
+//////                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+//////                            if (!result) {
+//////                                News.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
+//////                            }
+////
+////                            barcodeThread.setBarcode("");//娓呯悊鏉$爜
+////
+////                        } else if (code == 500){
+////                            if (ledThread != null) {
+////                                String errorMsg = jsonObject.getString("msg");
+////                                if (!Cools.isEmpty(errorMsg)) {
+////                                    MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
+////                                }
+////                            }
+////                            News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+////                        } else {
+//////                            staProtocol.setWorkNo((short) 32002);
+//////                            staProtocol.setStaNo(pickSta.getBackSta().shortValue());
+//////                            devpThread.setPakMk(staProtocol.getSiteId(), false);
+//////                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+////
+////                            // led 寮傚父鏄剧ず
+////                            if (ledThread != null) {
+////                                String errorMsg = jsonObject.getString("msg");
+//////                                String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
+////                                MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
+////                            }
+////                        }
+////
+////                    } catch (Exception e) {
+////                        e.printStackTrace();
+////                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+////                    }
+//
+//                }
+//            }
+//
+//        }
+//    }
+
     /**
      * 鍒濆鍖栧疄鏃跺湴鍥�
      */
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 938b141..0dbc2bc 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -635,4 +635,52 @@
         }
     }
 
+    /**
+     * 鑾峰彇鍐呬晶鏂瑰悜鐨勫簱浣嶇粍
+     * @param locNo 搴撲綅鍙�
+     */
+    public static List<String> getGroupInnerLoc(String locNo){
+        int row = getRow(locNo);
+        int bay = getBay(locNo);
+
+        //(1,3,4,10,11)娌℃湁鍐呬晶鏂瑰悜搴撲綅缁�,(13,14,16)59鍒椾箣鍐呮病鏈夊唴渚ф柟鍚戝簱浣嶇粍
+        if (FIRST_GROUP_ROW_LIST.contains(row)) {//1鎺�
+            return new ArrayList<>();
+        }
+        if (SECOND_GROUP_ROW_LIST.contains(row)) {//3-4鎺�
+            return new ArrayList<>();
+        }
+        if (THIRD_GROUP_ROW_LIST.contains(row)) {//6-7鎺�
+            List<String> result = new ArrayList<>();
+            for (Integer row0 : THIRD_GROUP_ROW_LIST) {
+                if (row0 > row) {
+                    result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+                }
+            }
+            return result;
+        }
+        if (FOURTH_GROUP_ROW_LIST.contains(row)) {//8鎺�
+            return new ArrayList<>();
+        }
+        if (FIFTH_GROUP_ROW_LIST.contains(row)) {//10-11鎺�
+            return new ArrayList<>();
+        }
+        if (SIXTH_GROUP_ROW_LIST.contains(row) && (bay >= 59 && bay <= 61)) {//13-16鎺�59-61鍒楀唴渚ф柟鍚戝簱浣嶇粍
+            List<String> result = new ArrayList<>();
+            for (Integer row0 : SIXTH_GROUP_ROW_LIST) {
+                if (row0 > row) {
+                    result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
+                }
+            }
+            return result;
+        }
+        if (SEVENTH_GROUP_ROW_LIST.contains(row) && bay < 59) {//13-14鎺�59鍒椾箣鍐呮病鏈夊唴渚ф柟鍚戝簱浣嶇粍
+            return new ArrayList<>();
+        }
+        if (EIGHTH_GROUP_ROW_LIST.contains(row) && bay < 59) {//16鎺�59鍒椾箣鍐呮病鏈夊唴渚ф柟鍚戝簱浣嶇粍
+            return new ArrayList<>();
+        }
+        throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
+    }
+
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ae935e6..3a1d2b0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -197,76 +197,70 @@
     outSta[6]:
       staNo: 346
       led: ${wcs-slave.led[0].id}
-    # 鎷f枡鍑哄簱鍙�
+    # 鎷f枡鍏ュ簱鍙�
     pickInSta[0]:
-      staNo: 100
-      backSta: 101
+      staNo: 101
+      backSta: 100
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[1].id}
       liftNo: ${wcs-slave.lift[0].id}
     pickInSta[1]:
-      staNo: 103
-      backSta: 102
+      staNo: 102
+      backSta: 103
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[2].id}
       liftNo: ${wcs-slave.lift[1].id}
     pickInSta[2]:
-      staNo: 105
-      backSta: 104
+      staNo: 104
+      backSta: 105
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[3].id}
       liftNo: ${wcs-slave.lift[2].id}
     pickInSta[3]:
-      staNo: 200
-      backSta: 201
+      staNo: 201
+      backSta: 200
       barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[4].id}
       liftNo: ${wcs-slave.lift[0].id}
     pickInSta[4]:
-      staNo: 203
-      backSta: 202
+      staNo: 202
+      backSta: 203
       barcode: ${wcs-slave.barcode[4].id}
       led: ${wcs-slave.led[5].id}
       liftNo: ${wcs-slave.lift[1].id}
     pickInSta[5]:
-      staNo: 205
-      backSta: 204
+      staNo: 204
+      backSta: 205
       barcode: ${wcs-slave.barcode[5].id}
       led: ${wcs-slave.led[6].id}
       liftNo: ${wcs-slave.lift[2].id}
     pickInSta[6]:
-      staNo: 341
-      backSta: 340
-      barcode: ${wcs-slave.barcode[7].id}
-      led: ${wcs-slave.led[0].id}
-      liftNo: ${wcs-slave.lift[1].id}
-    pickInSta[7]:
-      staNo: 346
-      backSta: 345
+      staNo: 345
+      backSta: 346
       barcode: ${wcs-slave.barcode[6].id}
       led: ${wcs-slave.led[11].id}
       liftNo: ${wcs-slave.lift[2].id}
-    pickInSta[8]:
-      staNo: 300
-      backSta: 325
+    pickInSta[7]:
+      staNo: 325
+      backSta: 341
       barcode: ${wcs-slave.barcode[6].id}
       led: ${wcs-slave.led[7].id}
       liftNo: ${wcs-slave.lift[0].id}
-    pickInSta[9]:
-      staNo: 300
-      backSta: 331
+    pickInSta[8]:
+      staNo: 331
+      backSta: 341
       barcode: ${wcs-slave.barcode[6].id}
       led: ${wcs-slave.led[8].id}
       liftNo: ${wcs-slave.lift[0].id}
-    pickInSta[10]:
-      staNo: 300
-      backSta: 333
+    pickInSta[9]:
+      staNo: 333
+      backSta: 341
       barcode: ${wcs-slave.barcode[6].id}
       led: ${wcs-slave.led[9].id}
       liftNo: ${wcs-slave.lift[0].id}
-    pickInSta[11]:
-      staNo: 300
-      backSta: 339
+    pickInSta[10]:
+      staNo: 339
+      backSta: 341
       barcode: ${wcs-slave.barcode[6].id}
       led: ${wcs-slave.led[10].id}
       liftNo: ${wcs-slave.lift[0].id}

--
Gitblit v1.9.1