From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/WorkController.java | 121 ++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 63b8369..7e83355 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -14,7 +14,6 @@
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,11 +21,7 @@
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.stream.Collectors;
+import java.util.*;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -49,58 +44,60 @@
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()
- public R availablePutSite(){
+ public R availablePutSite() {
return R.ok().add(basDevpService.getAvailableInSite());
}
@RequestMapping("/available/empty/put/site")
@ManagerAuth()
- public R availableEmptyPutSite(){
+ public R availableEmptyPutSite() {
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
@RequestMapping("/available/take/site")
@ManagerAuth()
- public R availableTakeSite(){
- List<Map<String, Object>> result = new ArrayList<>();
+ public R availableTakeSite() {
+ Set<Map<String, Object>> result = new HashSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
- wrapper.eq("type_no",101);
+ wrapper.eq("type_no", 101).eq("crn_no", 1).orderBy("stn_no", true);
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) {
+ for (StaDesc site : staDescs) {
Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ map.put("siteId", site.getStnNo());
+ map.put("desc", site.getStnDesc() + site.getStnNo());
result.add(map);
}
EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper2);
- wrapper2.eq("type_no",103);
+ wrapper2.eq("type_no", 103).eq("crn_no", 1).orderBy("stn_no", true);
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) {
+ for (StaDesc site : staDescs2) {
Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ map.put("siteId", site.getStnNo());
+ map.put("desc", site.getStnDesc() + site.getStnNo());
result.add(map);
}
return R.ok().add(result);
}
+
@RequestMapping("/crn/available/take/site")
@ManagerAuth()
- public R crnAvailableTakeSite(){
+ public R crnAvailableTakeSite() {
List<Map<String, Object>> result = new ArrayList<>();
List<Integer> outSite = basDevpService.getCrnAvailableOutSite(101);
for (Integer siteId : outSite) {
+ if (siteId < 1100) {
+ continue;
+ }
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
@@ -108,6 +105,9 @@
}
List<Integer> pickOutSite = basDevpService.getCrnAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
+ if (siteId < 1100) {
+ continue;
+ }
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
@@ -118,66 +118,82 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth()
- public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(107));
+ public R availableTakeCheckSite() {
+ List<Integer> availableOutSite = basDevpService.getAvailableOutSite(107);
+ List<Integer> data = new ArrayList<>();
+ for (Integer x : availableOutSite) {
+ if (x < 1100) {
+ data.add(x);
+ }
+ }
+ return R.ok().add(data);
}
@RequestMapping("/available/take/merge/site")
@ManagerAuth()
- public R availableTakeMergeSite(){
+ public R availableTakeMergeSite() {
return R.ok().add(basDevpService.getAvailableOutSite(104));
}
@RequestMapping("/available/take/check/site/crn")
@ManagerAuth()
- public R availableTakeCheckSiteCrn(){
+ public R availableTakeCheckSiteCrn() {
EntityWrapper<StaDesc> staDescEntityWrapper = new EntityWrapper<>();
- staDescEntityWrapper.eq("type_no",107);
+ staDescEntityWrapper.eq("type_no", 107);
staDescEntityWrapper.setSqlSelect("DISTINCT stn_no as stnNo");
- staDescEntityWrapper.in("crn_no",1,2,3,4,5,6,7);
+ staDescEntityWrapper.in("crn_no", 1);
return R.ok().add(staDescService.selectList(staDescEntityWrapper));
}
@RequestMapping("/available/take/check/site/ctu")
@ManagerAuth()
- public R availableTakeCheckSiteCtu(){
+ public R availableTakeCheckSiteCtu() {
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/take/check/site/shuttle")
@ManagerAuth()
- public R availableTakeCheckSiteShuttle(){
+ public R availableTakeCheckSiteShuttle() {
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/crn/empty/take/site")
@ManagerAuth()
- public R availablecrnEmptyTakeSite(){
+ public R availablecrnEmptyTakeSite() {
return R.ok().add(basDevpService.getCrnAvailableEmptyOutSite());
}
@RequestMapping("/available/shuttle/empty/take/site")
@ManagerAuth()
- public R availableshuttleEmptyTakeSite(){
+ public R availableshuttleEmptyTakeSite() {
return R.ok().add(basDevpService.getShuttleAvailableEmptyOutSite());
}
@RequestMapping("/available/ctu/empty/take/site")
@ManagerAuth()
- public R availablectuEmptyTakeSite(){
+ public R availablectuEmptyTakeSite() {
return R.ok().add(basDevpService.getCtuAvailableEmptyOutSite());
}
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
- public R availableEmptyTakeSite(){
+ public R availableEmptyTakeSite() {
+ List<Map<String, Object>> result = new ArrayList<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
- wrapper.eq("type_no",110);
+ wrapper.eq("type_no", 110);
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+// 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);
+ for (StaDesc staDesc : staDescs) {
+ if (staDesc.getCrnNo() == 7) {
+ continue;
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", staDesc.getStnNo());
+ map.put("desc", "[" + staDesc.getStnNo() + "]");
+ result.add(map);
+ }
+ return R.ok().add(result);
// return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@@ -187,8 +203,8 @@
try {
String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
- } catch (Exception e){
- return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage());
+ } catch (Exception e) {
+ return R.error("鍏ュ簱鍚姩澶辫触==>" + e.getMessage());
}
}
@@ -219,6 +235,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,
@@ -230,10 +253,10 @@
@RequestMapping("/mat/turn/over/out/start")
@ManagerAuth(memo = "鍝佸彿绉讳氦")
public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
- if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(),param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(), param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())) {
return R.error("鍙傛暟涓虹┖");
}
- if (param.getLocDetls().size()>1){
+ if (param.getLocDetls().size() > 1) {
return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
}
workService.turnMatLocDetl(param, getUserId());
@@ -250,7 +273,7 @@
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
- @RequestParam Integer type){
+ @RequestParam Integer type) {
if (type == 1) {
workService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
--
Gitblit v1.9.1