From 27a351456cd2127c0b76d48869cc1a0b0b79664a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 十月 2025 13:16:03 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2e796a2..4ea2ac5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -331,7 +331,7 @@
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode())
.eq("io_status", "N")
- .eq("matnr", elem.getMatnr()).eq("three_code", elem.getThreeCode()).eq("batch", elem.getBatch())) > 0) {
+ .eq("matnr", elem.getMatnr()).eq("three_code", elem.getThreeCode())) > 0) {
throw new CoolException(param.getBarcode() + "宸叉湁鐩稿悓鏁版嵁");
}
@@ -400,7 +400,10 @@
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
if (Cools.isEmpty(orderDetl)) {
- throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), null);
+ if (Cools.isEmpty(orderDetl)){
+ throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ }
}
if (Cools.isEmpty(codeDataParam.getQuality())) {
throw new CoolException("鏉＄爜鏈繑鍥炶川閲忕姸鎬�");
@@ -412,7 +415,7 @@
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty2(orderDetl.getId(), elem.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
--
Gitblit v1.9.1