From d5aea757321140614637b6bdfbe6c28c510c85ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 六月 2020 15:34:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index a55964a..0f1a5a1 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -4,6 +4,7 @@
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.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.common.web.BaseController;
@@ -37,6 +38,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(){
@@ -55,10 +62,17 @@
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
}
+ @RequestMapping("/plate/out/start")
+ @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
+ public R fullStoreTakeStart(EmptyPlateOutParam param) {
+ workService.emptyPlateOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/empty/plate/out/start")
@ManagerAuth(memo = "绌烘澘鍑哄簱")
- public R emptyPlateOutStart(EmptyPlateOutParam param) {
- workService.emptyPlateOut(param, getUserId());
+ public R emptyPlateOutStart(StockOutParam param) {
+
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -66,10 +80,9 @@
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
@RequestParam String targetLocNo) {
-// workService.emptyPlateOut(param, getUserId());
+ workService.locMove(sourceLocNo, targetLocNo, getUserId());
return R.ok("绉诲簱鍚姩鎴愬姛");
}
-
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
--
Gitblit v1.9.1