From d03861b11b193439353fa5d9b92eb6ee1e6458e2 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期六, 12 十月 2024 17:33:03 +0800
Subject: [PATCH] 库存汇总报表查询条件格式修改,发动机物流成本报表系数,汇总添加

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

diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
index dd97f73..015ec8b 100644
--- a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
@@ -10,7 +10,7 @@
   [*
     // 鐢勫叞楦� Jun-24-2024 (created)
     owner.InventorySummarySource( relflush );
-    products                  := construct( Product_MPs );
+    productids                := construct( Strings );
     allunit                   := InventorySummaryReport::GetDefaultAllUnit();
     ccunit                    := InventorySummaryReport::GetDefaultCCUnit();
     dlunit                    := InventorySummaryReport::GetDefaultDLUnit();
@@ -35,6 +35,7 @@
       isdl                    := exists( parentunits, Elements, punit, punit.ID().StartsWith( 'VWED DL' ) );
       if( iscc or isdl ){
         traverse( stockingpoint, ProductInStockingPoint_MP, pisp,  pisp.Product_MP().IsLeaf() ){
+          productids.Add( pisp.ProductID() );
           //鑾峰彇宸ュ巶琛�
           factoryrow          := table.GetRow( ifexpr( iscc, ccunit, dlunit ), pisp.ProductID() );
           //鑾峰彇鍚堣琛�
@@ -44,7 +45,6 @@
                                                   and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day(), pispip.Start() );
     
           traverse( pispips, Elements, pispip ){
-            products.Add( pisp.Product_MP() );
             period            := pispip.Period_MP();
             periodtime        := period.Start().Date();
     //        periodname        := periodtime.Format( "M2/D2/Y" );
@@ -75,10 +75,11 @@
     }
     //鍐嶅湪搴撳瓨鏇存柊鐨勫瓙鐣岄潰搴撳瓨鐐归�夋嫨涓壘鍒拌繖浜涘簱瀛樼偣鎵�鍏宠仈鐨勫凡鍕鹃�夊簱浣�
     selections                := selectset( interface, InventoryPointSelection, selection, allsps.Find( selection.StockpoingPoint() ) >= 0 and selection.IsIncluded() );
-    productids                := selectuniquevalues( selections, Elements, selection, selection.ProductID() );
+    productidset              := selectuniquevalues( selections, Elements, selection, selection.ProductID() );
     //鏈�鍚庡皢杩欎簺搴撲綅涓浂浠跺彿鐨勬暟閲忚繘琛屽姞鎬�
     traverse( table, InventorySummaryColumn, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() < startofplanning.Date() ){
-      traverse( productids, Elements, productid ){
+      traverse( productidset, Elements, productid ){
+        productids.Add( productid );
         column.GenerateCell( selections, ccsps, dlsps, table, column.StartDate(), column.EndaDate(), productid, allunit, ccunit, dlunit );
       }
     }
@@ -94,6 +95,8 @@
         e.Delete();
       }
     }
-    showtable.Generate( search, products );
+    
+    factorys                  := selectset( owner, Factory, factory, factory.ID() = FinancialProductionReport::GetDefaultAllUnit() );
+    showtable.Generate( search, factorys, productids );
   *]
 }

--
Gitblit v1.9.3