From e5cf12d2e3441b83cc3aeafd4f7f23d4075ab5fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 一月 2025 14:56:14 +0800
Subject: [PATCH] #并板出库
---
src/main/java/com/zy/asrs/controller/WorkController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 1050097..7231322 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -4,7 +4,6 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
@@ -14,7 +13,9 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,10 +23,8 @@
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;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -40,6 +39,13 @@
private BasDevpService basDevpService;
@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()
@@ -56,19 +62,31 @@
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
- List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ Set<Map<String, Object>> result = new HashSet<>();
+ EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+ RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+ wrapper.eq("type_no",101);
+ List<StaDesc> staDescs = staDescService.selectList(wrapper);
+ List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
+// List<Integer> outSite = basDevpService.getAvailableOutSite(101);
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);
}
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+
+ EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
+ wrapper2.eq("type_no",103);
+ List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
+ List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
+
+// List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
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);
@@ -98,6 +116,12 @@
@ManagerAuth()
public R availableTakeCheckSite(){
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")
@@ -143,7 +167,20 @@
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
public R availableEmptyTakeSite(){
- return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ List<Map<String, Object>> result = new ArrayList<>();
+ EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+ wrapper.eq("type_no",110);
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+// RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+ List<StaDesc> staDescs = staDescService.selectList(wrapper);
+ for (StaDesc staDesc : staDescs) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", staDesc.getStnNo());
+ map.put("desc","["+ Utils.getStaName(staDesc.getStnNo())+"]");
+ result.add(map);
+ }
+ return R.ok().add(result);
+// return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@RequestMapping("/full/store/put/start")
--
Gitblit v1.9.1