From ce43df438a4bbef5b9ffaed0a33a97db6e88fbf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 优化异常处理及订单同步逻辑
---
src/main/java/com/zy/asrs/controller/MobileController.java | 19 +++++++++++++------
1 files changed, 13 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 be5faa2..f26bbf8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -168,7 +168,7 @@
}
/**
- * 鍑哄簱纭 - 鎵墭鐩樼爜
+ * 鍑哄簱纭 - 鎵揣鏋剁爜
* 1.鍏ㄦ澘 杩斿洖 101
* 2.鎷ｆ枡 杩斿洖 103
*/
@@ -338,7 +338,7 @@
骞冲簱 搴撲綅鎺ㄨ崘
*/
@RequestMapping("/node/recommend/loc")
- @ManagerAuth(memo = "搴撲綅鎺ㄨ崘")
+ //@ManagerAuth(memo = "搴撲綅鎺ㄨ崘")
public R recommendNodeLoc(@RequestBody HashMap<String,String> param){
String zpallet = param.get("zpallet");
@@ -428,7 +428,7 @@
}
@RequestMapping("/check/waitPakin/auth")
- @ManagerAuth(memo = "鏌ヨ鎵樼洏鏄惁缁勬墭")
+ @ManagerAuth(memo = "鏌ヨ璐ф灦鏄惁缁勬墭")
public R waitPakins(@RequestBody String barcode){
return R.ok().add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode)));
}
@@ -446,18 +446,18 @@
}
@RequestMapping("/wrkdetl/auth")
- @ManagerAuth(memo = "鎷ｆ枡淇℃伅")
+ //@ManagerAuth(memo = "鎷ｆ枡淇℃伅")
public R checkWrkDetl(@RequestBody String barcode){
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
if(Cools.isEmpty(wrkMast)){
- return R.error("璇ユ墭鐩樻病鏈夊伐浣滄。");
+ return R.error("璇ヨ揣鏋舵病鏈夊伐浣滄。");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
return R.ok().add(wrkDetls);
}
@RequestMapping("/modify/wrkdetl/auth")
- @ManagerAuth(memo = "淇敼鎷ｆ枡淇℃伅")
+ //@ManagerAuth(memo = "淇敼鎷ｆ枡淇℃伅")
public R modifyWrkDetl(@RequestBody ModifyPakoutParam param){
String barcode = param.getBarcode();
@@ -482,6 +482,13 @@
}
+ //骞冲簱涓婃灦(鏃犵粍鎵樹笂鏋�)
+ @RequestMapping("/node/pakin/v1")
+ public R nodePakinNoComb(@RequestBody CombParam param){
+ mobileService.nodePakinNoComb(param);
+ return R.ok();
+ }
+
private String findNodeLoc(List<LocRule> locRules){
for (LocRule locRule : locRules) {
if (Cools.isEmpty(locRule.getOther())) {
--
Gitblit v1.9.1