From 728e14723ba5a26f95cf099cac3a0d1853aea34b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 11 六月 2025 10:46:56 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 057837a..a3db49b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -141,6 +141,9 @@
         StockOutParam param = new StockOutParam();
         ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
         for (LocDto locDto:locDtos){
+            Order order = orderService.selectByNo(locDto.getOrderNo());
+            OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());
+
             StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
             locDetl.setBrand(locDto.getBrand());
             try{
@@ -156,7 +159,8 @@
             locDetl.setModel(locDto.getModel());
             locDetl.setSpecs(locDto.getSpecs());
             locDetl.setZpallet(locDto.getZpallet());
-            locDetl.setMemo(locDto.getMemo());
+            locDetl.setMemo(orderDetl.getMemo());
+            locDetl.setColor(order.getCstmrName());
 
             param.setOrderNo(locDto.getOrderNo());
 
@@ -165,7 +169,9 @@
         param.setLocDetls(locDetls);
 
         List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
+        Date now = new Date();
         for (StockOutParam stockOutParam : stockOutParams){
+            stockOutParam.setNowTime(now);
             workService.startupFullTakeStore(stockOutParam, getUserId());
         }
 

--
Gitblit v1.9.1