From b602aaae04898109df3fa72d1975301d38e2d626 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 四月 2022 22:20:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 908cc26..e3610f2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -236,6 +236,7 @@
}
@Override
+ @Transactional
public void packComb(CombParam param, Long userId) {
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
@@ -291,12 +292,25 @@
if (null == order) {
throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
}
- if (orderService.updateSettle(order.getId(), 2L, userId)) {
+ if (!orderService.updateSettle(order.getId(), 2L, userId)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
// 鐢熸垚鍏ュ簱閫氱煡妗�
for (DetlDto detlDto : detlDtos) {
+
+ // 淇敼浣滀笟鏁伴噺 ----------------------------------------
+ // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
+ if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+ // 淇敼璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+ }
+
+ // 淇濆瓨鍏ュ簱閫氱煡妗�
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
--
Gitblit v1.9.1