Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _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,
                                        ID                 := OS::GenerateGUIDAsString(),
                                        ProductID          := guard( ddlProduct_MP.Data().ID(), "null" ),
                                        BusinessType       := guard( ddlBusinessType.Data().BusinessTypeName(), "null" ),
                                        SalesSegmentName   := guard( ddlSalesSegment.Data().Name(), "null" ),
@@ -34,7 +35,8 @@
                                        ForecastDemandDate := dsForecastDemandDate.Date(),
                                        DemandDate         := dsDemandDate.Date(),
                                        OrderType          := ddslOrderType.Text(),
                                        SalesAmount        := [Number]edtSalesAmount.Text()
                                        SalesAmount        := [Number]edtSalesAmount.Text(),
                                        CurrencyID         := ddlCurrency_MP.Data().ID()
                                       );
      } else {
        data.ProductID( guard( ddlProduct_MP.Data().ID(), "null" ) );
@@ -48,6 +50,7 @@
        data.DemandDate( dsDemandDate.Date() );
        data.OrderType( ddslOrderType.Text() );
        data.SalesAmount( [Number]edtSalesAmount.Text() );
        data.CurrencyID( ddlCurrency_MP.Data().ID() );
      }
      
      Form.Close();