From 7896e6e42007b3d23f97b0d260dd68a18f49ba3b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 18 七月 2025 15:25:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |    8 ++++++++
 1 files changed, 8 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..e5bd07f 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);
     }
 
@@ -336,6 +337,13 @@
         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")
     @ManagerAuth(memo = "缁勬墭")
     public R comb(@RequestBody CombParam combParam) {

--
Gitblit v1.9.1