Merge branch 'dev' into dev_yx

yypsybs

2023-10-10 2e55c32ab671ce5e4a5d1c713fac74ae0b2724e6

 _Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl

@@ -3,13 +3,13 @@
Method MappingActualPISPIPData (
  Strings businessTypes,
  GlobalOTDTable globalOTDTable,
  Boolean nuclear
  Boolean nuclear,
  Strings organcodelist
)
{
  TextBody:
  [*
    // renhao Aug-14-2023 (created)
    organcodelist := selectvalues( globalOTDTable, BusinessType.OrganCode, organ, businessTypes.Find( organ.BusinessType().BusinessTypeName() ) <> -1, organ.OrganCodeName() );
    listtodeal := selectset( globalOTDTable,
                             Global_MappingActualProductInStockingPointInPeriod,
                             actual,