From a746b44994e729613737baa922796383027fc54c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 14 十一月 2024 16:59:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
index a9c3acf..80e6b42 100644
--- a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_GenerateData.qbl
@@ -3,6 +3,8 @@
StaticMethod GenerateData (
InterfaceDataset interfaceDataset,
const MacroPlan macroplan,
+ Boolean iscc,
+ Boolean isdl,
String executor
)
{
@@ -26,7 +28,8 @@
, Message := '瀹㈡埛闇�姹傦紙PPA+IDS锛夋暟鎹帹閫�'
, Last := true
);
- traverse( interfaceDataset, CustomerDemandIDS.Row, row ){
+ traverse( interfaceDataset, CustomerDemandIDS.Row, row, ( iscc and row.Factory() = FinancialProductionReport::GetDefaultCCUnit() )
+ or ( isdl and row.Factory() = FinancialProductionReport::GetDefaultDLUnit() ) ){
traverse( row, Cell, cell ){
cd :=interfaceDataset.CustomerDemandPPAIDS( relnew, Product := row.Name()
, DemandDate := cell.Column().StartDate()
--
Gitblit v1.9.3