From b1a9eacb3aecbfb44e6d4cc9468983b748fe4307 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 04 七月 2020 12:56:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5ea8ef6..c76f3f7 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -4,6 +4,8 @@
import com.core.common.R;
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.web.BaseController;
@@ -37,6 +39,12 @@
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
+ @RequestMapping("/available/take/site")
+ @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
+ public R availableTakeSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite());
+ }
+
@RequestMapping("/available/empty/take/site")
@ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
public R availableEmptyTakeSite(){
@@ -46,22 +54,49 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- workService.startupFullStore(fullStoreParam,getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ 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("/empty/plate/in/start")
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
- workService.emptyPlateIn(sourceStaNo, getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
}
@RequestMapping("/empty/plate/out/start")
@ManagerAuth(memo = "绌烘澘鍑哄簱")
public R emptyPlateOutStart(EmptyPlateOutParam param) {
workService.emptyPlateOut(param, getUserId());
- return R.ok("鍑哄簱鎴愬姛");
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/locCheck/out/start")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStart(@RequestBody StockOutParam param) {
+ workService.locCheckOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
+ @RequestMapping("/loc/move/start")
+ @ManagerAuth(memo = "搴撲綅绉昏浆")
+ public R locMoveStart(@RequestParam String sourceLocNo,
+ @RequestParam String targetLocNo) {
+ workService.locMove(sourceLocNo, targetLocNo, 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")
@@ -69,9 +104,11 @@
public R handControlWrkMast(@RequestParam String workNo,
@RequestParam Integer type){
if (type == 1) {
- workService.completeWrkMast(workNo);
+ workService.completeWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
} else if (type == 2) {
- workService.cancelWrkMast(workNo);
+ workService.cancelWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
}
return R.ok();
}
--
Gitblit v1.9.1