From 3bcfebe3912bdaf8abf2d29b6913b771bad3804c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:44:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 7d994d8..4700734 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -16,6 +16,7 @@
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -102,12 +103,17 @@
if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
return R.error("鏉＄爜宸茬敓鎴愬叆搴撳伐浣滄。锛岀姝㈠垹闄�");
}
- waitPakinService.delete(new EntityWrapper<>(entity));
+ waitPakinService.delete(new EntityWrapper<WaitPakin>()
+ .eq("zpallet", entity.getZpallet()));
//璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
if (!Cools.isEmpty(entity.getOrderNo())) {
- if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
- return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
- }
+// if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
+// return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+// }
+ OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand()
+ ,entity.getStandby1(),entity.getStandby2(),entity.getStandby3()
+ ,entity.getBoxType1(),entity.getBoxType2(),entity.getBoxType3()
+ , entity.getAnfme());
}
}
return R.ok();
--
Gitblit v1.9.1