From a84386f98cc752516d492222684d5c850c9c7a1e Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 00:00:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqzasrs' into mdqzasrs
---
src/main/java/com/zy/asrs/controller/WorkController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 0d8a021..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);
@@ -68,6 +75,13 @@
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")
@ManagerAuth()
public R availableTakeCheckSite(){
--
Gitblit v1.9.1