From 2571ba1e38fddbfdcd3e17450c4ee0cde89f3350 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 六月 2020 10:38:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index f0dc9a3..78bfc8a 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,6 +1,5 @@
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;
@@ -11,6 +10,7 @@
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;
/**
@@ -26,29 +26,59 @@
private BasDevpService basDevpService;
@RequestMapping("/available/put/site")
- @ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫叆搴撶珯鐐�")
+ @ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣")
public R availablePutSite(){
return R.ok().add(basDevpService.getAvailableInSite());
}
- @RequestMapping("/available/take/site")
- @ManagerAuth(memo = "鑾峰彇鏈夋晥鐨勫嚭搴撶珯鐐�")
- public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ @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) {
- workService.startupFullStore(fullStoreParam,getUserId());
- return R.ok();
+ public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
}
+ @RequestMapping("/empty/plate/in/start")
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+ public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
+ }
@RequestMapping("/empty/plate/out/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
- public R start(EmptyPlateOutParam param) {
- System.out.println(JSON.toJSONString(param));
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
+ public R emptyPlateOutStart(EmptyPlateOutParam param) {
+ workService.emptyPlateOut(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("/hand/control/wrkMast")
+ @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+ public R handControlWrkMast(@RequestParam String workNo,
+ @RequestParam Integer type){
+ if (type == 1) {
+ workService.completeWrkMast(workNo, getUserId());
+ } else if (type == 2) {
+ workService.cancelWrkMast(workNo, getUserId());
+ }
return R.ok();
}
--
Gitblit v1.9.1