From ea92b2e7bb48c55f7ec2cf52dfdb2497f30b49ce Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 21 十二月 2025 09:44:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/WorkController.java | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 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 eae764b..72f0af3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,7 +1,9 @@
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.BasDevp;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
@@ -36,32 +38,32 @@
@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(){
+ public R availableTakeSite() {
List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101);
- for (Integer siteId : outSite) {
+ List<BasDevp> outSite = basDevpService.getAvailableOutSiteAndDesc(101);
+ for (BasDevp siteId : outSite) {
Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ map.put("siteId", siteId.getDevNo());
+ map.put("desc", siteId.getDevNo() + siteId.getDecDesc());
result.add(map);
}
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
- for (Integer siteId : pickOutSite) {
+ List<BasDevp> pickOutSite = basDevpService.getAvailableOutSiteAndDesc(103);
+ for (BasDevp siteId : pickOutSite) {
Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ map.put("siteId", siteId.getDevNo());
+ map.put("desc", siteId.getDevNo() + siteId.getDecDesc());
result.add(map);
}
return R.ok().add(result);
@@ -69,26 +71,55 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth()
- public R availableTakeCheckSite(){
+ public R availableTakeCheckSite() {
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
- public R availableEmptyTakeSite(){
+ public R availableEmptyTakeSite() {
return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ }
+
+ @RequestMapping("/available/take/check/siteDesc")
+ @ManagerAuth()
+ public R availableTakeCheckSiteDesc() {
+ List<BasDevp> availableOutSite = basDevpService.getAvailableOutSiteAndDesc(107);
+ List<String> data = new ArrayList<>();
+ for (BasDevp siteId : availableOutSite) {
+ data.add(siteId.getDevNo() + siteId.getDecDesc());
+ }
+ return R.ok().add(data);
+ }
+
+ @RequestMapping("/available/empty/take/siteDesc")
+ @ManagerAuth()
+ public R availableEmptyTakeSiteDesc() {
+ List<BasDevp> availableOutSite = basDevpService.getAvailableEmptyOutSiteAndDesc();
+ List<String> data = new ArrayList<>();
+ for (BasDevp siteId : availableOutSite) {
+ data.add(siteId.getDevNo() + siteId.getDecDesc());
+ }
+ return R.ok().add(data);
}
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam, getUserId()));
}
@RequestMapping("/plate/out/start")
@ManagerAuth(memo = "鍑哄簱浣滀笟")
public R fullStoreTakeStart(@RequestBody StockOutParam param) {
workService.startupFullTakeStore(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/plate/order/out/start")
+ @ManagerAuth(memo = "鎵嬪姩璁㈠崟鍑哄簱浣滀笟")
+ public R fullStoreTakeStartOrder(@RequestBody StockOutParam param) {
+ workService.startupFullTakeStoreOrder(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -120,6 +151,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) {
@@ -130,7 +174,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