From 1cc361ec5fca7550ba01f0a6ecf058e84a5a20ad Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 16:25:18 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 5833612..43bc75a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -772,14 +772,18 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() >= 14) {
+ if (wrkMast.getWrkSts() == 4 || (wrkMast.getWrkSts() >= 14 && wrkMast.getWrkSts() <= 15)) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
wrkMast.setWrkSts(4L);
// 鍑哄簱
- } else if (wrkMast.getWrkSts() > 10) {
+ } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() < 15) {
+ wrkMast.setWrkSts(14L);
+ }else if(wrkMast.getWrkSts() >= 103 && wrkMast.getWrkSts() <= 105){
+ wrkMast.setWrkSts(4L);
+ }else if (wrkMast.getWrkSts() >= 106 && wrkMast.getWrkSts() <=108){
wrkMast.setWrkSts(14L);
}
Date now = new Date();
--
Gitblit v1.9.1