From 15dc5e53f4ba7fe72cc0f3d3a246a9599fa52acf Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期三, 15 六月 2022 13:24:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/controller/WorkController.java | 9 ++++++++-
1 files changed, 8 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..eae764b 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -148,7 +148,14 @@
@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);
}
}
--
Gitblit v1.9.1