From 56de968727bd6e871c6823dce837f8d42f30e6f8 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 10 六月 2025 09:28:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 242 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 224 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 0f1a5a1..ded73a3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,18 +1,28 @@
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.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -25,35 +35,185 @@
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(memo = "鑾峰彇鍏ュ簱绔欑偣")
- public R availablePutSite(){
+ @ManagerAuth()
+ public R availablePutSite() {
return R.ok().add(basDevpService.getAvailableInSite());
}
@RequestMapping("/available/empty/put/site")
- @ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
- public R availableEmptyPutSite(){
+ @ManagerAuth()
+ public R availableEmptyPutSite() {
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
@RequestMapping("/available/take/site")
- @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
- public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ @ManagerAuth()
+ public R availableTakeSite() {
+ Set<Map<String, Object>> result = new HashSet<>();
+ EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+ wrapper.eq("type_no", 101).eq("crn_no", 1).orderBy("stn_no", true);
+ List<StaDesc> staDescs = staDescService.selectList(wrapper);
+ for (StaDesc site : staDescs) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", site.getStnNo());
+ map.put("desc", site.getStnDesc() + site.getStnNo());
+ result.add(map);
+ }
+
+ EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
+ wrapper2.eq("type_no", 103).eq("crn_no", 1).orderBy("stn_no", true);
+ List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
+ for (StaDesc site : staDescs2) {
+ Map<String, Object> map = new HashMap<>();
+ 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() {
+ 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 + "锛堝叏鏉垮嚭搴撳彛锛�");
+ result.add(map);
+ }
+ 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 + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ result.add(map);
+ }
+ return R.ok().add(result);
+ }
+
+ @RequestMapping("/available/take/check/site")
+ @ManagerAuth()
+ 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() {
+ 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);
+ 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(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
- public R availableEmptyTakeSite(){
- return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ @ManagerAuth()
+ public R availableEmptyTakeSite() {
+ 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) {
+ if (staDesc.getCrnNo() == 7) {
+ continue;
+ }
+ 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")
@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")
+ @ManagerAuth(memo = "鍑哄簱浣滀笟")
+ public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+ workService.startupFullTakeStore(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@RequestMapping("/empty/plate/in/start")
@@ -62,17 +222,24 @@
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
}
- @RequestMapping("/plate/out/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
- public R fullStoreTakeStart(EmptyPlateOutParam param) {
+ @RequestMapping("/empty/plate/out/start")
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ public R emptyPlateOutStart(EmptyPlateOutParam param) {
workService.emptyPlateOut(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
- @RequestMapping("/empty/plate/out/start")
- @ManagerAuth(memo = "绌烘澘鍑哄簱")
- public R emptyPlateOutStart(StockOutParam param) {
+ @RequestMapping("/locCheck/out/start")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStart(@RequestBody StockOutParam param) {
+ workService.locCheckOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+ @RequestMapping("/locCheck/out/start/sxk")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStartsxk(@RequestBody StockOutParam param) {
+ workService.locCheckOutsxk(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -84,16 +251,55 @@
return R.ok("绉诲簱鍚姩鎴愬姛");
}
+ @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())) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+ if (param.getLocDetls().size() > 1) {
+ return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
+ }
+ workService.turnMatLocDetl(param, getUserId());
+ return R.ok("鍝佸彿绉讳氦鎴愬姛");
+ }
+
+ @RequestMapping("/locDdetl/adjust/start")
+ @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
+ workService.adjustLocDetl(param, getUserId());
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
+ }
+
@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("宸ヤ綔妗ｅ凡瀹屾垚");
} else if (type == 2) {
workService.cancelWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.pickWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
}
return R.ok();
}
+ @RequestMapping("/create/waitPain/wrkMast/start")
+ @ManagerAuth(memo = "鐢熸垚浠诲姟")
+ public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
+ StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
+ return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+ }
+
+ @RequestMapping("/deal/preHave/start")
+ @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
+ public R dealPreHave(@RequestParam Integer wrkNo) {
+ String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+ return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
+ }
+
}
--
Gitblit v1.9.1