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 | 7 ++-----
1 files changed, 2 insertions(+), 5 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 3788bbe..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
@@ -4,10 +4,7 @@
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.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;
@@ -74,7 +71,7 @@
@PostMapping("/out/orderOut/merge")
@OperationLog("鍚堝苟璁㈠崟鍑哄簱")
@Transactional
- public R orderOutMerge(@RequestBody List<OrderOutMergeParam> param) {
+ public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
outManage.orderOutMerge(param);
return R.ok();
}
--
Gitblit v1.9.1