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/plugin/NormalProcess.java | 2
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 49 ------------------------
src/main/java/com/zy/common/service/CommonService.java | 2
src/main/resources/application.yml | 6 +-
src/main/java/com/zy/core/plugin/FakeProcess.java | 5 ++
5 files changed, 9 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 52fba06..73e20a9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -259,7 +259,7 @@
wrkMast.setIoPri(ioPri);
wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
wrkMast.setSourceStaNo(Integer.valueOf(param.getSourceStaNo()));//婧愮珯
- wrkMast.setStaNo(Integer.valueOf(param.getSourceStaNo()));//鐩爣绔�
+ wrkMast.setStaNo(Integer.valueOf(param.getStaNo()));//鐩爣绔�
wrkMast.setWmsWrkNo(String.valueOf(param.getTaskNo()));
wrkMast.setBarcode(param.getBarcode());
wrkMast.setAppeTime(now);
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index 1c8841b..8e76483 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -506,10 +506,13 @@
taskParam.setLocNo(dto.getLocNo());
taskParam.setTaskPri(dto.getTaskPri());
taskParam.setBarcode(barcode);
+ taskParam.setCrnNo(dto.getCrnNo());
+ taskParam.setStaNo(dto.getStaNo()+"");
+ taskParam.setSourceStaNo(dto.getSourceStaNo()+"");
WrkMast wrkMast = commonService.createInTask(taskParam);
StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO,
- wrkMast.getWrkNo(), stationId, stationId, 0);
+ wrkMast.getWrkNo(), stationId, dto.getStaNo(), 0);
if (command == null) {
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 018cbfc..8a73d82 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -71,7 +71,7 @@
//鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔�
stationOperateProcessUtils.stationOutExecute();
//妫�娴嬪嚭搴撲换鍔″埌杈剧洰鐨勫湴
- stationOperateProcessUtils.arriveAtTheDestination();
+// stationOperateProcessUtils.arriveAtTheDestination();
//妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
stationOperateProcessUtils.stationOutExecuteFinish();
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());
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 841d4cb..22051b5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,7 +17,7 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/hcwcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/nbtlwcs-ddj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
@@ -72,8 +72,8 @@
threadControlCount: 10
liftType: lift
-#mainProcessPlugin: FakeProcess
-mainProcessPlugin: NormalProcess
+mainProcessPlugin: FakeProcess
+#mainProcessPlugin: NormalProcess
deviceLogStorage:
# 璁惧鏃ュ織瀛樺偍鏂瑰紡 mysql file
--
Gitblit v1.9.1