From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/controller/WorkController.java | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 70f9050..66e78e6 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,19 +1,27 @@
package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
+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.WorkService;
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -28,44 +36,84 @@
private BasDevpService basDevpService;
@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(101));
+ @ManagerAuth()
+ public R availableTakeSite() {
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Integer> outSite = basDevpService.getAvailableOutSite(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);
+ 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("/turn/over/out/start")
+ @ManagerAuth(memo = "瀹㈡埛杞崲")
+ public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
+ workService.turnOverOut(param, getUserId());
+ return R.ok("瀹㈡埛杞崲鎴愬姛");
}
@RequestMapping("/available/take/check/site")
- @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
- public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(103));
+ @ManagerAuth()
+ public R availableTakeCheckSite() {
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
- @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
- public R availableEmptyTakeSite(){
+ @ManagerAuth()
+ public R availableEmptyTakeSite() {
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) {
+ /*if (getUser().getRoleId()!=2 && getUser().getRoleId()!=14){
+ return R.error("鏃犳潈闄� 璇疯仈绯荤鐞嗗憳");
+ }*/
+ workService.startupFullTakeStore(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/plate/out/start/v2")
+ @ManagerAuth(memo = "鍑哄簱浣滀笟2")
+ public R fullStoreTakeStartV2(@RequestBody StockOutParam param) {
+ if (Cools.isEmpty(param.getItemId())) {
+ return R.error("杞叆浠撳簱涓嶈兘涓虹┖");
+ }
workService.startupFullTakeStore(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -98,6 +146,19 @@
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) {
@@ -108,7 +169,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("宸ヤ綔妗ｅ凡瀹屾垚");
@@ -117,9 +178,23 @@
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
} else if (type == 3) {
workService.pickWrkMast(workNo, getUserId());
- return R.ok();
+ 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