From 2c5fed998b47832e8b1a21817448a58bab77c120 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 16 六月 2020 15:38:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/WorkService.java | 9 ++++++++- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++++++ src/main/java/com/zy/asrs/controller/WorkController.java | 18 +++++++++--------- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index 0f1a5a1..8d1520a 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -56,23 +56,23 @@ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId())); } + @RequestMapping("/plate/out/start") + @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱") + public R fullStoreTakeStart(StockOutParam param) { + workService.startupFullTakeStore(param, getUserId()); + return R.ok("鍑哄簱鍚姩鎴愬姛"); + } + @RequestMapping("/empty/plate/in/start") @ManagerAuth(memo = "绌烘澘鍏ュ簱") public R emptyPlateInStart(@RequestParam Integer sourceStaNo) { return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId())); } - @RequestMapping("/plate/out/start") - @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱") - public R fullStoreTakeStart(EmptyPlateOutParam param) { - workService.emptyPlateOut(param, getUserId()); - return R.ok("鍑哄簱鍚姩鎴愬姛"); - } - @RequestMapping("/empty/plate/out/start") @ManagerAuth(memo = "绌烘澘鍑哄簱") - public R emptyPlateOutStart(StockOutParam param) { - + public R emptyPlateOutStart(EmptyPlateOutParam param) { + workService.emptyPlateOut(param, getUserId()); return R.ok("鍑哄簱鍚姩鎴愬姛"); } diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java index d6f38b7..26d286d 100644 --- a/src/main/java/com/zy/asrs/service/WorkService.java +++ b/src/main/java/com/zy/asrs/service/WorkService.java @@ -2,6 +2,7 @@ import com.zy.asrs.entity.param.EmptyPlateOutParam; import com.zy.asrs.entity.param.FullStoreParam; +import com.zy.asrs.entity.param.StockOutParam; public interface WorkService { @@ -12,7 +13,13 @@ String startupFullPutStore(FullStoreParam param, Long userId); /** - * 瀛旀澘鍏ュ簱 + * 鍏ㄦ澘鍑哄簱 + * @return 搴撲綅鍙� + */ + String startupFullTakeStore(StockOutParam param, Long userId); + + /** + * 绌烘澘鍏ュ簱 * @return 搴撲綅鍙� */ String emptyPlateIn(Integer sourceStaNo, Long userId); diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index c3e5758..a31f3f8 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -8,6 +8,7 @@ import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.EmptyPlateOutParam; import com.zy.asrs.entity.param.FullStoreParam; +import com.zy.asrs.entity.param.StockOutParam; import com.zy.asrs.service.*; import com.zy.common.model.StartupDto; import com.zy.common.service.CommonService; @@ -108,6 +109,13 @@ } @Override + public String startupFullTakeStore(StockOutParam param, Long userId) { + // todo + + return null; + } + + @Override @Transactional public String emptyPlateIn(Integer devpNo, Long userId) { // 婧愮珯鐐圭姸鎬佹娴� -- Gitblit v1.9.1