From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
index 57b933e..30c47d2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
@@ -53,10 +53,23 @@
throw new CoolException("鎵樼洏姝ｅ湪鍏ュ簱涓�");
}
+ OrderDetl orderDetl = orderDetlService.getById(waitPakin.getDetlId());
+ if (orderDetl == null) {
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+
+ //鍙敤鏁伴噺
+ Double count = orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty() - orderDetl.getWaitQty();
+ if (waitPakin.getAnfme() > count) {
+ throw new CoolException("缁勬墭鏁伴噺瓒呰繃鍓╀綑鍙敤鏁伴噺");
+ }
+
//鏌ヨ鏄惁瀛樺湪鐩稿悓鏄庣粏鍜屾墭鐩樼爜鐨勭粍鎵橀�氱煡妗�
WaitPakin waitPakin1 = this.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()).eq(WaitPakin::getDetlId, waitPakin.getDetlId()));
if (waitPakin1 == null) {
//涓嶅瓨鍦ㄧ粍鎵橀�氱煡妗ｏ紝鍒涘缓
+ waitPakin.setMatnr(orderDetl.getMat$().getMatnr());
+ waitPakin.setBatch(orderDetl.getBatch());
if (!this.save(waitPakin)) {
throw new CoolException("娣诲姞澶辫触");
}
@@ -67,11 +80,6 @@
if (!this.updateById(waitPakin1)) {
throw new CoolException("娣诲姞澶辫触");
}
- }
-
- OrderDetl orderDetl = orderDetlService.getById(waitPakin.getDetlId());
- if (orderDetl == null) {
- throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
//鑾峰彇璁㈠崟
--
Gitblit v1.9.1