From 0e58d57f740adedf9590a32335baeec83cfe7969 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 06 九月 2024 17:45:15 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl b/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl
index 9434ec7..6c22eaa 100644
--- a/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl
+++ b/_Main/BL/Type_OfflinePlanTable/Method_Comparison.qbl
@@ -1,7 +1,8 @@
Quintiq file version 2.0
#parent: #root
Method Comparison (
- RecycleBin recycleBin
+ RecycleBin recycleBin,
+ const Archive archive
) as LocalTable
{
TextBody:
@@ -10,11 +11,11 @@
macroPlan := this.MacroPlan();
table := recycleBin.LocalTable( relnew,Name := "浜ч噺瀵规瘮鎶ヨ〃");
- actualDailyProductionDatas := selectset( macroPlan,ActualDailyProductionData,data,true );
+ actualDailyProductionDatas := selectset( archive,ActualDailyProductionData,data,true );
actualDailyProductionDataIndexTree := NamedValueTree::Create();
for( i := 0; i< actualDailyProductionDatas.Size(); i++ ){
actualDailyProductionData := actualDailyProductionDatas.Element( i );
- actualDailyProductionDataKey := actualDailyProductionData.Product() + actualDailyProductionData.Date().AsQUILL();
+ actualDailyProductionDataKey := actualDailyProductionData.ProductNo() + actualDailyProductionData.ProductionDate().AsQUILL();
actualDailyProductionDataHandle := actualDailyProductionDataIndexTree.GetHandle( actualDailyProductionDataKey );
actualDailyProductionDataIndexTree.Root().AddChild( actualDailyProductionDataHandle,i );
}
@@ -43,7 +44,7 @@
actualDailyProductionVolume := 0.0;
if( not isnull( actualDailyProductionDataIndex )){
actualDailyProductionData := actualDailyProductionDatas.Element( actualDailyProductionDataIndex.GetValueAsNumber() );
- actualDailyProductionVolume := actualDailyProductionData.ProductionVolume();
+ actualDailyProductionVolume := actualDailyProductionData.ActualOut();
}
localColumn := localColumns.Element( localColumnIndex.GetValueAsNumber() );
localRow.LocalCell( relnew,LocalCell_ProductionComparison ,LocalColumn := localColumn,
--
Gitblit v1.9.3