From 3d65ee18d645a30e600c9b63f0daefe2fc2b1151 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 13 十一月 2024 15:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
index 4231dde..4d34c0d 100644
--- a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
@@ -93,7 +93,7 @@
       isccorigin             := originspid.StartsWith( '闀挎槬' ) or originspid.StartsWith( 'CC' );
       //璧峰鍦版槸澶ц繛
       isdlorigin             :=  originspid.StartsWith( '澶ц繛' ) or originspid.StartsWith( 'DL' );
-      if( isccorigin and isdlorigin ){
+      if( isccorigin or isdlorigin ){
         traverse( laneleg, Trip, trip, trip.LeadTime().Days() > 1 ){
           for( transferdate := trip.Departure() + Duration::Days( 1 ); transferdate < trip.Arrival(); transferdate := transferdate + Duration::Days( 1 ) ){
             daycolumn        := selectobject( table, InventorySummaryColumn, column, column.StartDate() = transferdate.Date(), column.TimeUnit() = Translations::MP_GlobalParameters_Day() );

--
Gitblit v1.9.3