From e50218d4ba057a4a33af708ad13b8ef77c41e91c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 10:49:22 +0800
Subject: [PATCH] 订单追溯完善
---
src/main/java/com/zy/asrs/controller/WorkController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 8b6a223..4e32659 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -56,6 +56,13 @@
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ if(siteId == 1071) {
+ map.put("desc", siteId + "锛堜竴鍙风亴瑁呯嚎锛�");
+ } else if(siteId == 1064) {
+ map.put("desc", siteId + "锛堜簩鍙风亴瑁呯嚎锛�");
+ } else if(siteId == 1078) {
+ map.put("desc", siteId + "锛堜笁鍙风亴瑁呯嚎锛�");
+ }
result.add(map);
}
List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
@@ -66,6 +73,13 @@
result.add(map);
}
return R.ok().add(result);
+ }
+
+ @RequestMapping("/turn/over/out/start")
+ @ManagerAuth(memo = "瀹㈡埛杞崲")
+ public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
+ workService.turnOverOut(param, getUserId());
+ return R.ok("瀹㈡埛杞崲鎴愬姛");
}
@RequestMapping("/available/take/check/site")
@@ -83,7 +97,12 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ try {
+ String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
+ } catch (Exception e){
+ return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage());
+ }
}
@RequestMapping("/plate/out/start")
--
Gitblit v1.9.1