From 0ea1110b84334f1ecbd94fef6f4bf60e8d820b9a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 07 九月 2024 15:59:17 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 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 a2b6d08..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,22 +1,25 @@
package com.zy.asrs.wms.asrs.controller;
import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.asrs.controller.req.OutReq;
-import com.zy.asrs.wms.asrs.entity.LocDetl;
+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;
-import java.util.Map;
-/**
- * 杩欓噷澶勭悊鎵�鏈夌殑鍑哄簱娴佺▼鐨勬帴鍙�
- */
+
@RestController
@RequestMapping("/api")
public class OutController extends BaseController {
@@ -24,29 +27,48 @@
@Autowired
private OutManage outManage;
-
- /**
- * 鑾峰彇搴撳瓨
- *
- * @param map
- * @return
- */
- @PostMapping("/out/getStock")
- public R page(@RequestBody Map<String, Object> map) {
- List<LocDetl> suitableMat = outManage.getSuitableMat(map);
- return R.ok(suitableMat);
- }
-
-
/**
* 鍑哄簱
- *
- * @param outReq 鍑哄簱鍒楄〃
- * @return
*/
@PostMapping("/out/start")
- public R page(@RequestBody OutReq outReq) {
- outManage.out(outReq);
+ @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