From b6a095a76848ffd15922cc4af7f14594fc5bf85d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 十一月 2024 11:16:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/java/com/zy/asrs/controller/WorkController.java |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 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..63b8369 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;
@@ -15,6 +14,7 @@
 import com.zy.asrs.service.StaDescService;
 import com.zy.asrs.service.WorkService;
 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;
@@ -26,6 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 宸ヤ綔娴佹帴鍙f帶鍒跺櫒
@@ -40,6 +41,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()
@@ -57,14 +65,28 @@
     @ManagerAuth()
     public R availableTakeSite(){
         List<Map<String, Object>> result = new ArrayList<>();
-        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+        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 + "锛堝叏鏉垮嚭搴撳彛锛�");
             result.add(map);
         }
-        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+
+        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());
+
+//        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
         for (Integer siteId : pickOutSite) {
             Map<String, Object> map = new HashMap<>();
             map.put("siteId", siteId);
@@ -98,6 +120,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 +171,14 @@
     @RequestMapping("/available/empty/take/site")
     @ManagerAuth()
     public R availableEmptyTakeSite(){
-        return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+        EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+        wrapper.eq("type_no",110);
+        // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+        List<StaDesc> staDescs = staDescService.selectList(wrapper);
+        List<Integer> collect = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
+        return R.ok().add(collect);
+//        return R.ok().add(basDevpService.getAvailableEmptyOutSite());
     }
 
     @RequestMapping("/full/store/put/start")

--
Gitblit v1.9.1