From a840e7934946d6aeae1e2abd61f5fd024c2868d8 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期日, 07 四月 2024 08:23:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index bc186d4..9870e1c 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()
@@ -121,7 +124,7 @@
}
@RequestMapping("/locDdetl/adjust/start")
- @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ @ManagerAuth(memo = "搴撳瓨璋冩暣1")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
workService.adjustLocDetl(param, getUserId());
return R.ok("搴撳瓨璋冩暣鎴愬姛");
@@ -154,8 +157,14 @@
@RequestMapping("/deal/preHave/start")
@ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
public R dealPreHave(@RequestParam Integer wrkNo) {
- StartupDto startupDto = workService.dealPreHaveStart(wrkNo, getUserId());
- return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + startupDto.getLocNo());
+ 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