From 86b8273226c7aa87e7c346659ed9e76278dcc471 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 15 十月 2023 11:28:01 +0800
Subject: [PATCH] AGV工作档取消和完成
---
src/main/java/com/zy/asrs/controller/WorkController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 3379c7b..5eb4ebf 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
@RequestMapping("/available/put/site")
@ManagerAuth()
@@ -148,7 +151,20 @@
@ManagerAuth(memo = "鐢熸垚浠诲姟")
public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
- return R.ok("娣诲姞浠诲姟鎴愬姛锛屼换鍔″彿锛�" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+ return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+ }
+
+ @RequestMapping("/deal/preHave/start")
+ @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
+ public R dealPreHave(@RequestParam Integer wrkNo) {
+ String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+ return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
+ }
+
+ @RequestMapping("/deal/steNo/empty")
+ @ManagerAuth(memo = "娓呴櫎灏忚溅")
+ public R dealSteNoEmpty(@RequestParam Integer wrkNo) {
+ return wrkMastService.setSteEmpty(wrkNo)?R.ok():R.error();
}
}
--
Gitblit v1.9.1