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 |   92 +++++++++++++++++++++++++++++++++------------
 1 files changed, 67 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..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,22 +1,23 @@
 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.*;
 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;
-import java.util.Map;
 
-/**
- * 杩欓噷澶勭悊鎵�鏈夌殑鍑哄簱娴佺▼鐨勬帴鍙�
- */
+
 @RestController
 @RequestMapping("/api")
 public class OutController extends BaseController {
@@ -24,29 +25,70 @@
     @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);
+    @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