From 8cbc7ea658c1a7f65e07eafc7ec98a7be86ecd3c Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期一, 09 一月 2023 16:58:56 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 35 insertions(+), 12 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 c4fcdb6..4178662 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -176,7 +176,9 @@ .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); - if (jsonObject.getInteger("code").equals(200)) { + LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed()); + Integer code = jsonObject.getInteger("code"); + if (code == 200) { StartupDto dto = jsonObject.getObject("data", StartupDto.class); barcodeThread.setBarcode(""); @@ -188,6 +190,19 @@ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触"); } } else { + staProtocol.setWorkNo((short) 9999); + staProtocol.setStaNo((short)(inSta.getStaNo()+1)); + devpThread.setPakMk(staProtocol.getSiteId(), false); + boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); + + if(!Cools.isEmpty(ledThread)){ + String errorMsg = jsonObject.getString("msg"); + if(!Cools.isEmpty(errorMsg)){ + LedCommand ledCommand = new LedCommand(); + ledCommand.setTitle(errorMsg); + MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(9, ledCommand)); + } + } log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response); } @@ -330,14 +345,14 @@ continue; } String barcode = barcodeThread.getBarcode(); - if(!Cools.isEmpty(barcode)) { - log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode); - if("NG".endsWith(barcode) || "NoRead".equals(barcode)) { - continue; - } - } else { - continue; - } +// if(!Cools.isEmpty(barcode)) { +// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode); +// if("NG".endsWith(barcode) || "NoRead".equals(barcode)) { +// continue; +// } +// } else { +// continue; +// } // 鑾峰彇鎷f枡鍏ュ簱绔欎俊鎭� SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); @@ -1910,7 +1925,11 @@ break; case 402://1F if (pakout != null) { - if (devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) { + if ((pakout.getIoType()==103 || pakout.getIoType()==107)&& pakout.getWrkSts()==14 && devpThread.getStation().get(inSta.getStaNo()-1).getWorkNo()==0){ + }else if ((pakout.getIoType()==103 || pakout.getIoType()==107)&& pakout.getWrkSts()==14 && devpThread.getStation().get(inSta.getStaNo()-1).getWorkNo()!=0) { + // 鍏ュ簱妯″紡 + devpThread.ioModeOf4F = IoModeType.PAKIN_MODE; + }else if (devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) { // 鍑哄簱鍒囨崲涓� devpThread.ioModeOf4F = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); @@ -1922,8 +1941,12 @@ } } } else { - // 鍏ュ簱妯″紡 - devpThread.ioModeOf4F = IoModeType.PAKIN_MODE; + List<WrkMast> wrkMasts = wrkMastMapper.selectWorkings(); + if (wrkMasts.size()==0){ + // 鍏ュ簱妯″紡 + devpThread.ioModeOf4F = IoModeType.PAKIN_MODE; + }else { + } } break; } -- Gitblit v1.9.1