From a1a7c03eae40f4b0344fce652e1a240cf5283624 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 13 九月 2024 16:37:42 +0800
Subject: [PATCH] #合并订单出库，统一转波次出库前最新代码
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 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..7532179 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,21 @@
package com.zy.asrs.wms.asrs.controller;
import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.asrs.entity.param.OutParam;
+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.*;
import com.zy.asrs.wms.asrs.manage.OutManage;
+import com.zy.asrs.wms.common.annotation.OperationLog;
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 +29,66 @@
* 鍑哄簱
*/
@PostMapping("/out/start")
+ @OperationLog("鍑哄簱")
+ @Transactional
public R start(@RequestBody OutParam param) {
outManage.out(param);
return R.ok();
}
+
+ @PostMapping("/out/orderOut/batch/preview")
+ @OperationLog("鎵归噺鍑哄簱棰勮")
+ @Transactional
+ public R orderOutBatchPreview(@RequestBody OrderOutBatchPreviewParam param) {
+ List<OrderOutBatchPreviewDto> previewDtos = outManage.orderOutBatchPreview(param);
+ return R.ok().add(previewDtos);
+ }
+
+ @PostMapping("/out/orderOut/batch")
+ @OperationLog("鎵归噺鍑哄簱")
+ @Transactional
+ public R orderOutBatch(@RequestBody List<OrderOutBatchPreviewDto> param) {
+ outManage.orderOutBatch(param);
+ return R.ok();
+ }
+
+ @PostMapping("/out/orderOut/merge/preview")
+ @OperationLog("棰勮鍚堝苟璁㈠崟")
+ @Transactional
+ public R orderOutMergePreview(@RequestBody OrderOutMergePreviewParam param) {
+ List<MergePreviewDto> dtos = outManage.orderOutMergePreview(param);
+ return R.ok().add(dtos);
+ }
+
+ @PostMapping("/out/orderOut/merge/loc/preview")
+ @OperationLog("棰勮鍚堝苟璁㈠崟鍑哄簱")
+ @Transactional
+ public R orderOutMergeLocPreview(@RequestBody List<MergePreviewDto> param) {
+ List<MergePreviewResultDto> dtos = outManage.orderOutMergeLocPreview(param);
+ return R.ok().add(dtos);
+ }
+
+ @PostMapping("/out/orderOut/merge")
+ @OperationLog("鍚堝苟璁㈠崟鍑哄簱")
+ @Transactional
+ public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
+ outManage.orderOutMerge(param);
+ return R.ok();
+ }
+
+ @PostMapping("/out/wave/generate")
+ @OperationLog("鐢熸垚娉㈡")
+ @Transactional
+ public R generateWave(@RequestBody List<Long> orderIds) {
+ outManage.generateWave(orderIds);
+ return R.ok();
+ }
+
+ @PostMapping("/out/wave/cancel")
+ @OperationLog("鍙栨秷娉㈡")
+ @Transactional
+ public R cancelWave(@RequestBody List<Long> waveIds) {
+ outManage.cancelWave(waveIds);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1