From e3508915adca349eb4adfc2c50ce808696e730f4 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 03 三月 2026 13:59:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 49 -------------------------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index d1bd424..fafe868 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -207,15 +207,7 @@
wrkMast.setCrnNo(crnNo);
wrkMast.setSystemMsg("");
wrkMast.setIoTime(new Date());
- //缁欏簱浣嶇櫧鑹叉寚绀虹伅浜伅
- String[] split = basCrnp.getArr().split(",");
- int i = Arrays.asList(split).indexOf(wrkMast.getLocNo());
if (wrkMastService.updateById(wrkMast)) {
- if (i>-1){
- command.setLocNo(wrkMast.getLocNo());
- command.setIndex(i);
- command.setValue((short)1);
- }
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_IN_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
@@ -304,15 +296,7 @@
wrkMast.setCrnNo(crnNo);
wrkMast.setSystemMsg("");
wrkMast.setIoTime(new Date());
- //缁欏簱浣嶇櫧鑹叉寚绀虹伅浜伅
- String[] split = basCrnp.getArr().split(",");
- int i = Arrays.asList(split).indexOf(wrkMast.getSourceLocNo());
if (wrkMastService.updateById(wrkMast)) {
- if (i>-1){
- command.setLocNo(wrkMast.getSourceLocNo());
- command.setIndex(i);
- command.setValue((short)1);
- }
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_OUT_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
@@ -544,20 +528,7 @@
wrkMast.setCrnNo(crnNo);
wrkMast.setSystemMsg("");
wrkMast.setIoTime(new Date());
- //缁欏簱浣嶇櫧鑹叉寚绀虹伅浜伅
- String[] split = basCrnp.getArr().split(",");
- int i = Arrays.asList(split).indexOf(wrkMast.getLocNo());
- String locNo = wrkMast.getLocNo();
- if (i == -1) {
- i = Arrays.asList(split).indexOf(wrkMast.getSourceLocNo());
- locNo = wrkMast.getSourceLocNo();
- }
if (wrkMastService.updateById(wrkMast)) {
- if (i>-1){
- command.setLocNo(locNo);
- command.setIndex(i);
- command.setValue((short)1);
- }
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
notifyUtils.notify(String.valueOf(SlaveType.Crn), crnNo, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_TRANSFER_TASK_RUN, null);
News.info("鍫嗗灈鏈哄懡浠や笅鍙戞垚鍔燂紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", crnNo, JSON.toJSON(command));
@@ -595,29 +566,15 @@
News.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
continue;
}
- //缁欏簱浣嶇櫧鑹叉寚绀虹伅浜伅
- String[] split = basCrnp.getArr().split(",");
- int i = -1;
- String locNo = "";
Long updateWrkSts = null;
if(wrkMast.getWrkSts() == WrkStsType.INBOUND_RUN.sts){
updateWrkSts = WrkStsType.COMPLETE_INBOUND.sts;
- i = Arrays.asList(split).indexOf(wrkMast.getLocNo());
- locNo = wrkMast.getLocNo();
notifyUtils.notify(String.valueOf(SlaveType.Crn), crnProtocol.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_IN_TASK_COMPLETE, null);
}else if(wrkMast.getWrkSts() == WrkStsType.OUTBOUND_RUN.sts){
updateWrkSts = WrkStsType.OUTBOUND_RUN_COMPLETE.sts;
- i = Arrays.asList(split).indexOf(wrkMast.getSourceLocNo());
- locNo = wrkMast.getSourceLocNo();
notifyUtils.notify(String.valueOf(SlaveType.Crn), crnProtocol.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_OUT_TASK_COMPLETE, null);
}else if(wrkMast.getWrkSts() == WrkStsType.LOC_MOVE_RUN.sts){
updateWrkSts = WrkStsType.COMPLETE_LOC_MOVE.sts;
- i = Arrays.asList(split).indexOf(wrkMast.getLocNo());
- locNo = wrkMast.getLocNo();
- if(i==-1){
- i = Arrays.asList(split).indexOf(wrkMast.getSourceLocNo());
- locNo = wrkMast.getSourceLocNo();
- }
notifyUtils.notify(String.valueOf(SlaveType.Crn), crnProtocol.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.CRN_TRANSFER_TASK_COMPLETE, null);
}else{
News.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗗伐浣滅姸鎬佸紓甯搞�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
@@ -627,14 +584,8 @@
wrkMast.setWrkSts(updateWrkSts);
wrkMast.setSystemMsg("");
wrkMast.setIoTime(new Date());
- wrkMast.setWeight(crnProtocol.getWeight());
if (wrkMastService.updateById(wrkMast)) {
CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo());
- if (i>-1){
- resetCommand.setLocNo(locNo);
- resetCommand.setIndex(i);
- resetCommand.setValue((short)0);
- }
MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(3, resetCommand));
News.info("鍫嗗灈鏈轰换鍔＄姸鎬佹洿鏂版垚鍔燂紝鍫嗗灈鏈哄彿={}锛屽伐浣滃彿={}", basCrnp.getCrnNo(), crnProtocol.getTaskNo());
}
--
Gitblit v1.9.1