From 2b613ec7306bf62b6bebde76fe6b4cccc4fc64ff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 六月 2020 15:02:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 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 be58a56..f0dc9a3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -3,9 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
+import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +18,7 @@
* Created by vincent on 2020/6/10
*/
@RestController
-public class WorkController {
+public class WorkController extends BaseController {
@Autowired
private WorkService workService;
@@ -26,14 +28,27 @@
@RequestMapping("/available/put/site")
@ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫叆搴撶珯鐐�")
public R availablePutSite(){
- return R.ok().add(basDevpService.getAvailableDevp());
+ return R.ok().add(basDevpService.getAvailableInSite());
}
- @RequestMapping("/full/store/start")
+ @RequestMapping("/available/take/site")
+ @ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫嚭搴撶珯鐐�")
+ public R availableTakeSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite());
+ }
+
+ @RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R start(@RequestBody FullStoreParam fullStoreParam) {
- System.out.println(JSON.toJSONString(fullStoreParam));
- workService.startupFullStore(fullStoreParam);
+ workService.startupFullStore(fullStoreParam,getUserId());
+ return R.ok();
+ }
+
+
+ @RequestMapping("/empty/plate/out/start")
+ @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+ public R start(EmptyPlateOutParam param) {
+ System.out.println(JSON.toJSONString(param));
return R.ok();
}
--
Gitblit v1.9.1