From d780ce5e45bf41278f554288bb4b0ac6c37b2c4a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 16:06:13 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/WorkController.java | 63 ++++++++++++++++++++++++-------
1 files changed, 48 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 0fb0d13..7417d1d 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -18,10 +18,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.*;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -52,19 +49,46 @@
public R availableTakeSite(){
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);
+ List<Integer> siteList = new ArrayList<>();
+ for (Integer siteOut : outSite) {
+ for (Integer sitePickOut : pickOutSite) {
+ if (siteOut.equals(sitePickOut)) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteOut);
+ map.put("desc", siteOut + "锛堝嚭搴撳彛锛�");
+ result.add(map);
+ siteList.add(siteOut);
+ }
+ }
}
+ for (Integer siteId : outSite) {
+ if (!siteList.contains(siteId)) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ result.add(map);
+ }
+ }
+ for (Integer siteId : pickOutSite) {
+ if (!siteList.contains(siteId)) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ result.add(map);
+ }
+ }
+ return R.ok().add(result);
+ }
+
+ @RequestMapping("/unqualified/available/take/site")
+ @ManagerAuth()
+ public R availableTakeSiteUnqualified(){
+ List<Map<String, Object>> result = new ArrayList<>();
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", 212);
+ map.put("desc", 212 + "锛堥��搴撳彛锛�");
+ result.add(map);
return R.ok().add(result);
}
@@ -93,9 +117,18 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/unqualified/plate/out/start")
+ @ManagerAuth(memo = "涓嶅悎鏍煎搧鍑哄簱")
+ public R fullStoreTakeStartUnqualified(@RequestBody StockOutParam param) {
+ param.setOrderNo("涓嶅悎鏍煎搧鍑哄簱");
+ workService.startupFullTakeStore(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/plate/order/out/start")
@ManagerAuth(memo = "鎵嬪姩璁㈠崟鍑哄簱浣滀笟")
public R fullStoreTakeStartOrder(@RequestBody StockOutParam param) {
+ param.setOrderName("鎵嬪姩鍑哄簱鍗�");
workService.startupFullTakeStoreOrder(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
--
Gitblit v1.9.1