From f66fd8ba90a75a2002ba7783a870035e7908d89f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 27 十二月 2024 09:21:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/WaitPakinController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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..7f13959 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;
@@ -105,9 +106,13 @@
             waitPakinService.delete(new EntityWrapper<>(entity));
             //璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
             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