From 42f46304bc28d9fb2bee770668b70204d877db93 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期五, 22 九月 2023 17:24:31 +0800
Subject: [PATCH] Merge branch 'dev_yy' into dev

---
 _Main/BL/Type_CustomerOrder/StaticMethod_LockUnlock.qbl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_CustomerOrder/StaticMethod_LockUnlock.qbl b/_Main/BL/Type_CustomerOrder/StaticMethod_LockUnlock.qbl
index 755761e..3126a57 100644
--- a/_Main/BL/Type_CustomerOrder/StaticMethod_LockUnlock.qbl
+++ b/_Main/BL/Type_CustomerOrder/StaticMethod_LockUnlock.qbl
@@ -20,7 +20,7 @@
         owner.OrderLockLog( relnew, 
                             CustomerName := order.CustomerName(), 
                             End := order.First().AsPlanningBaseSalesDemandInPeriod().End().Date(), 
-                            EndDate := order.EndDate(), 
+                            EndDate := order.StartDate(), 
                             IsLocked := order.IsLocked(), 
                             LastModify := order.LastModify(), 
                             LastModifyTime := order.LastModifyTime(), 
@@ -41,7 +41,7 @@
           owner.OrderLockLog( relnew, 
                               CustomerName := order.CustomerName(), 
                               End := order.First().AsPlanningBaseSalesDemandInPeriod().End().Date(), 
-                              EndDate := order.EndDate(), 
+                              EndDate := order.StartDate(), 
                               IsLocked := order.IsLocked(), 
                               LastModify := order.LastModify(), 
                               LastModifyTime := order.LastModifyTime(), 

--
Gitblit v1.9.3