From b51e3b3d5bb721cec65952498d1c2c882d1a01d6 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 十二月 2025 17:14:22 +0800
Subject: [PATCH] wms功能完善

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 95e7cda..6b3224b 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -60,6 +60,21 @@
     @Resource
     private StaDescService staDescService;
 
+    // 閫�绌烘墭鐩樿繑鍥炰骇绾� pda涓婃搷浣滅┖鎵樿繑鍥炰骇绾�(鍒�鏋惰繑鍥�)
+    @GetMapping("/djReturn/auth")
+    public R tkt(@RequestParam String djNo){
+        return mobileService.djReturn(djNo);
+    }
+
+    @RequestMapping("/comb/auth")
+    @ManagerAuth(memo = "缁勬墭")
+    public R comb(@RequestBody CombParam combParam){
+        mobileService.comb(combParam, getUserId());
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
+    // 杈撻�佺嚎娴佸姩
+
     @RequestMapping("/pda/WarehouseOut/v1")
     @ManagerAuth(memo = "骞舵澘閫斾腑鎷f枡-鍙傝�冨康鍒�")
     public R WarehouseOutV1(@RequestBody CombParam combParam) {
@@ -251,12 +266,7 @@
         return R.ok().add(combParams);
     }
 
-    @RequestMapping("/comb/auth")
-    @ManagerAuth(memo = "缁勬墭")
-    public R comb(@RequestBody CombParam combParam){
-        mobileService.comb(combParam, getUserId());
-        return R.ok("缁勬墭鎴愬姛");
-    }
+
 
     @RequestMapping("/pack/get/auth")
     @ManagerAuth

--
Gitblit v1.9.1