From d18505cc87fa30a5b202057bbcc4236986efc80a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 13:16:55 +0800
Subject: [PATCH] 纽维盛wms初始化-截至现在wms2.0已完善(带数据库)
---
src/main/java/com/zy/asrs/controller/WorkController.java | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 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..54d3225 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,6 +1,7 @@
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;
@@ -17,10 +18,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.*;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -36,53 +34,70 @@
@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<Integer> outSite = basDevpService.getAvailableOutSite(101);
+// for (Integer siteId : outSite) {
+ List<Integer> siteList = Arrays.asList(1101, 1201, 1206, 1301, 1306, 1408);
+ for (Integer site : siteList) {
Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ map.put("siteId", site);
+ map.put("desc", site + "锛堝嚭搴撳彛锛�");
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);
- }
+// }
+// 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()
- public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(107));
+ public R availableTakeCheckSite() {
+ return R.ok(Arrays.asList(1101, 1201, 1206, 1301, 1306, 1408));
+// return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
- public R availableEmptyTakeSite(){
- return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ public R availableEmptyTakeSite() {
+ return R.ok(Arrays.asList(1101, 1201, 1206, 1301, 1306, 1408));
+// 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")
@@ -120,6 +135,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 +158,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("宸ヤ綔妗ｅ凡瀹屾垚");
@@ -148,7 +176,7 @@
@ManagerAuth(memo = "鐢熸垚浠诲姟")
public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
- return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+ return R.ok("浠诲姟鍙凤細" + startupDto.getTaskNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
}
@RequestMapping("/deal/preHave/start")
--
Gitblit v1.9.1