From b7a1f42ae92ebdd4173b0a24c889a240e1b33f5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 03 八月 2020 10:57:05 +0800
Subject: [PATCH] #嘉善WMS系统
---
src/main/java/com/zy/asrs/controller/WorkController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 837c299..70f9050 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -42,7 +42,13 @@
@RequestMapping("/available/take/site")
@ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ return R.ok().add(basDevpService.getAvailableOutSite(101));
+ }
+
+ @RequestMapping("/available/take/check/site")
+ @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
+ public R availableTakeCheckSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(103));
}
@RequestMapping("/available/empty/take/site")
@@ -58,7 +64,7 @@
}
@RequestMapping("/plate/out/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
+ @ManagerAuth(memo = "鍑哄簱浣滀笟")
public R fullStoreTakeStart(@RequestBody StockOutParam param) {
workService.startupFullTakeStore(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
@@ -77,6 +83,13 @@
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,
@@ -85,11 +98,11 @@
return R.ok("绉诲簱鍚姩鎴愬姛");
}
- @RequestMapping("/loc/detl/adjust/start")
+ @RequestMapping("/locDdetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
- public R locDetlAdjustStart(LocDetlAdjustParam param) {
+ public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
workService.adjustLocDetl(param, getUserId());
- return R.ok("绉诲簱鍚姩鎴愬姛");
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@RequestMapping("/hand/control/wrkMast")
@@ -102,6 +115,9 @@
} else if (type == 2) {
workService.cancelWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.pickWrkMast(workNo, getUserId());
+ return R.ok();
}
return R.ok();
}
--
Gitblit v1.9.1