From d16d3b70e94f798d7e5abd145f8566d81d0c66c9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 18:07:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 837c299..f5b8749 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -15,6 +15,11 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
* Created by vincent on 2020/6/10
@@ -42,7 +47,28 @@
@RequestMapping("/available/take/site")
@ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ for (Integer siteId : outSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ result.add(map);
+ }
+ List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+ for (Integer siteId : pickOutSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ result.add(map);
+ }
+ return R.ok().add(result);
+ }
+
+ @RequestMapping("/available/take/check/site")
+ @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
+ public R availableTakeCheckSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
@@ -58,7 +84,7 @@
}
@RequestMapping("/plate/out/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
+ @ManagerAuth(memo = "鍑哄簱浣滀笟")
public R fullStoreTakeStart(@RequestBody StockOutParam param) {
workService.startupFullTakeStore(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
@@ -77,6 +103,13 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/locCheck/out/start")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStart(@RequestBody StockOutParam param) {
+ workService.locCheckOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/loc/move/start")
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
@@ -85,11 +118,11 @@
return R.ok("绉诲簱鍚姩鎴愬姛");
}
- @RequestMapping("/loc/detl/adjust/start")
+ @RequestMapping("/locDdetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
- public R locDetlAdjustStart(LocDetlAdjustParam param) {
+ public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
workService.adjustLocDetl(param, getUserId());
- return R.ok("绉诲簱鍚姩鎴愬姛");
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@RequestMapping("/hand/control/wrkMast")
@@ -102,6 +135,9 @@
} else if (type == 2) {
workService.cancelWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.pickWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
}
return R.ok();
}
--
Gitblit v1.9.1