From ac96c18a228c8d16e9f8f25c0866d1659c029407 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 01 十一月 2024 16:43:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/WorkController.java |   73 ++++++++++++++++++++++++++++++++++++
 1 files changed, 72 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 8b6a223..1050097 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,14 +1,18 @@
 package com.zy.asrs.controller;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 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;
 import com.zy.asrs.entity.param.FullStoreParam;
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
 import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.StaDescService;
 import com.zy.asrs.service.WorkService;
 import com.zy.common.model.StartupDto;
 import com.zy.common.web.BaseController;
@@ -34,6 +38,8 @@
     private WorkService workService;
     @Autowired
     private BasDevpService basDevpService;
+    @Autowired
+    private StaDescService staDescService;
 
     @RequestMapping("/available/put/site")
     @ManagerAuth()
@@ -67,11 +73,71 @@
         }
         return R.ok().add(result);
     }
+    @RequestMapping("/crn/available/take/site")
+    @ManagerAuth()
+    public R crnAvailableTakeSite(){
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<Integer> outSite = basDevpService.getCrnAvailableOutSite(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.getCrnAvailableOutSite(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);
+    }
 
     @RequestMapping("/available/take/check/site")
     @ManagerAuth()
     public R availableTakeCheckSite(){
         return R.ok().add(basDevpService.getAvailableOutSite(107));
+    }
+
+    @RequestMapping("/available/take/check/site/crn")
+    @ManagerAuth()
+    public R availableTakeCheckSiteCrn(){
+        EntityWrapper<StaDesc> staDescEntityWrapper = new EntityWrapper<>();
+        staDescEntityWrapper.eq("type_no",107);
+        staDescEntityWrapper.setSqlSelect("DISTINCT stn_no as stnNo");
+        staDescEntityWrapper.in("crn_no",1,2,3,4,5,6,7);
+        return R.ok().add(staDescService.selectList(staDescEntityWrapper));
+    }
+
+    @RequestMapping("/available/take/check/site/ctu")
+    @ManagerAuth()
+    public R availableTakeCheckSiteCtu(){
+        return R.ok().add(basDevpService.getAvailableOutSite(107));
+    }
+
+    @RequestMapping("/available/take/check/site/shuttle")
+    @ManagerAuth()
+    public R availableTakeCheckSiteShuttle(){
+        return R.ok().add(basDevpService.getAvailableOutSite(107));
+    }
+
+    @RequestMapping("/available/crn/empty/take/site")
+    @ManagerAuth()
+    public R availablecrnEmptyTakeSite(){
+        return R.ok().add(basDevpService.getCrnAvailableEmptyOutSite());
+    }
+
+    @RequestMapping("/available/shuttle/empty/take/site")
+    @ManagerAuth()
+    public R availableshuttleEmptyTakeSite(){
+        return R.ok().add(basDevpService.getShuttleAvailableEmptyOutSite());
+    }
+
+    @RequestMapping("/available/ctu/empty/take/site")
+    @ManagerAuth()
+    public R availablectuEmptyTakeSite(){
+        return R.ok().add(basDevpService.getCtuAvailableEmptyOutSite());
     }
 
     @RequestMapping("/available/empty/take/site")
@@ -83,7 +149,12 @@
     @RequestMapping("/full/store/put/start")
     @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
     public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
-        return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+        try {
+            String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
+            return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
+        } catch (Exception e){
+            return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage());
+        }
     }
 
     @RequestMapping("/plate/out/start")

--
Gitblit v1.9.1