From 809f49807ce5f587fe881cfe4cc3d38d9c1a46a3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 10:20:47 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/MobileController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 81aeabf..abfe0fa 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -423,17 +423,32 @@
// return R.ok("缁勬墭鎴愬姛");
// }
- @RequestMapping("/truss/order/auth")
- @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
- public R trussCombOrder(@RequestBody TrussCombParam combParam){
- mobileService.trussCombOrder(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
- }
+// @RequestMapping("/truss/order/auth")
+// @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
+// public R trussCombOrder(@RequestBody TrussCombParam combParam){
+// mobileService.trussCombOrder(combParam, getUserId());
+// return R.ok("缁勬墭鎴愬姛");
+// }
@RequestMapping("/truss/comd/auth")
// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱 wms鍏ュ簱")
public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
- mobileService.PalletizingCompleteTwoFloorParam(combParam);
+ try{
+ mobileService.PalletizingCompleteTwoFloorParam(combParam);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/truss/comd/auth/v2")
+// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�1妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱 wms鍏ュ簱")
+ public R PalletizingCompleteTwoFloorParamV2(@RequestBody PalletizingCompleteTwoFloorParam combParam){
+ try{
+ mobileService.PalletizingCompleteTwoFloorParam2(combParam);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok("缁勬墭鎴愬姛");
}
@@ -457,6 +472,16 @@
return R.ok().add(maps);
}
+ /**
+ * 涓帶锛氳幏鍙栫鍨嬬紪鍙�
+ */
+ @PostMapping("/box/type/complete/auth/v2")
+// @AppAuth(memo = "涓帶锛氳幏鍙栫鍨嬬紪鍙�")
+ public synchronized R boxTypeCompleteCar2() {
+ List<Map<String, Object>> maps = mobileService.boxTypeComb2();
+ return R.ok().add(maps);
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
--
Gitblit v1.9.1