From 49ffaeabe598b7f5ce781ce78c338e96408df90f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 23 四月 2022 10:28:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/WorkController.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index f5b8749..9f8dbe2 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -2,12 +2,14 @@ import com.core.annotations.ManagerAuth; import com.core.common.R; +import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.param.EmptyPlateOutParam; import com.zy.asrs.entity.param.FullStoreParam; import com.zy.asrs.entity.param.LocDetlAdjustParam; import com.zy.asrs.entity.param.StockOutParam; import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.WorkService; +import com.zy.common.model.StartupDto; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -33,19 +35,19 @@ private BasDevpService basDevpService; @RequestMapping("/available/put/site") - @ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣") + @ManagerAuth() public R availablePutSite(){ return R.ok().add(basDevpService.getAvailableInSite()); } @RequestMapping("/available/empty/put/site") - @ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣") + @ManagerAuth() public R availableEmptyPutSite(){ return R.ok().add(basDevpService.getAvailableEmptyInSite()); } @RequestMapping("/available/take/site") - @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣") + @ManagerAuth() public R availableTakeSite(){ List<Map<String, Object>> result = new ArrayList<>(); List<Integer> outSite = basDevpService.getAvailableOutSite(101); @@ -66,13 +68,13 @@ } @RequestMapping("/available/take/check/site") - @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣") + @ManagerAuth() public R availableTakeCheckSite(){ return R.ok().add(basDevpService.getAvailableOutSite(107)); } @RequestMapping("/available/empty/take/site") - @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣") + @ManagerAuth() public R availableEmptyTakeSite(){ return R.ok().add(basDevpService.getAvailableEmptyOutSite()); } @@ -142,4 +144,11 @@ return R.ok(); } + @RequestMapping("/create/waitPain/wrkMast/start") + @ManagerAuth(memo = "鐢熸垚浠诲姟") + public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) { + StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId()); + return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo()); + } + } -- Gitblit v1.9.1