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

lihongji

2024-10-18 e0d857ecca73a10271600a9b4141d7f452e7f3f9

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

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_bExport_OnClick#891.def

@@ -11,7 +11,7 @@
    Body:
    [*
      rows := selectset( dhTable.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,product,product.ID() = row.ProductID()));
      columns := selectset( dhTable.Data( ),LocalColumn,column,true );
      columns := selectset( dhTable.Data( ),LocalColumn,column,not column.IsAttrbuteColumn() and dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() );
      LocalCell_ProductionComparison::AsyncExport( RecycleBin, rows, columns, MacroPlan );
    *]
  }