From 8bfe3cdd48ca3f47d054deb5aebc48154ffb4c88 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 04 一月 2025 09:26:13 +0800
Subject: [PATCH] 完善
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
index 4872ed1..3b466f1 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
@@ -72,7 +72,7 @@
Date now = new Date();
// 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
@@ -112,14 +112,13 @@
}
// 鍏宠仈缁勬墭
} else {
- Order order = orderService.selectByNo(param.getOrderNo(), hostId);
- if (order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
-
+ Order order = orderService.selectByNo(elem.getOrderNo(), hostId);
+ if (order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),hostId);
if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -139,6 +138,7 @@
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
} else {
+ detlDto.setOrderNo(order.getOrderNo());
detlDtos.add(detlDto);
}
});
@@ -147,6 +147,9 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+
+ Order order = orderService.selectByNo(detlDto.getOrderNo(), hostId);
+
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
@@ -166,8 +169,9 @@
if (!waitPakinService.save(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
+ orderService.updateSettle(order.getId(), 2L, userId, hostId);
}
- orderService.updateSettle(order.getId(), 2L, userId, hostId);
+
}
}
@@ -325,11 +329,11 @@
if (!Cools.isEmpty(waitPakin.getOrderNo())){
Order order = orderService.selectByNo(waitPakin.getOrderNo(), hostId);
if (Cools.isEmpty(order)){
- continue;
+ throw new CoolException("骞冲簱涓婃灦鏌ヨ璁㈠崟澶辫触");
}
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), waitPakin.getMatnr(), waitPakin.getBatch(),hostId);
if (Cools.isEmpty(orderDetl)){
- continue;
+ throw new CoolException("骞冲簱涓婃灦鏌ヨ璁㈠崟鏄庣粏澶辫触");
}
// 淇敼璁㈠崟鏄庣粏瀹屾垚鏁伴噺
if (!orderDetlService.increase(order.getId(), hostId, waitPakin.getMatnr(), waitPakin.getBatch(), waitPakin.getAnfme())) {
--
Gitblit v1.9.1