Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-14 a746b44994e729613737baa922796383027fc54c

 _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()