From 954465859ef42385a406788d19578335883abed1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 14 五月 2022 23:39:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 0b89c2c..d4d7f4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -944,6 +944,7 @@
throw new CoolException("鎿嶄綔澶辫触锛屽綋鍓嶄粨搴撴壘涓嶅埌绌哄簱浣�");
}
+ Date now = new Date();
// 淇敼宸ヤ綔妗�
StaDesc staDesc = staDescService.queryCrnStn(targetLoc.getCrnNo());
if (Cools.isEmpty(staDesc)) {
@@ -952,10 +953,29 @@
wrkMast.setWrkSts(2L);
wrkMast.setLocNo(targetLoc.getLocNo());
wrkMast.setStaNo(staDesc.getCrnStn());
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(userId);
if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
}
-
+ // 淇敼搴撲綅鐘舵�� O ===>>> S
+ if (targetLoc.getLocSts().equals("O")){
+ targetLoc.setLocSts("S"); // S.鍏ュ簱棰勭害
+ targetLoc.setModiUser(userId);
+ targetLoc.setModiTime(now);
+ if (!locMastService.updateById(targetLoc)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(targetLoc.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ // 绂佺敤寮傚父搴撲綅
+// locMast.setLocSts("X"); // X.绂佺敤
+// locMast.setModiUser(userId);
+// locMast.setModiTime(now);
+// if (!locMastService.updateById(locMast)){
+// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+// }
return targetLoc.getLocNo();
}
--
Gitblit v1.9.1