From 62b94e763b07ce64e5b43274bb428c1c9c46ed6e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 25 十二月 2024 13:33:59 +0800
Subject: [PATCH] 出入库限制
---
src/main/java/com/zy/asrs/controller/WorkController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index bcff12f..a51f4b5 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
@@ -22,10 +23,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.*;
import java.util.stream.Collectors;
/**
@@ -42,6 +40,13 @@
@Autowired
private StaDescService staDescService;
+ @RequestMapping("/locMerge/out/start")
+ @ManagerAuth(memo = "骞舵澘鍑哄簱")
+ public R locMergeOutStart(@RequestBody StockOutParam param) {
+ workService.locMergeOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/available/put/site")
@ManagerAuth()
public R availablePutSite(){
@@ -57,7 +62,7 @@
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
- List<Map<String, Object>> result = new ArrayList<>();
+ Set<Map<String, Object>> result = new HashSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
@@ -68,13 +73,11 @@
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ map.put("desc","["+ Utils.getStaName(siteId)+"]");
result.add(map);
}
EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper2);
wrapper2.eq("type_no",103);
List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
@@ -83,7 +86,7 @@
for (Integer siteId : pickOutSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ map.put("desc","["+ Utils.getStaName(siteId)+"]");
result.add(map);
}
return R.ok().add(result);
@@ -115,6 +118,12 @@
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
+ @RequestMapping("/available/take/merge/site")
+ @ManagerAuth()
+ public R availableTakeMergeSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(104));
+ }
+
@RequestMapping("/available/take/check/site/crn")
@ManagerAuth()
public R availableTakeCheckSiteCrn(){
--
Gitblit v1.9.1