From 3f05596d714338347ab748df3ea1a9c83cd9abf1 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 10:24:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 3ebff2a..54b3fff 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -201,13 +201,20 @@
for (OutLocDto dto : dtos) {
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
if (ioWorkType == null) {
- ioType = dto.isAll() ? 101 : 103;
+// ioType = dto.isAll() ? 101 : 103;
+ ioType = 101;
} else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
ioType = 107;
}
assert ioType != null;
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (Cools.isEmpty(locMast)){
+ throw new CoolException("鏈壘鍒板簱浣�");
+ }
+ if (locMast.getPackStatus()==2 ){
+ throw new CoolException("浜у搧鍦ㄦ祴璇曚腑锛岀姝㈠嚭搴�");
+ }
Integer outSta = staNo.getDevNo();
//2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷ｆ枡绔欐寚瀹氫负202
@@ -511,6 +518,9 @@
if (Cools.isEmpty(loc)){
throw new CoolException("鏈壘鍒板簱浣�");
}
+ if (loc.getPackStatus()==2){
+ throw new CoolException("浜у搧鍦ㄦ祴璇曚腑锛岀姝㈠簱浣嶇Щ鏍�");
+ }
if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
}
@@ -790,10 +800,8 @@
if (!Cools.isEmpty(waitPakin)) {
waitPakin.setIoStatus("N");
waitPakin.setLocNo("");
- waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
- .eq("order_no", waitPakin.getOrderNo())
- .eq("matnr", waitPakin.getMatnr())
- .eq("batch", waitPakin.getBatch()));
+ boolean result = waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
+ .eq("zpallet", wrkMast.getBarcode()));
}
}
}
--
Gitblit v1.9.1