From 11b3ac7e9f6bc9144ddd7a5261cf69796f38d7b3 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期六, 07 九月 2024 13:51:31 +0800 Subject: [PATCH] # --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java index d3d6558..248a3cc 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java @@ -1,14 +1,23 @@ package com.zy.asrs.wms.asrs.controller; import com.zy.asrs.framework.common.R; +import com.zy.asrs.wms.asrs.entity.dto.MergePreviewDto; +import com.zy.asrs.wms.asrs.entity.dto.MergePreviewResultDto; +import com.zy.asrs.wms.asrs.entity.dto.OrderOutBatchPreviewDto; +import com.zy.asrs.wms.asrs.entity.param.OrderOutBatchPreviewParam; +import com.zy.asrs.wms.asrs.entity.param.OrderOutMergeParam; +import com.zy.asrs.wms.asrs.entity.param.OrderOutMergePreviewParam; import com.zy.asrs.wms.asrs.entity.param.OutParam; import com.zy.asrs.wms.asrs.manage.OutManage; import com.zy.asrs.wms.system.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import java.util.List; @RestController @@ -22,8 +31,44 @@ * 鍑哄簱 */ @PostMapping("/out/start") + @Transactional public R start(@RequestBody OutParam param) { outManage.out(param); return R.ok(); } + + @PostMapping("/out/orderOut/batch/preview") + @Transactional + public R orderOutBatchPreview(@RequestBody OrderOutBatchPreviewParam param) { + List<OrderOutBatchPreviewDto> previewDtos = outManage.orderOutBatchPreview(param); + return R.ok().add(previewDtos); + } + + @PostMapping("/out/orderOut/batch") + @Transactional + public R orderOutBatch(@RequestBody List<OrderOutBatchPreviewDto> param) { + outManage.orderOutBatch(param); + return R.ok(); + } + + @PostMapping("/out/orderOut/merge/preview") + @Transactional + public R orderOutMergePreview(@RequestBody OrderOutMergePreviewParam param) { + List<MergePreviewDto> dtos = outManage.orderOutMergePreview(param); + return R.ok().add(dtos); + } + + @PostMapping("/out/orderOut/merge/loc/preview") + @Transactional + public R orderOutMergeLocPreview(@RequestBody List<MergePreviewDto> param) { + List<MergePreviewResultDto> dtos = outManage.orderOutMergeLocPreview(param); + return R.ok().add(dtos); + } + + @PostMapping("/out/orderOut/merge") + @Transactional + public R orderOutMerge(@RequestBody List<OrderOutMergeParam> param) { + outManage.orderOutMerge(param); + return R.ok(); + } } -- Gitblit v1.9.1