From 9f2f1f535d4abfc9cdf68eef651cb73ef2e04bcb Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 29 七月 2025 11:06:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bff7c10..562bcec 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -290,6 +290,7 @@
         matParam.setAnfme(0.0D);
         matParam.setAnfme2(0.0D);
         matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
+        matParam.setStandby1(nccQilibcTmprintWms.getCkbm());
         return R.ok().add(matParam);
     }
 
@@ -334,6 +335,13 @@
         map.put("orderNo", split[0]);
         map.put("matData", matParam);
         return R.ok().add(map);
+    }
+
+    @RequestMapping("/comb/cancel")
+    @ManagerAuth(memo = "鍙栨秷缁勬墭")
+    public R combCancel(@RequestBody CombCancelParam param) {
+        mobileService.combCancel(param, getUserId());
+        return R.ok("鍙栨秷缁勬墭鎴愬姛");
     }
 
     @RequestMapping("/comb/auth")
@@ -690,4 +698,18 @@
         return R.ok("涓婃姤ERP鎴愬姛");
     }
 
+    @RequestMapping("/pallet/toOutSta")
+    @ManagerAuth(memo = "鎵樼洏鍘诲嚭搴撳彛")
+    public R toOutSta(@RequestBody PalletToOutStaParam param) {
+        mobileService.toOutSta(param, getUserId());
+        return R.ok();
+    }
+
+    @RequestMapping("/pallet/toAllOut")
+    @ManagerAuth(memo = "鎷f枡杞叏鏉�")
+    public R toAllOut(@RequestBody PalletToAllOutParam param) {
+        mobileService.toAllOut(param, getUserId());
+        return R.ok();
+    }
+
 }

--
Gitblit v1.9.1