From 8b5b019716e49f54fcc016814a3c432a4a32db75 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 22 十二月 2023 15:42:17 +0800
Subject: [PATCH] 合并订单

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index d264284..77bae09 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -386,13 +386,31 @@
     }
 
     @RequestMapping("/manDetl/in/origin")
-    @ManagerAuth(memo = "璁㈠崟涓婃灦(鎵樼洏鐮�)")
-    public R manDetlin(@RequestBody JSONObject json){
+    @ManagerAuth(memo = "骞冲簱涓婃灦")
+    public R manDetlIn(@RequestBody JSONObject json){
         if (json == null){
             return R.error("浼犲叆鏁版嵁涓虹┖");
         }
         return mobileService.manDetlOrigin(json,getUser());
     }
 
+    @RequestMapping("/manDetl/in/no/origin")
+    @ManagerAuth(memo = "骞冲簱涓婃灦")
+    public R manDetlInNo(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return mobileService.manDetlOrigInNo(json,getUser());
+    }
+
+    @RequestMapping("/manDetl/out/origin")
+    @ManagerAuth(memo = "骞冲簱涓嬫灦")
+    public R manDetlout(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return mobileService.manDetlOriginOut(json,getUser());
+    }
+
 
 }

--
Gitblit v1.9.1