From 3aa184a1b613952068af02e55960413b759e1701 Mon Sep 17 00:00:00 2001
From: rislai <risheng.lai@capgemini.com>
Date: 星期四, 25 七月 2024 10:32:21 +0800
Subject: [PATCH] 添加产量对比报表

---
 _Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl b/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl
index cb7d860..9434ec7 100644
--- a/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl
+++ b/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl
@@ -8,7 +8,16 @@
   [*
     // rislai Jul-17-2024 (created)
     macroPlan := this.MacroPlan();
-    table := recycleBin.LocalTable( relnew,Name := "");
+    table := recycleBin.LocalTable( relnew,Name := "浜ч噺瀵规瘮鎶ヨ〃");
+    
+    actualDailyProductionDatas := selectset( macroPlan,ActualDailyProductionData,data,true );
+    actualDailyProductionDataIndexTree := NamedValueTree::Create();
+    for( i := 0; i< actualDailyProductionDatas.Size(); i++ ){
+      actualDailyProductionData := actualDailyProductionDatas.Element( i );
+      actualDailyProductionDataKey := actualDailyProductionData.Product() + actualDailyProductionData.Date().AsQUILL();
+      actualDailyProductionDataHandle := actualDailyProductionDataIndexTree.GetHandle( actualDailyProductionDataKey );
+      actualDailyProductionDataIndexTree.Root().AddChild( actualDailyProductionDataHandle,i ); 
+    }
     
     localColumns := construct( LocalColumns );
     localColumnIndexTree := NamedValueTree::Create();
@@ -18,20 +27,36 @@
       localColumns.Add( localColumn );
       localColumnIndexTree.Root().AddChild( localColumnHandle,localColumns.Size() - 1 );
     }
+    
     traverse( this,OfflinePlanRow,row,row.Type() = "1" ){
       productID := row.ProductID();
-      
+      productLine := row.ProductionLine();
       localRow := table.LocalRow( relnew,Index := table.GetRowIndexCache(),CustomName := productID );
       traverse( row,OfflinePlanCell,cell,cell.OfflinePlanColumn().ColumnDate() >= macroPlan.StartOfPlanning().Date() ){
         localColumnHandle := localColumnIndexTree.GetHandle( cell.OfflinePlanColumn().ColumnDate().AsQUILL() );
         localColumnIndex := guard( localColumnIndexTree.Root().Child( localColumnHandle ),null( NamedValue ));
         if( not isnull( localColumnIndex )){
+          actualDailyProductionDataKey := productID + cell.OfflinePlanColumn().ColumnDate().AsQUILL();
+          actualDailyProductionDataHandle := actualDailyProductionDataIndexTree.GetHandle( actualDailyProductionDataKey );
+          actualDailyProductionDataIndex := guard( actualDailyProductionDataIndexTree.Root().Child( actualDailyProductionDataHandle ),null( NamedValue ));
+          
+          actualDailyProductionVolume := 0.0;
+          if( not isnull( actualDailyProductionDataIndex )){
+            actualDailyProductionData := actualDailyProductionDatas.Element( actualDailyProductionDataIndex.GetValueAsNumber() );
+            actualDailyProductionVolume := actualDailyProductionData.ProductionVolume();
+          }
           localColumn := localColumns.Element( localColumnIndex.GetValueAsNumber() );
-          localCell := localRow.LocalCell( relnew,LocalCell_DemandComparison ,LocalColumn := localColumn,
-                                           BaseVersion := cell.Quantity(),CompareVersion := 0.0);
+          localRow.LocalCell( relnew,LocalCell_ProductionComparison ,LocalColumn := localColumn,
+                                           Plan := cell.Quantity(),Actual := actualDailyProductionVolume );
         }
       }
     }
+    traverse( table,LocalColumn,column ){
+      if( column.LocalCell( relsize ) = 0 ){
+        column.Delete(); 
+      } 
+    }
+    
     return table;
   *]
 }

--
Gitblit v1.9.3