From 2db77d2cfc617aacefc05f0c946e34e85be8e434 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 20 六月 2025 16:14:24 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.BLL/DataServer/StockServer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 65e4416..bc99fe0 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,
@@ -492,7 +492,7 @@
RQty = 0,
RFactQty = 0,
RCompleteQty = 0,
- CompleteTime = null,
+ CompleteTime = tb2.CreateTime,
LotText = tb1.LotText,
SupplierLot = tb2.SupplierLot,
@@ -525,7 +525,7 @@
RQty = 0,
RFactQty = 0,
RCompleteQty = 0,
- CompleteTime = null,
+ CompleteTime = a.CreateTime,
LotText = "",
SupplierLot = "",
--
Gitblit v1.8.0