From 30eb20ab1384b221801bbcff50ce6d05923dcd84 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 05 六月 2025 09:21:37 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 5bbabf2..830712a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -173,7 +173,9 @@
                     StockId = stockInfo.Id,
                     TaskNum = 0,
                     OrderQuantity = outboundOrderDetail.OrderQuantity,
-                    Unit = outboundOrderDetail.Unit
+                    Unit = outboundOrderDetail.Unit,
+                    ProductionDate = stockInfoDetail.ProductionDate,
+                    EffectiveDate = stockInfoDetail.EffectiveDate
                 };
 
                 #region 淇敼鍑哄簱鍗�
@@ -266,7 +268,7 @@
                     Deptno = outboundOrder.DepartmentCode,
                     Deptname = outboundOrder.DepartmentName,
                     Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                    Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
+                    Createuser = Createuser,
                     Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                 };
                 //鏇存柊鍙戞枡鍗曞彿

--
Gitblit v1.9.3