From 2d9665253e34da384fde299e2bc152a99f0c8ece Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:59:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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 50ca63f..58f8a31 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -6,12 +6,10 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,6 +30,8 @@
private WaitPakinService waitPakinService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@Override
@Transactional
@@ -44,6 +44,7 @@
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
+ Date now = new Date();
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
for (CombParam.CombMat combMat : param.getCombMats()) {
@@ -57,9 +58,9 @@
waitPakin.setAnfme(combMat.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(new Date());
+ waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
- waitPakin.setModiTime(new Date());
+ waitPakin.setModiTime(now);
VersionUtils.setWaitPakIn(waitPakin, matCode);
if (!waitPakinService.insert(waitPakin)) {
@@ -72,9 +73,30 @@
if (order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
-
-
-
+ for (CombParam.CombMat comb : param.getCombMats()) {
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), comb.getMatNo(), comb.getBatch());
+ if (comb.getCount() > orderDetl.getEnableQty()) {
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+ // 淇敼鍗曠粏鏁伴噺
+ if (!orderDetlService.increase(order.getId(), comb.getMatNo(), comb.getBatch(), comb.getCount())) {
+ throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+ }
+ // 娣诲姞鍏ュ簱閫氱煡妗�
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAnfme(comb.getCount()); // 鏁伴噺
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ VersionUtils.setWaitPakIn(waitPakin, orderDetl);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("娣诲姞鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
}
}
--
Gitblit v1.9.1