From 27656ef3f1b0f46b1a76e3a9a6e00175c6d1c8a7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 十一月 2024 13:30:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 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 0d8a021..cd2a71f 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,16 +1,20 @@
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.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.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,6 +26,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -34,6 +39,8 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private StaDescService staDescService;
@RequestMapping("/available/put/site")
@ManagerAuth()
@@ -67,6 +74,26 @@
}
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()
@@ -74,10 +101,57 @@
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")
@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