From 84168cb0fa1ca6bc2b8d088776d9e04401edb883 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 05 五月 2025 16:08:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 12 ++++++++++--
1 files changed, 10 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..7547998 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -91,9 +91,17 @@
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")) {
+ if (wrkMast.getStaNo()==1031){
+ wrkMast.setWrkSts(106L);
+ }else {
+ wrkMast.setWrkSts(14L);
+ }
+ }
}
wrkMast.setModiTime(new Date());
if (!wrkMastService.updateById(wrkMast)) {
--
Gitblit v1.9.1