From 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 16:10:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/WaitPakinController.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index f6a89be..be214b9 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -81,13 +81,32 @@
     }
 
 	@RequestMapping(value = "/waitPakin/update/auth")
-	@ManagerAuth
+    @ManagerAuth
     public R update(WaitPakin waitPakin){
         if (Cools.isEmpty(waitPakin)){
             return R.error();
         }
         waitPakinService.updateById(waitPakin);
         return R.ok();
+    }
+
+    @RequestMapping(value = "/waitPakin/update/beBatch/auth")
+    @ManagerAuth
+    public R updateBeBatch(@RequestBody Map<String, Object> param) {
+        String zpallet = (String) param.get("zpallet");
+        Integer beBatch = Integer.parseInt(param.get("beBatch").toString());
+
+        if (Cools.isEmpty(zpallet)) {
+            return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
+        }
+
+        boolean result = waitPakinService.updateBeBatchByZpallet(zpallet, beBatch);
+
+        if (result) {
+            return R.ok("淇敼鎴愬姛");
+        } else {
+            return R.error("淇敼澶辫触");
+        }
     }
 
     @RequestMapping(value = "/waitPakin/delete/auth")
@@ -109,7 +128,10 @@
 //                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.getAnfme());
+                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