From 78067a1c03707766f3d6561c22e165af68ad36b9 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 14:38:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 7fd25fd..d1380d2 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,18 +51,25 @@
@ManagerAuth()
public R availableTakeSite(){
List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101);
- for (Integer siteId : outSite) {
+// 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> outStaNoList = Utils.getOutStaNoList();
+ for (Integer siteId : outStaNoList){
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);
@@ -142,20 +150,6 @@
return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
}
return R.ok();
- }
-
-// @RequestMapping("/create/waitPain/wrkMast/start")
-// @ManagerAuth(memo = "鐢熸垚浠诲姟")
-// public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
-// StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
-// return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
-// }
-
- @RequestMapping("/deal/preHave/start")
- @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
- public R dealPreHave(@RequestParam Integer wrkNo) {
- String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
- return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
}
}
--
Gitblit v1.9.1