From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/WorkController.java | 108 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 3379c7b..5100575 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;
@@ -35,120 +36,165 @@
private BasDevpService basDevpService;
@RequestMapping("/available/put/site")
- @ManagerAuth()
+ @ManagerAuth(memo = "response.available_site_query")
public R availablePutSite(){
- return R.ok().add(basDevpService.getAvailableInSite());
+ R r = R.ok();
+ r.put("data", basDevpService.getAvailableInSite());
+ return r;
}
@RequestMapping("/available/empty/put/site")
- @ManagerAuth()
+ @ManagerAuth(memo = "response.available_site_query")
public R availableEmptyPutSite(){
- return R.ok().add(basDevpService.getAvailableEmptyInSite());
+ R r = R.ok();
+ r.put("data",basDevpService.getAvailableEmptyInSite());
+ return r;
}
@RequestMapping("/available/take/site")
- @ManagerAuth()
+ @ManagerAuth(memo = "response.available_site_query")
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 + "锛堝叏鏉垮嚭搴撳彛锛�");
+ map.put("desc", siteId + "锛坒ull_pallet_out锛�");
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 + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ map.put("desc", siteId + "锛坧icking_out锛�");
result.add(map);
}
- return R.ok().add(result);
+ R r = R.ok();
+ r.put("data",result);
+ return r;
}
@RequestMapping("/available/take/check/site")
- @ManagerAuth()
+ @ManagerAuth(memo = "response.available_site_query")
public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(107));
+ R r = R.ok();
+ r.put("data",basDevpService.getAvailableOutSite(107));
+ return r;
}
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
public R availableEmptyTakeSite(){
- return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ R r = R.ok();
+ r.put("data",basDevpService.getAvailableEmptyOutSite());
+ return r;
}
@RequestMapping("/full/store/put/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+ @ManagerAuth(memo = "response.full_pallet_inbound")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ try {
+ String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
+ R r = R.ok("response.inbound_start_success");
+ r.put("data",locNo);
+ return r;
+ } catch (Exception e){
+ R r = R.error("response.inbound_start_fail");
+ r.put("data",e.getMessage());
+ return r;
+ }
}
@RequestMapping("/plate/out/start")
- @ManagerAuth(memo = "鍑哄簱浣滀笟")
+ @ManagerAuth(memo = "response.outbound_operation")
public R fullStoreTakeStart(@RequestBody StockOutParam param) {
workService.startupFullTakeStore(param, getUserId());
- return R.ok("鍑哄簱鍚姩鎴愬姛");
+ return R.ok("response.outbound_start_success");
}
@RequestMapping("/empty/plate/in/start")
- @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+ @ManagerAuth(memo = "response.empty_pallet_inbound")
public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
+ R r = R.ok("response.inbound_start_success");
+ r.put("data", workService.emptyPlateIn(sourceStaNo, getUserId()));
+ return r;
}
@RequestMapping("/empty/plate/out/start")
- @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ @ManagerAuth(memo = "response.empty_pallet_outbound")
public R emptyPlateOutStart(EmptyPlateOutParam param) {
workService.emptyPlateOut(param, getUserId());
- return R.ok("鍑哄簱鍚姩鎴愬姛");
+ return R.ok("response.outbound_start_success");
}
@RequestMapping("/locCheck/out/start")
- @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ @ManagerAuth(memo = "response.stock_take_outbound")
public R locCheckOutStart(@RequestBody StockOutParam param) {
workService.locCheckOut(param, getUserId());
- return R.ok("鍑哄簱鍚姩鎴愬姛");
+ return R.ok("response.outbound_start_success");
}
@RequestMapping("/loc/move/start")
- @ManagerAuth(memo = "搴撲綅绉昏浆")
+ @ManagerAuth(memo = "response.location_transfer")
public R locMoveStart(@RequestParam String sourceLocNo,
@RequestParam String targetLocNo) {
workService.locMove(sourceLocNo, targetLocNo, getUserId());
- return R.ok("绉诲簱鍚姩鎴愬姛");
+ return R.ok("response.move_start_success");
+ }
+
+ @RequestMapping("/mat/turn/over/out/start")
+ @ManagerAuth(memo = "response.item_handover")
+ 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("response.params_empty");
+ }
+ if (param.getLocDetls().size()>1){
+ return R.error("response.single_data_modify_caution");
+ }
+ workService.turnMatLocDetl(param, getUserId());
+ return R.ok("response.item_handover_success");
}
@RequestMapping("/locDdetl/adjust/start")
- @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ @ManagerAuth(memo = "response.stock_adjustment")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
workService.adjustLocDetl(param, getUserId());
- return R.ok("搴撳瓨璋冩暣鎴愬姛");
+ return R.ok("response.stock_adjust_success");
}
@RequestMapping("/hand/control/wrkMast")
- @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+ @ManagerAuth(memo = "response.manual_process_work")
public R handControlWrkMast(@RequestParam String workNo,
@RequestParam Integer type){
if (type == 1) {
workService.completeWrkMast(workNo, getUserId());
- return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
+ return R.ok("response.work_completed");
} else if (type == 2) {
workService.cancelWrkMast(workNo, getUserId());
- return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ return R.ok("response.work_cancelled");
} else if (type == 3) {
workService.pickWrkMast(workNo, getUserId());
- return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
+ return R.ok("response.work_picked");
}
return R.ok();
}
@RequestMapping("/create/waitPain/wrkMast/start")
- @ManagerAuth(memo = "鐢熸垚浠诲姟")
+ @ManagerAuth(memo = "response.generate_task")
public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
- return R.ok("娣诲姞浠诲姟鎴愬姛锛屼换鍔″彿锛�" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+ R r = R.ok("response.task_created");
+ r.put("data",startupDto);
+ return r;
+ }
+
+ @RequestMapping("/deal/preHave/start")
+ @ManagerAuth(memo = "response.fifo_handling")
+ public R dealPreHave(@RequestParam Integer wrkNo) {
+ String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+ R r = R.ok("response.task_re_inbound");
+ r.put("data",locNo);
+ return r;
}
}
--
Gitblit v1.9.1