From bea1bbc1c84bd9091e00ac49403dcc6df152f0a8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 二月 2021 10:46:10 +0800
Subject: [PATCH] #出库（二期）
---
src/main/java/com/zy/asrs/controller/WorkController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5ac9cfc..e593ecf 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -10,10 +10,12 @@
import com.zy.asrs.service.WorkService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -39,10 +41,47 @@
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
- @RequestMapping("/available/take/site")
+ @RequestMapping("/available/take/site/{type}")
@ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
- public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ public R availableTakeSite(@PathVariable("type") Integer type){
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ for (Integer siteId : outSite) {
+ if (type == 2 && siteId > 10) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝嚭搴撳彛锛�");
+ result.add(map);
+ }
+ if (type == 1 && siteId < 10) {
+ 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) {
+ if (type == 2 && siteId > 10) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝嚭搴撳彛锛�");
+ result.add(map);
+ }
+ if (type == 1 && siteId < 10) {
+ 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")
@@ -111,7 +150,7 @@
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
} else if (type == 3) {
workService.pickWrkMast(workNo, getUserId());
- return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡鍏ュ簱");
+ return R.ok();
}
return R.ok();
}
--
Gitblit v1.9.1