From 39a1a9fa95708be564dbade4df36cb3b81ceae92 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 二月 2021 10:54:50 +0800
Subject: [PATCH] #出库（二期）
---
src/main/java/com/zy/asrs/controller/WorkController.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 6627272..93244a1 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -10,10 +10,7 @@
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;
@@ -44,23 +41,39 @@
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
- @RequestMapping("/available/take/site")
+ @RequestMapping("/available/take/site/{type}")
@ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
- public R availableTakeSite(){
+ public R availableTakeSite(@PathVariable("type") Integer type){
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);
+ 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) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
- result.add(map);
+ 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);
}
@@ -68,7 +81,7 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(103));
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
--
Gitblit v1.9.1