From 9cd13322f7c94353465d883a46d977dd4a8ebda5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 15:08:18 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 89 +++++++-------------------------------------
1 files changed, 14 insertions(+), 75 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 6ffce8f..9e470b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2810,20 +2810,6 @@
continue;
}
-// CrnSlave crn = new CrnSlave(crnSlave);
-// if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
-// CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄贩閬撳彿寮傚父锛�");
-// continue;
-// }
-//
-// if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
-// for (CrnSlave crnOther : slaveProperties.getCrn()) {
-// if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
-// crn.updateCrnInStn(crnOther);
-// }
-// }
-// }
-
// 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
@@ -2902,7 +2888,7 @@
if (Cools.isEmpty(taskWrk1)){
continue;
}
- if (taskWrk1.getIoType() == 3 && taskWrk1.getWrkSts()<3){
+ if (taskWrk1.getIoType() == 1 && taskWrk1.getWrkSts()<3){
taskWrk = taskWrk1;
break;
}
@@ -3012,7 +2998,7 @@
}
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
+ if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE)) {
devpThread.setErrorDev(staProtocol.getSiteId(), "鍫嗗灈鏈洪潪绌洪棽");
@@ -3236,19 +3222,7 @@
continue;
}
- CrnSlave crn = new CrnSlave(crnSlave);
- if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
- CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍫嗗灈鏈哄贩閬撳彿寮傚父锛�");
- continue;
- }
-
- if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
- for (CrnSlave crnOther : slaveProperties.getCrn()) {
- if (crnOther.getId().equals(crnProtocol.getLaneNo())) {
- crn.updateCrnInStn(crnOther);
- }
- }
- }
+ CrnSlave crn = crnSlave;
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
@@ -3258,14 +3232,7 @@
log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽贩閬撳彿={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getLaneNo(), crnProtocol.getTaskNo());
continue;
}
-// Thread.sleep(300);
- //纭瀹屾垚淇″彿
-// CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
-// crnOperatorParam.setCrnNo(crn.getId());
Date now = new Date();
-
-// crnController.crnTaskComplete(crnOperatorParam);
-// MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))
crnThread.setResetFlag(true);
if (!Cools.isEmpty(taskWrk)) {
@@ -3311,44 +3278,6 @@
taskWrk.setCompleteTime(now);
taskWrkService.updateById(taskWrk);
-
-// try {
-// HashMap<String, Object> headParam = new HashMap<>();
-// headParam.put("taskNo",taskWrk.getTaskNo());
-// headParam.put("taskStatus",taskWrk.getStatusWms());
-// headParam.put("ioType",taskWrk.getIoTypeWms());
-// headParam.put("barCode",taskWrk.getBarcode());
-// headParam.put("reportTime", LocalDateTime.now());
-// headParam.put("weight",taskWrk.getScWeight().doubleValue());
-//
-// String response;
-// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", headParam);
-//
-// response = new HttpHandler.Builder()
-// // .setHeaders(headParam)
-// .setUri(wmsUrl)
-// .setPath(taskStatusFeedbackPath)
-// .setJson(JSON.toJSONString(headParam))
-// .build()
-// .doPost();
-// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", response);
-//
-//// JSONObject jsonObject = JSON.parseObject(response);
-//// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", jsonObject);
-//
-// apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
-// , wmsUrl + taskStatusFeedbackPath
-// , null
-// , "127.0.0.1"
-// , JSON.toJSONString(headParam)
-// , response
-// , true
-// );
-// } catch (Exception e) {
-// log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触", taskWrk);
-// log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触,鎶ラ敊淇℃伅锛�", e);
-//// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
-// }
}
}
@@ -3367,7 +3296,17 @@
if (crnProtocol == null) {
continue;
}
-
+ if (Cools.isEmpty(crnProtocol.getLocMastDemoList())) {
+ continue;
+ }
+ BasCrnp basCrnp = basCrnpService.selectById(crnSlave.getId());
+ if (basCrnp == null) {
+ log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crnSlave.getId());
+ continue;
+ }
+ if (Cools.isEmpty(basCrnp.getHpMk()) || !basCrnp.getHpMk().equals("Y")){
+ continue;
+ }
for (String locNo : crnProtocol.getLocMastDemoList()){
LocMast locMast = locMastService.selectByLocNo(locNo);
if (locMast.getLocSts().equals("F")){
--
Gitblit v1.9.1