From ca07b97ea192888b6ec219fd5409517349789b70 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 三月 2025 09:40:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 124 insertions(+), 7 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..692f5fa 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,16 +1,21 @@
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.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;
@@ -18,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;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -34,6 +37,22 @@
private WorkService workService;
@Autowired
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("/locMerge/out/start/sxk")
+ @ManagerAuth(memo = "骞舵澘鍑哄簱")
+ public R locMergeOutStartSxk(@RequestBody StockOutParam param) {
+ workService.locMergeOutSxk(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
@RequestMapping("/available/put/site")
@ManagerAuth()
@@ -50,15 +69,47 @@
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
+ 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","["+ Utils.getStaName(siteId)+"]");
+ result.add(map);
+ }
+
+ 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","["+ Utils.getStaName(siteId)+"]");
+ result.add(map);
+ }
+ 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.getAvailableOutSite(101);
+ 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.getAvailableOutSite(103);
+ List<Integer> pickOutSite = basDevpService.getCrnAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
@@ -74,10 +125,69 @@
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(){
+ 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());
+ 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")
@@ -118,6 +228,13 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/locCheck/out/start/sxk")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStartsxk(@RequestBody StockOutParam param) {
+ workService.locCheckOutsxk(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/loc/move/start")
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
--
Gitblit v1.9.1