From 2d809c12abe87c21d6090ce6c5b3c75959cf4a2b Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 24 六月 2025 09:13:48 +0800
Subject: [PATCH] Merge branch 'master' into csc

---
 Wms/WMS.BLL/DataServer/StockServer.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 65e4416..4574a47 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -456,7 +456,7 @@
                     RQty = tb1.Qty,
                     RFactQty = tb1.Qty,
                     RCompleteQty = tb1.Qty,
-                    CompleteTime = tb1.CompleteTime,
+                    CompleteTime = tb2.CreateTime,
                     LotText = tb1.LotText,
                     SupplierLot = tb2.SupplierLot,
                     
@@ -498,7 +498,7 @@
 
                      SONo = tb2.SONo,
                      CTaskNo = tb1.TaskNo,
-                     CCreateTime = tb1.UpdateTime,
+                     CCreateTime = tb1.CreateTime,
                      CQty = tb1.Qty,
                      CFactQty = tb1.Qty,
                      CAllotQty = tb1.Qty,

--
Gitblit v1.8.0