From 2b1c858126f9c059bd6e308923eabfc71b1b4e7a Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 11 八月 2025 17:03:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 c99303c..b6df9d2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -340,7 +340,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(staDesc.getStnNo() == 1064 ? 14D: 13D); // 绌烘《鍑哄簱鍒颁簩鍙风綈瑁呯嚎浼樺厛绾ф彁楂�
+ wrkMast.setIoPri(staDesc.getStnNo() == 1064 || staDesc.getStnNo() == 1031 ? 14D: 13D); // 绌烘《鍑哄簱鍒颁簩鍙风綈瑁呯嚎,鍘绘墦鍖咃紝浼樺厛绾ф彁楂�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -823,7 +823,7 @@
if (wrkMast.getStaNo() == 1090 && wrkMast.getLocNo() == null) {
throw new CoolException(workNo+"宸ヤ綔妗ｆ棤娉曞畬鎴�,搴撲綅鍙蜂负绌猴紒");
}
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
+ if (wrkMast.getWrkSts() == 4L || wrkMast.getWrkSts() == 14L || wrkMast.getWrkSts() == 54L) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 瀹屾垚绌烘《搴撳叆鍑哄簱浠诲姟鍙︿竴涓换鍔�
@@ -843,6 +843,9 @@
workNoOther = wrkMast.getWorkNoOther();
} else if(wrkMast.getIoType() == 1 && wrkMast.getWrkSts() == 10) {
wrkMast.setWrkSts(2L);
+ wrkMast.setRgvFinishTime(new Date());
+ } else if(wrkMast.getIoType() == 120) {
+ wrkMast.setWrkSts(54L);
wrkMast.setRgvFinishTime(new Date());
}
Date now = new Date();
@@ -1101,7 +1104,7 @@
String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
// 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
- if (wrkMast.getWrkSts() <= 10) {
+ if (wrkMast.getWrkSts() <= 10 && wrkMast.getIoType()!=120) {
locNo = wrkMast.getLocNo();
locSts = "O";
@@ -1118,7 +1121,7 @@
locMastService.updateById(locMast);
}
// 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
- } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
+ } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14 && wrkMast.getIoType()!=120) {
locNo = wrkMast.getSourceLocNo();
if (wrkMast.getIoType() == 110) {
if(wrkMast.getStaNo() == 1035) { // 瀛愭媶鐩樻満绔欑偣
@@ -1143,6 +1146,16 @@
locMast.setModiUser(userId);
locMastService.updateById(locMast);
}
+ } else if (wrkMast.getIoType()==120){
+ // 鍙栨秷鎿嶄綔浜哄憳璁板綍
+ wrkMast.setWrkSts(54L);
+ wrkMast.setManuType("鎵嬪姩鍙栨秷");
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐�");
+ }
+ return;
} else {
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
}
--
Gitblit v1.9.1