From 28df4f39e3e7fbc6f315341e2acf8b8fe36e5a96 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 09:36:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 6e0f5e3..c687eb7 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,14 +1,16 @@
package com.zy.asrs.controller;
-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;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -16,7 +18,7 @@
* Created by vincent on 2020/6/10
*/
@RestController
-public class WorkController {
+public class WorkController extends BaseController {
@Autowired
private WorkService workService;
@@ -24,18 +26,42 @@
private BasDevpService basDevpService;
@RequestMapping("/available/put/site")
- @ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫叆搴撶珯鐐�")
+ @ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣")
public R availablePutSite(){
- return R.ok().add(basDevpService.getAvailableDevp());
+ return R.ok().add(basDevpService.getAvailableInSite());
}
- @RequestMapping("/full/store/start")
+ @RequestMapping("/available/empty/put/site")
+ @ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
+ public R availableEmptyPutSite(){
+ return R.ok().add(basDevpService.getAvailableEmptyInSite());
+ }
+
+ @RequestMapping("/available/empty/take/site")
+ @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
+ public R availableEmptyTakeSite(){
+ return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ }
+
+ @RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
- public R start(@RequestBody FullStoreParam fullStoreParam) {
+ public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
+ workService.startupFullStore(fullStoreParam,getUserId());
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
- System.out.println(JSON.toJSONString(fullStoreParam));
+ @RequestMapping("/empty/plate/in/start")
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+ public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
+ workService.emptyPlateIn(sourceStaNo, getUserId());
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
- return R.ok();
+ @RequestMapping("/empty/plate/out/start")
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ public R emptyPlateOutStart(EmptyPlateOutParam param) {
+ workService.emptyPlateOut(param, getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
}
}
--
Gitblit v1.9.1