From d26dbc9cb768a03008f4f3ed04be7b7b6750aa29 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 22 六月 2021 13:25:16 +0800
Subject: [PATCH] 1.平仓日入库功能改造
---
src/main/java/com/zy/asrs/controller/WorkController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 7e99e9e..074d0d8 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -12,10 +12,7 @@
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;
+import java.util.*;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -23,6 +20,10 @@
*/
@RestController
public class WorkController extends BaseController {
+
+ public static final ArrayList<Integer> AGV_EMPTY_AREA = new ArrayList<Integer>() {{
+ add(1061);add(1062);add(1063);add(1064);add(1065);add(1066);add(1067);add(1068);
+ }};
@Autowired
private WorkService workService;
@@ -44,8 +45,15 @@
@RequestMapping("/available/empty/put/site")
@ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
public R availableEmptyPutSite(){
- List<Integer> availableEmptyInSite = basDevpService.getAgvAvailableInSite();
- availableEmptyInSite.addAll(basDevpService.getAvailableEmptyInSite());
+ List<Integer> availableEmptyInSite = basDevpService.getAvailableEmptyInSite();
+ List<Integer> agvSite = new ArrayList<>();
+ List<Integer> availableEmptyInSite1 = basDevpService.getAgvAvailableInSite();
+ for (Integer integer : availableEmptyInSite1) {
+ if (AGV_EMPTY_AREA.contains(integer)) {
+ agvSite.add(integer);
+ }
+ }
+ availableEmptyInSite.addAll(agvSite);
return R.ok().add(availableEmptyInSite);
}
@@ -86,7 +94,16 @@
@RequestMapping("/available/empty/take/site")
@ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
public R availableEmptyTakeSite(){
- return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ List<Integer> availableEmptyOutSite = basDevpService.getAvailableEmptyOutSite();
+ List<Integer> agvSite = new ArrayList<>();
+ List<Integer> availableEmptyInSite1 = basDevpService.getAgvAvailableInSite();
+ for (Integer integer : availableEmptyInSite1) {
+ if (AGV_EMPTY_AREA.contains(integer)) {
+ agvSite.add(integer);
+ }
+ }
+ availableEmptyOutSite.addAll(agvSite);
+ return R.ok().add(availableEmptyOutSite);
}
@RequestMapping("/full/store/put/start")
--
Gitblit v1.9.1