From ef9e9dd3274ca95a2838021d77704b74cef66f2f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 30 五月 2025 15:05:29 +0800
Subject: [PATCH] 堆垛机出库完成延迟10s读输送线上任务号，避免提前上报给wms
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index a8fa26e..a77541d 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -148,7 +148,7 @@
// Short totalBay = locMastMapper.selectTotalBay();
vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
+ vo.setBay(crnProtocol.getBay()); // 褰撳墠鍒�
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
@@ -156,9 +156,10 @@
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
+ if (taskWrk != null) {
+ vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType()));
} else {
vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO : CrnStatusType.MACHINE_UN_AUTO);
}
@@ -284,14 +285,16 @@
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
if (staProtocol.getWorkNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
- if (wrkMast != null) {
- vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
- vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
- vo.setSourceStaNo(wrkMast.getSourceStaNo$());
- vo.setStaNo(wrkMast.getStaNo$());
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
+// WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(staProtocol.getWorkNo()));
+
+ if (taskWrk != null) {
+ vo.setWrkSts(taskWrk.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(taskWrk.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceStaNo(taskWrk.getStartPoint());
+ vo.setStaNo(taskWrk.getTargetPoint());
+ vo.setSourceLocNo(taskWrk.getStartPoint());
+ vo.setLocNo(taskWrk.getTargetPoint());
}
}
@@ -336,7 +339,7 @@
if (crnProtocol.getTaskNo() > 0) {
TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (taskWrk != null) {
vo.setSourceStaNo(taskWrk.getStartPoint());
vo.setStaNo(taskWrk.getTargetPoint());
--
Gitblit v1.9.1