From 4c7036fe617faafaea7b9fd1b3cff5f4a4b09616 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 21 八月 2024 10:34:05 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 79f152d..d6ee4b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -876,6 +876,12 @@
// throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
// }
}
+ if (ioType!=101){
+ if (basDevp==114 || basDevp==214){
+ throw new CoolException("2妤煎彧鍏佽鍏ㄦ澘鍑哄簱锛岃閫夋嫨鍏ㄩ儴鐗╂枡");
+ }
+ }
+
assert ioType != null;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
@@ -891,13 +897,30 @@
// }
//}
if (ioType == 101) {
- if (staNo.getDevNo()==300){
+ if (basDevp==300){
if(locMast.getCrnNo() == 1) {
staNo.setDevNo(100);
} else {
staNo.setDevNo(200);
}
-
+ } else if (basDevp == 114){
+ if (!dto.isSign()){
+ staNo.setDevNo(100);
+ } else {
+ staNo.setDevNo(basDevp);
+ }
+ } else if (basDevp == 214){
+ if (!dto.isSign()){
+ staNo.setDevNo(200);
+ } else {
+ staNo.setDevNo(basDevp);
+ }
+ } else {
+ if(locMast.getCrnNo() == 1) {
+ staNo.setDevNo(100);
+ } else {
+ staNo.setDevNo(200);
+ }
}
} else {
staNo.setDevNo(basDevp);
--
Gitblit v1.9.1