From 009ed5a278999b2cf32f241fd489a41559923f6c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 20:58:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java | 2 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 8 ++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ee9f0b8..e8f1218 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -91,9 +91,13 @@
throw new CoolException("鍥涘悜搴撲换鍔℃湭鎵惧埌");
}
if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
- wrkMast.setWrkSts(4L);
+ if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
+ wrkMast.setWrkSts(4L);
+ }
} else {
- wrkMast.setWrkSts(14L);
+ if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
+ wrkMast.setWrkSts(14L);
+ }
}
wrkMast.setModiTime(new Date());
if (!wrkMastService.updateById(wrkMast)) {
diff --git a/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java b/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java
index 58246a0..1d92848 100644
--- a/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java
@@ -7,5 +7,7 @@
//涓婄骇绯荤粺宸ヤ綔鍙�
private String superTaskNo;
+ private String msgType;
+
//private String taskNo;
}
--
Gitblit v1.9.1