From ae91523e49af02438f58a9fd5f590a483a297417 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 01 十二月 2023 13:37:44 +0800
Subject: [PATCH] #盘点逻辑
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 610 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 420 insertions(+), 190 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 668749f..4b44e70 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -205,12 +205,12 @@
// devpThread.setPakMk(staProtocol.getSiteId(), false);
// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- // 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));
- }
+// // 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;
}
@@ -272,6 +272,7 @@
String errorMsg = jsonObject.getString("msg");
if (!Cools.isEmpty(errorMsg)) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ ledThread.setLedMk(false);
}
}
News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -285,6 +286,7 @@
if (ledThread != null) {
String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ ledThread.setLedMk(false);
}
}
} catch (Exception e) {
@@ -414,68 +416,65 @@
}
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) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
-
WrkMast wrkMast = null;
- wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
- if (wrkMast == null) {
+ if (staProtocol.getWorkNo() > 0) {//瀛樺湪宸ヤ綔鍙凤紝鍒╃敤宸ヤ綔鍙锋悳绱换鍔�
+ wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
+ }else {
+ //涓嶅瓨鍦ㄥ伐浣滃彿锛屼緷闈犳墭鐩樻潯鐮佹悳绱�
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if(Cools.isEmpty(barcode)) {
+ continue;
+ }
+ if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
+ continue;
+ }
+ 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.getSourceLocNo());
+ 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) {
+ News.info(th);
+ continue;
+ }
+ //*********************鍚屽簱浣嶇粍鏍￠獙*********************
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
- throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ News.info(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ continue;
}
String sourceLocNo = wrkMast.getSourceLocNo().trim();
@@ -487,7 +486,7 @@
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(pickSta.getStaNo()); // 婧愮珯
+ wrkMast.setSourceStaNo(pickSta.getBackSta()); // 婧愮珯
// wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
// wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
@@ -496,10 +495,12 @@
wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
wrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(wrkMast) == 0) {
- throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ continue;
}
if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
- throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ continue;
}
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
@@ -507,127 +508,252 @@
locMast.setLocSts("Q");
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
- throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ News.info("淇敼搴撲綅鐘舵�佸け璐�");
+ continue;
}
- 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()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
-//// .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();
-//
-// // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
-//// if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
-//// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
-//// }
-// // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-// if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
-// throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
-// }
-//
-// String sourceLocNo = wrkMast.getSourceLocNo().trim();
-// LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
-// if (liftStaProtocol == null) {
-// continue;
-// }
-//
-// // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
-// 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() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
-// }
-// if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
-// throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
-// }
-//
-// // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
-// 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.setWorkNo(wrkMast.getWrkNo().shortValue());//鍐欏叆宸ヤ綔鍙�
+ staProtocol.setStaNo(pickSta.getBackSta().shortValue());//鍐欏叆鐩爣绔�
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
}
}
}
+
+// /**
+// * 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+// */
+// @Transactional
+// public synchronized void stnToCrnStnPick(){
+// for (DevpSlave devp : slaveProperties.getDevp()) {
+// // 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
+// for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
+//
+// // 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
+// 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() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+// }
+//
+// String sourceLocNo = wrkMast.getSourceLocNo().trim();
+// LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+// if (liftStaProtocol == null) {
+// continue;
+// }
+//
+// // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+// 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() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+// }
+// if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
+// throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+// }
+//
+// // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+// 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()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+////// .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();
+////
+//// // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+////// if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
+////// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
+////// }
+//// // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+//// if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
+//// throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+//// }
+////
+//// String sourceLocNo = wrkMast.getSourceLocNo().trim();
+//// LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+//// if (liftStaProtocol == null) {
+//// continue;
+//// }
+////
+//// // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+//// 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() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+//// }
+//// if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
+//// throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+//// }
+////
+//// // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+//// 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();
+//// }
+//
+// }
+// }
+//
+// }
+// }
/**
* 鍒濆鍖栧疄鏃跺湴鍥�
@@ -737,6 +863,7 @@
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢锛岃嚜鍔ㄣ�佺┖闂层�佹湁鐗�
if (!(liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && liftStaProtocol.getHasTray())) {
+ News.info("{}浠诲姟锛岃緭閫佺珯鐐圭姸鎬佷笉婊¤冻鍏ュ簱銆傝緭閫佺珯鐐�:{}", wrkMast.getWrkNo(), JSON.toJSONString(liftStaProtocol));
continue;
}
@@ -797,7 +924,8 @@
public boolean shuttleInExecuteStep1(WrkMast wrkMast, LiftStaProtocol liftStaProtocol) {
if (wrkMast.getWrkSts() == 4) {
if (wrkMast.getShuttleNo() == null) {//娌℃湁缁戝畾灏忚溅锛岃繘琛岃皟搴�
- shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), liftStaProtocol.getLocNo());//璋冨害灏忚溅鍒拌揣鐗╂墍鍦ㄨ緭閫佺珯鐐硅繘琛屽彇璐�
+ boolean result = shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), liftStaProtocol.getLocNo());//璋冨害灏忚溅鍒拌揣鐗╂墍鍦ㄨ緭閫佺珯鐐硅繘琛屽彇璐�
+ News.info("{}浠诲姟锛岃皟搴﹀皬杞}绯荤粺绛夊緟涓�", wrkMast.getWrkNo(), result ? "鎴愬姛" : "澶辫触");
return false;
}
@@ -811,16 +939,19 @@
return false;
}
if (!shuttleProtocol.isIdle()) {
+ News.info("{}浠诲姟锛寋}灏忚溅蹇欑涓�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//鍒ゆ柇灏忚溅浠ょ墝鏄惁鏈鍗犻
if (shuttleProtocol.getToken() != 0) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屼护鐗屽凡琚嫭鍗狅紝绂佹娲惧彂浠诲姟", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;//灏忚溅宸茶鐙崰锛岀姝㈠啀娲惧彂浠诲姟
}
//鍒ゆ柇灏忚溅鏄惁瀛樺湪绉诲姩浠诲姟
WrkMast hasMoveWorking = wrkMastMapper.selectShuttleHasMoveWorking(wrkMast.getShuttleNo());
if (hasMoveWorking != null) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽瓨鍦ㄧЩ鍔ㄤ换鍔★紝绂佹娲惧彂浠诲姟", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;//瀛樺湪绉诲姩浠诲姟锛岀姝㈡墽琛屽叆搴撲换鍔�
}
@@ -828,12 +959,14 @@
if (!shuttleProtocol.getCurrentLocNo().equals(liftStaProtocol.getLocNo())) {
//灏忚溅涓嶅湪杈撻�佺珯鐐逛綅缃�
shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), liftStaProtocol.getLocNo(), wrkMast.getShuttleNo());//璋冨害灏忚溅鍒拌揣鐗╂墍鍦ㄨ緭閫佺珯鐐硅繘琛屽彇璐�
+ News.info("{}浠诲姟锛寋}灏忚溅锛屾湭鍒拌揪杈撻�佺珯鐐癸紝绯荤粺绛夊緟涓�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//灏忚溅宸叉姷杈捐緭閫佺珯鐐逛綅缃紝杩涜鎼繍璐х墿
NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getLocNo());
if (result == null) {//璺緞璁＄畻澶辫触
+ News.info("{}浠诲姟锛寋}灏忚溅锛岃矾寰勮绠楀け璐ワ紝绯荤粺绛夊緟涓�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
@@ -884,6 +1017,7 @@
wrapper.eq("stn_no", wrkMast.getStaNo());//鍑哄簱绔欑偣缂栧彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (staDesc == null) {
+ News.info("{}浠诲姟锛屽嚭搴撹矾寰勪笉瀛樺湪", wrkMast.getWrkNo());
return false;//鍑哄簱璺緞涓嶅瓨鍦�
}
@@ -894,17 +1028,28 @@
}
if (!basDevp.getAutoing().equals("Y")) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屼笉鏄嚜鍔ㄧ姸鎬�",wrkMast.getWrkNo(),basDevp.getDevNo());
return false;//涓嶆槸鑷姩鐘舵��
}
if (!basDevp.getOutEnable().equals("Y")) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), basDevp.getDevNo());
return false;//鍑哄簱绔欑偣涓嶅彲鍑�
}
Integer liftNo = basDevp.getLiftNo();//鎼滅储鍑哄簱鎻愬崌鏈烘槸鍚﹀瓨鍦ㄥ叆搴撲换鍔★紝濡傚瓨鍦ㄧ姝㈠嚭搴�
List<WrkMast> liftWrkMasts = wrkMastMapper.selectInWrkMastByLiftNo(liftNo);
if (!liftWrkMasts.isEmpty()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屽瓨鍦ㄥ叆搴撲换鍔★紝绯荤粺绂佹鍑哄簱", wrkMast.getWrkNo(), liftNo);
return false;//瀛樺湪鍏ュ簱浠诲姟锛岀姝㈠嚭搴�
+ }
+
+ //鍚屽簱浣嶇粍鏍￠獙
+ List<String> outerLoc = Utils.getGroupOuterLoc(wrkMast.getSourceLocNo());
+ List<LocMast> outerLocMasts = locMastService.selectNotEmptyLocNos(outerLoc);
+ if (!outerLocMasts.isEmpty()) {
+ News.info("{}浠诲姟锛屾祬搴撲綅瀛樺湪璐х墿锛岀郴缁熺瓑寰呬腑", wrkMast.getWrkNo());
+ return false;//娴呭簱浣嶅瓨鍦ㄦ湭鎵ц浠诲姟
}
//鑾峰彇婧愮珯
@@ -914,11 +1059,13 @@
}
if (!(liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && !liftStaProtocol.getHasTray())) {
+ News.info("{}浠诲姟锛寋}鍐呴儴杈撻�佺珯锛屼笉婊¤冻鑷姩銆佺┖闂层�佹棤鎵樼洏鐘舵��", wrkMast.getWrkNo(), liftStaProtocol.getStaNo());
return false;//绔欑偣蹇呴』鑷姩銆佺┖闂层�佹病鏈夋墭鐩�
}
if (wrkMast.getShuttleNo() == null) {//娌℃湁缁戝畾灏忚溅锛岃繘琛岃皟搴�
- shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo());//璋冨害灏忚溅鍒拌揣鐗╂墍鍦ㄥ簱浣嶈繘琛屽彇璐�
+ boolean result = shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo());//璋冨害灏忚溅鍒拌揣鐗╂墍鍦ㄥ簱浣嶈繘琛屽彇璐�
+ News.info("{}浠诲姟锛岃皟搴﹀皬杞}绯荤粺绛夊緟涓��", wrkMast.getWrkNo(), result ? "鎴愬姛" : "澶辫触");
return false;
}
@@ -932,10 +1079,12 @@
return false;
}
if (!shuttleProtocol.isIdle()) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽繖纰屼腑", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//鍒ゆ柇灏忚溅浠ょ墝鏄惁鏈鍗犻
if (shuttleProtocol.getToken() != 0) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屼护鐗屽凡琚嫭鍗狅紝绂佹娲惧彂浠诲姟", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;//灏忚溅宸茶鐙崰锛岀姝㈠啀娲惧彂浠诲姟
}
@@ -943,12 +1092,14 @@
if (!shuttleProtocol.getCurrentLocNo().equals(wrkMast.getSourceLocNo())) {
//灏忚溅涓嶅湪杈撻�佺珯鐐逛綅缃�
shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getShuttleNo());//璋冨害灏忚溅鍒拌揣鐗╂墍鍦ㄥ簱浣嶈繘琛屽彇璐�
+ News.info("{}浠诲姟锛寋}灏忚溅锛屾湭鍒拌揪杈撻�佺珯鐐癸紝绯荤粺绛夊緟涓�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//灏忚溅宸叉姷杈捐揣鐗╀綅缃紝杩涜鎼繍璐х墿
NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), liftStaProtocol.getLocNo());//灏嗚揣鐗╂惉杩愯嚦鎻愬崌鏈鸿緭閫佺珯鐐�
if (result == null) {//鍑哄簱璺緞璁＄畻澶辫触
+ News.info("{}浠诲姟锛寋}灏忚溅锛岃矾寰勮绠楀け璐ワ紝绯荤粺绛夊緟涓�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
@@ -986,8 +1137,6 @@
}
//鍥涘悜绌挎杞︾姸鎬佷负绛夊緟纭銆佸皬杞﹀浜庣┖闂茬姸鎬�
-
-
if (shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.WAITING.id //浠诲姟瀹屾垚绛夊緟纭
&& shuttleProtocol.getTaskNo() != 0
&& shuttleProtocol.getFree() == ShuttleStatusType.IDLE.id
@@ -1097,11 +1246,13 @@
}
if (!liftProtocol.isIdle()) {
+ News.info("{}鍙锋彁鍗囨満锛屽繖纰屼腑", liftSlave.getId());
continue;
}
//鍒ゆ柇鎻愬崌鏈轰护鐗屾槸鍚﹁鍗犵敤
if (liftProtocol.getToken() != 0) {
+ News.info("{}鍙锋彁鍗囨満锛屼护鐗屽凡琚嫭鍗�", liftSlave.getId());
continue;
}
@@ -1115,6 +1266,7 @@
//鎼滅储鏄惁鏈夊叾浠栦换鍔″崰鐢ㄤ簡鎻愬崌鏈猴紝濡傛灉鍗犵敤鎻愬崌鏈虹殑浠诲姟鍜屽綋鍓嶄换鍔＄浉鍚岋紝鍒欒繍琛屾墽琛�
WrkMast wrkMast1 = wrkMastMapper.selectLiftWrkMast(liftProtocol.getLiftNo().intValue());
if (wrkMast1 != null && wrkMast1.getWrkNo().intValue() != wrkMast.getWrkNo().intValue()) {
+ News.info("{}鍙锋彁鍗囨満锛岃鍏朵粬浠诲姟{}鍗犵敤涓斿拰褰撳墠浠诲姟{}涓嶇浉鍚岋紝绂佹娲惧彂", liftSlave.getId(), wrkMast1.getWrkNo(), wrkMast.getWrkNo());
continue;
}
@@ -1150,7 +1302,30 @@
}
if (!sourceBasDevp.getInEnable().equals("Y")) {
+ News.info("{}浠诲姟锛寋}婧愮珯锛屾病鏈夊彲鍏ヤ俊鍙�", wrkMast.getWrkNo(), sourceBasDevp.getDevNo());
return false;//绔欑偣涓嶅彲鍏�
+ }
+
+ Integer barcodeId = Utils.getBarcodeIdByStaNo(wrkMast.getSourceStaNo());
+ if (barcodeId == null) {
+ News.info("{}浠诲姟锛寋}婧愮珯锛屾壘涓嶅埌鍙敤鏉＄爜鍣↖D", wrkMast.getWrkNo(), sourceBasDevp.getDevNo());
+ return false;//绔欑偣涓嶅彲鍏�
+ }
+
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+ if (barcodeThread == null) {
+ News.info("{}浠诲姟锛寋}婧愮珯锛屾潯鐮佸櫒{}绾跨▼涓虹┖", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId);
+ return false;//绔欑偣涓嶅彲鍏�
+ }
+ String barcode = barcodeThread.getBarcode();
+ if(!Cools.isEmpty(barcode)) {
+ if(!("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode))) {
+ //瀛樺湪鏉＄爜鍊硷紝鍒ゆ柇鏄惁鍜屽綋鍓嶅伐浣滄。涓�鑷�
+ if (!barcode.equals(wrkMast.getBarcode())) {
+ News.info("{}浠诲姟锛屾潯鐮佸櫒{}鍊納}涓庡伐浣滄。鏉＄爜鍊间笉涓�鑷达紝绯荤粺璺宠繃鎵ц", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId, barcode);
+ return false;//绔欑偣涓嶅彲鍏�
+ }
+ }
}
//鍒ゆ柇鎻愬崌鏈烘暣涓笁妤兼槸鍚﹂兘澶勪簬鍏ュ簱妯″紡
@@ -1158,10 +1333,12 @@
Integer outInModel2 = Utils.getOutInModelByLift(sourceBasDevp.getLiftNo(), 5);
Integer outInModel3 = Utils.getOutInModelByLift(sourceBasDevp.getLiftNo(), 8);
if (outInModel1 == null || outInModel2 == null || outInModel3 == null) {
+ News.info("{}浠诲姟锛屾病鏈夊嚭鍏ュ簱妯″紡", wrkMast.getWrkNo());
return false;//涓嶅瓨鍦ㄥ嚭鍏ュ簱妯″紡
}
if (outInModel1 == 2 || outInModel2 == 2 && outInModel3 == 2) {
+ News.info("{}浠诲姟锛屾湁绔欑偣澶勪簬鍑哄簱妯″紡锛岀姝㈠叆搴�", wrkMast.getWrkNo());
return false;//鍙鏈変竴涓浜庡嚭搴撴ā寮忥紝绂佹鍏ュ簱
}
@@ -1174,26 +1351,31 @@
return false;
}
if (!liftProtocol.isIdle()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屽繖纰屼腑", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;
}
//鍒ゆ柇鎻愬崌鏈轰护鐗屾槸鍚︽湭琚崰棰�
if (liftProtocol.getToken() != 0) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屼护鐗屽凡琚嫭鍗狅紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄凡琚嫭鍗狅紝绂佹鍐嶆淳鍙戜换鍔�
}
//鍒ゆ柇鎻愬崌鏈哄唴鏄惁鏈夊皬杞�
if (liftProtocol.getHasCar()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呴儴鏈夊皬杞︼紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鏈夊皬杞︼紝绂佹娲惧彂
}
//鍒ゆ柇鎻愬崌鏈哄唴鏄惁鏈夋墭鐩�
if (liftProtocol.getHasTray()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呴儴鏈夋墭鐩橈紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鏈夋墭鐩橈紝绂佹娲惧彂
}
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftThread.getSlave().getId());
if (liftWrkMast != null) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屽綋鍓嶆彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
@@ -1206,6 +1388,7 @@
}
if (targetStaProtocol.getHasTray()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛寋}绔欑偣锛屾彁鍗囨満绔欑偣鏈夋墭鐩橈紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo(), targetStaProtocol.getStaNo());
return false;//鎻愬崌鏈虹珯鐐规湁鎵樼洏锛岀姝㈡淳鍙�
}
@@ -1262,12 +1445,14 @@
//鑾峰彇鍑哄簱绔欑偣(鐩爣绔�)
BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNo());
if (basDevp == null) {
+ News.info("{}浠诲姟锛屽嚭搴撶珯鐐逛笉瀛樺湪锛岀姝㈡淳鍙�", wrkMast.getWrkNo());
return false;//鍑哄簱绔欑偣涓嶅瓨鍦�
}
//鑾峰彇婧愮珯瀵瑰簲鐨勭墰鐪兼彁鍗囨満绔欑偣缂栧彿(璧风偣缂栧彿)
LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(basDevp.getLiftNo(), Utils.getLev(wrkMast.getSourceLocNo()));
if (liftStaProtocol == null) {
+ News.info("{}浠诲姟锛屾壘涓嶅埌绔欑偣锛岀姝㈡淳鍙�", wrkMast.getWrkNo());
return false;//鎵句笉鍒扮珯鐐�
}
Integer startSta = liftStaProtocol.getStaNo();
@@ -1278,11 +1463,13 @@
//璋冨害灏忚溅閬胯
boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkMast.getSourceLocNo()), wrkMast.getShuttleNo(), shuttleThread);
if (!result) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞﹀湪杈撻�佺珯鐐硅皟搴﹀皬杞﹂伩璁╁け璐�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
}
if (!basDevp.getOutEnable().equals("Y")) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙凤紝绂佹娲惧彂", wrkMast.getWrkNo(), basDevp.getDevNo());
return false;//鍑哄簱绔欑偣涓嶅彲鍑�
}
@@ -1296,21 +1483,25 @@
}
if (!liftProtocol.isIdle()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屽繖纰屼腑", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;
}
//鍒ゆ柇鎻愬崌鏈轰护鐗屾槸鍚︽湭琚崰棰�
if (liftProtocol.getToken() != 0) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屼护鐗屽凡琚嫭鍗狅紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄凡琚嫭鍗狅紝绂佹鍐嶆淳鍙戜换鍔�
}
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftThread.getSlave().getId());
if (liftWrkMast != null) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屽綋鍓嶆彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
//鑾风洰鏍囩珯婧愮珯瀵瑰簲鐨勮緭閫佺珯鐐�
BasDevp targetBasDevp = basDevpService.selectById(wrkMast.getStaNo());
if (targetBasDevp == null) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛岀珯鐐逛笉瀛樺湪锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), wrkMast.getStaNo());
return false;//绔欑偣涓嶅瓨鍦�
}
//鑾峰彇鐗涚溂鎻愬崌鏈虹珯鐐圭紪鍙�(鐩爣缂栧彿)
@@ -2276,6 +2467,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
+ log.info("鎮寕绾匡紝wms杩斿洖缁撴灉锛�" + jsonObject);
Integer code = jsonObject.getInteger("code");
if (code.equals(200)) {//鍛煎彨AGV
return true;
@@ -2292,7 +2484,7 @@
*/
public void agvRestockIntoByHangingWire() {
//妫�娴�350鍜�351鎵爜鍣�
- int[] barcodeStaNo = {10, 11};//10 => 350绔欐壂鐮佸櫒,11 => 351绔欐壂鐮佸櫒
+ int[] barcodeStaNo = {11, 12};//11 => 350绔欐壂鐮佸櫒,12 => 351绔欐壂鐮佸櫒
for (int staNo : barcodeStaNo) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, staNo);
@@ -2301,15 +2493,22 @@
}
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
+ if (barcode.contains("NoRead")) {
+ continue;
+ }
+
String agvStaNo = null;
- if (staNo == 10) {
+ if (staNo == 11) {
agvStaNo = "303-1";
}else {
agvStaNo = "304-1";
}
//閫氱煡AGV鍙栬揣
- agvRestockCall(agvStaNo, barcode);
- log.info(staNo + "鍙锋壂鐮佸櫒锛岄�氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
+ boolean result = agvRestockCall(agvStaNo, barcode);
+ if (result) {
+ barcodeThread.setBarcode("");
+ }
+ log.info(barcodeThread.getSlave().getId() + "鍙锋壂鐮佸櫒锛岄�氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
}
}
}
@@ -2454,6 +2653,7 @@
Utils.wapperSetCondition(wrapper,"batch",locDetl.getBatch());
Utils.wapperSetCondition(wrapper,"three_code",locDetl.getThreeCode());
Utils.wapperSetCondition(wrapper,"dead_time",locDetl.getDeadTime());
+ Utils.wapperSetCondition(wrapper,"supp_code",locDetl.getSuppCode());//鏂欑鐮�
WrkDetl detl = wrkDetlService.selectOne(wrapper);
if (Cools.isEmpty(detl)) {
String suppCode = "";
@@ -2552,8 +2752,10 @@
for (Integer staNo : led.getStaArr()) {
// 鑾峰彇鍙夎溅绔欑偣
StaProtocol staProtocol = devpThread.getStation().get(staNo);
- if (staProtocol == null) { continue; }
- if (staProtocol.getWorkNo() != 0) {
+ if (staProtocol == null) {
+ continue;
+ }
+ if (staProtocol.isLoading()) {
reset = false;
break;
}
@@ -2562,13 +2764,9 @@
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
// led鏄剧ず榛樿鍐呭
if (reset && !ledThread.isLedMk()) {
- ledThread.setLedMk(false);
+ ledThread.setLedMk(true);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
- News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
- }else {
-// News.error("{}鍙稬ED鍛戒护涓嬪彂鎴愬姛锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
- MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()));
- ledThread.setLedMk(false);
+ log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
}
}
}
@@ -2641,7 +2839,7 @@
wrkCharge.setShuttleNo(shuttle.getId());
wrkCharge.setCharge(shuttleCharge.id);
wrkCharge.setWrkNo(commonService.getChargeWorkNo(4));
- wrkCharge.setWrkSts(51L); // 21.鍑嗗鍏呯數
+ wrkCharge.setWrkSts(51L); // 51.鍑嗗鍏呯數
wrkCharge.setIoPri((double) 10);
wrkCharge.setLocNo(chargeLocNo);
wrkCharge.setMemo("charge");
@@ -2717,6 +2915,10 @@
if (shuttleProtocol.getPowerPercent() < maxPower) {
continue;
+ }
+
+ if (shuttleProtocol.getVoltage() < 5630) {
+ continue;//鐢靛帇涓嶅缁х画鍏呯數
}
//灏忚溅婊＄數锛岀粨鏉熷厖鐢典换鍔�
@@ -2823,11 +3025,13 @@
//灏忚溅澶勪簬绌洪棽鐘舵��
if (!shuttleProtocol.isIdleNoCharge(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞﹀繖纰屼腑", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//鍒ゆ柇灏忚溅浠ょ墝鏄惁鏈鍗犻
if (shuttleProtocol.getToken() != 0) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屼护鐗屽凡琚嫭鍗狅紝绂佹娲惧彂", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;//灏忚溅宸茶鐙崰锛岀姝㈠啀娲惧彂浠诲姟
}
@@ -2852,6 +3056,7 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟(璇ヤ换鍔￠渶瑕佹崲灞傚繀椤绘彁鍓嶇嫭鍗犳彁鍗囨満)
WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftSta.getLiftNo());
if (liftWrkMast != null) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftSta.getLiftNo());
return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
@@ -2862,11 +3067,13 @@
}
boolean checkPathIsAvailable = NavigateUtils.checkPathIsAvailable(targetNodes, shuttleProtocol.getShuttleNo().intValue(), Utils.getLev(wrkMast.getLocNo()), null);
if (!checkPathIsAvailable) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛岀洰鏍囩珯鐐硅矾寰勮鍗犵敤锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;//妫�娴嬬洰鏍囩珯鐐硅矾寰勬槸鍚︽湭琚崰鐢�
}
//灏濊瘯閿佸畾鐩爣绔欒矾寰�
boolean result2 = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(wrkMast.getLocNo()), targetNodes, true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
if (!result2) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛岃矾寰勯攣瀹氬け璐ワ紝绂佹娲惧彂", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;//璺緞閿佸畾澶辫触
}
//*************灏濊瘯閿佸畾鐩爣绔欒矾寰�***************
@@ -2927,6 +3134,7 @@
}
if (basLift.getPoint() == null) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾病鏈夋彁鍗囨満鐐逛綅鍧愭爣锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), basLift.getLiftNo());
return false;//娌℃湁璁剧疆鎻愬崌鏈虹偣浣嶅潗鏍�
}
@@ -2934,6 +3142,7 @@
WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(basLift.getLiftNo());
if (liftWrkMast != null) {
if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), basLift.getLiftNo());
return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
}
@@ -2948,6 +3157,7 @@
}
if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満蹇欑涓紝绂佹娲惧彂", wrkMast.getWrkNo(), basLift.getLiftNo());
return false;
}
@@ -2963,11 +3173,13 @@
//灏忚溅澶勪簬绌洪棽鐘舵��
if (!shuttleProtocol.isIdleNoCharge(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞﹀繖纰屼腑锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//灏忚溅浠ょ墝鏄惁琚换鍔＄嫭鍗�
if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞︿护鐗岃鐙崰锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
@@ -2977,6 +3189,7 @@
//璋冨害鎻愬崌鏈�
if (liftProtocol.getToken() != 0) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満浠ょ墝琚嫭鍗狅紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈轰护鐗岃鍗犵敤
}
@@ -3016,11 +3229,13 @@
//鍒ゆ柇鎻愬崌鏈轰护鐗屾槸鍚︿负褰撳墠灏忚溅
if (!liftProtocol.getToken().equals(wrkMast.getShuttleNo())) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満浠ょ墝琚嫭鍗狅紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄凡琚嫭鍗狅紝绂佹鍐嶆淳鍙戜换鍔�
}
//鍒ゆ柇灏忚溅鏄惁涓哄綋鍓嶄换鍔＄嫭鍗�
if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞︿护鐗岃鐙崰锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
@@ -3083,23 +3298,27 @@
return false;
}
if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満蹇欑涓紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;
}
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftThread.getSlave().getId());
if (liftWrkMast != null) {
if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
}
//鍒ゆ柇鎻愬崌鏈轰护鐗屾槸鍚︿负褰撳墠灏忚溅
if (!liftProtocol.getToken().equals(wrkMast.getShuttleNo())) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満浠ょ墝鍜屽綋鍓嶅皬杞︿笉涓�鑷达紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈轰护鐗屽拰褰撳墠灏忚溅涓嶄竴鑷达紝绂佹娲惧彂
}
//鍒ゆ柇鎻愬崌鏈哄唴鏄惁鏈夊皬杞�
if (!liftProtocol.getHasCar()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮棤灏忚溅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄唴鏃犲皬杞�
}
@@ -3115,11 +3334,13 @@
//灏忚溅澶勪簬绌洪棽鐘舵��
if (!shuttleProtocol.isIdleNoCharge()) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満蹇欑涓紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;
}
//鍒ゆ柇灏忚溅鏄惁涓哄綋鍓嶄换鍔＄嫭鍗�
if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞﹀綋鍓嶄换鍔℃湭琚嫭鍗狅紝绂佹娲惧彂", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
@@ -3128,6 +3349,7 @@
//鑾峰彇鐩爣绔�
LiftStaProtocol liftSta = NyLiftUtils.getLiftStaByStaNo(wrkMast.getStaNo());
if (sourceLiftSta == null || liftSta == null) {
+ News.info("{}浠诲姟锛岀己灏戠珯鐐逛俊鎭紝绂佹娲惧彂", wrkMast.getWrkNo());
return false;//缂哄皯绔欑偣淇℃伅
}
@@ -3176,6 +3398,7 @@
return false;
}
if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満蹇欑涓紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;
}
@@ -3183,12 +3406,14 @@
WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftThread.getSlave().getId());
if (liftWrkMast != null) {
if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
}
//鍒ゆ柇鎻愬崌鏈轰护鐗屾槸鍚︿负褰撳墠灏忚溅
if (!liftProtocol.getToken().equals(wrkMast.getShuttleNo())) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満浠ょ墝鍜屽綋鍓嶅皬杞︿笉涓�鑷达紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈轰护鐗屽拰褰撳墠灏忚溅涓嶄竴鑷达紝绂佹娲惧彂
}
@@ -3204,11 +3429,13 @@
//灏忚溅澶勪簬绌洪棽鐘舵��
if (!shuttleProtocol.isIdleNoCharge()) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞﹀繖纰屼腑锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//鍒ゆ柇灏忚溅鏄惁涓哄綋鍓嶄换鍔＄嫭鍗�
if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞︿护鐗岃鐙崰锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
@@ -3224,6 +3451,7 @@
return false;//娌℃湁鎻愬崌鏈烘暟鎹�
}
if (basLift.getPoint() == null) {
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛岀己灏戞彁鍗囨満鐐逛綅鍧愭爣锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//娌℃湁璁剧疆鎻愬崌鏈虹偣浣嶅潗鏍�
}
@@ -3283,11 +3511,13 @@
//灏忚溅澶勪簬绌洪棽鐘舵��
if (!shuttleProtocol.isIdleNoCharge(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞﹀繖纰屼腑锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
//鍒ゆ柇灏忚溅浠ょ墝鏄惁涓哄綋鍓嶄换鍔�
if (shuttleProtocol.getToken() != 0 && !shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
+ News.info("{}浠诲姟锛寋}灏忚溅锛屽皬杞︿护鐗岃鐙崰锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;
}
--
Gitblit v1.9.1