From 43efe016c156158b9fc3a8b647810f612fb126e6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 02 九月 2025 11:39:52 +0800
Subject: [PATCH] 自动补货单新增 1.订单中只能生成两笔自动补货单 2.CTU库是否有足够的空库位,空库位数需要大于100才会生成自动补货单 3.在补货时加上订单明细的数量进行判断

---
 src/main/java/com/zy/asrs/controller/OutController.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 3edf6e9..3cf87c2 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -13,6 +13,7 @@
 import com.zy.common.model.OrderMergeVo;
 import com.zy.common.model.TaskDto;
 import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -23,7 +24,7 @@
 /**
  * Created by vincent on 2022/3/26
  */
-
+@Slf4j
 @RestController
 public class OutController extends BaseController {
 
@@ -116,7 +117,7 @@
     @ManagerAuth(memo = "璁㈠崟鍑哄簱")
     @Transactional
     public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
-
+        log.info("璁㈠崟鍑哄簱:{}", locDtos);
         //鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗�
         boolean lack = true;
         for (LocDto locDto : locDtos) {
@@ -163,7 +164,9 @@
     @RequestMapping(value = "/order/merge/preview/auth")
     @ManagerAuth
     public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
-        return R.ok().add(orderService.mergePreview(orderIds));
+        List<OrderMergeVo> orderMergeVos = orderService.mergePreview(orderIds);
+        log.info("鍚堝苟鍑哄簱姹囨�籰ocDtoList:{}", orderMergeVos);
+        return R.ok().add(orderMergeVos);
     }
 
     @PostMapping("/out/pakout/preview/merge/auth")
@@ -190,7 +193,7 @@
             }
 
         }
-
+        log.info("鍚堝苟鍑哄簱棰勮locDtoList:{}", locDtoList);
         return R.ok().add(locDtoList);
 
     }

--
Gitblit v1.9.1