From 3f4805441861005e8f05d2a4d6894b8ea0d6cf54 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 16:05:21 +0800
Subject: [PATCH] Revert "#"
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 +++--
1 files changed, 3 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 99fbca5..102f0bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -517,11 +517,12 @@
LocMast loc = locMastService.selectById(locNo);
if (Cools.isEmpty(loc)){
throw new CoolException("鏈壘鍒板簱浣�");
- }else if (loc.getPackStatus()==2){
+ }else if (sourceLoc.getPackStatus()==2){
throw new CoolException("浜у搧鍦ㄦ祴璇曚腑锛岀姝㈠簱浣嶇Щ鏍�");
// }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
// throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
- }else {
+ }else if(sourceLoc.getLocType1()!=loc.getLocType1()){
+ throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�");
}
Date now = new Date();
// 鑾峰彇宸ヤ綔鍙�
--
Gitblit v1.9.1