Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-16 d10671cc1821707c11e466c7a982a6dbfa6442a0

 _Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def

@@ -24,6 +24,7 @@
      data := guard( DataHolderFillingCapacityOrder.Data().WrappedInstance(), null( FillingCapacityOrder ) );;
      if ( isnull( data ) ) {
        MacroPlan.FillingCapacityOrder( relnew,
                                        VerNo              := guard( DataHolderActiveScenario.Data().Name(), "" ),
                                        ID                 := OS::GenerateGUIDAsString(),
                                        ProductID          := guard( ddlProduct_MP.Data().ID(), "null" ),
                                        BusinessType       := guard( ddlBusinessType.Data().BusinessTypeName(), "null" ),