Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev

Tianma21

2023-10-09 aa3b3abf43b390284c316a89ba91539b081bf544

Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev

 _Main/BL/Type_FillingCapacityOrder/StaticMethod_CreateCustomOrder.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateCustomOrder (
  MacroPlan macroPlan,
  FillingCapacityOrder fillingCapacityOrder,
  Real quantity
) as CustomerOrder
{
  TextBody:
  [*
    targetProduct_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = fillingCapacityOrder.ProductID() );
    targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = fillingCapacityOrder.StockingPointID() );
    
    targetCustomerOrder := CustomerOrder::Create( targetProduct_MP,
                                                  targetStockingPoint_MP,
                                                  OS::GenerateGUIDAsString(),
                                                  fillingCapacityOrder.OrderDate(),
                                                  quantity,
                                                  0.0,
                                                  "Normal",
                                                  fillingCapacityOrder.SalesSegmentName(),
                                                  fillingCapacityOrder.CurrencyID(),
                                                  fillingCapacityOrder.UnitOfMeasureName(),
                                                  false,
                                                  fillingCapacityOrder.Customer(),
                                                  fillingCapacityOrder.CustomerID(),
                                                  "",
                                                  "",
                                                  true,
                                                  true,
                                                  false
                                                 );
    
    return targetCustomerOrder;
  *]
}

 _Main/BL/Type_FillingCapacityOrder/StaticMethod_OrderOffset.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
Quintiq file version 2.0
#parent: #root
StaticMethod OrderOffset (
  MacroPlan macroPlan
)
{
  TextBody:
  [*
    needOffsetFillingCapacityOrders := selectset( macroPlan, FillingCapacityOrder, tempFCO, tempFCO.State() = "未冲减" or tempFCO.State() ="" );
    
    traverse ( needOffsetFillingCapacityOrders, Elements, fco, fco.Quantity() > 0 ) {
      originalCounterSignedOrder := select( macroPlan, SalesDemand.astype( CustomerOrder ), tempCO, tempCO.CustomerName() = fco.Customer()  and 
                                                                                                    tempCO.ProductID()    = fco.ProductID() and 
                                                                                                    tempCO.OrderTag()     = "反签"
                                           );
      if ( fco.OrderType() = "反签" ) {
        if ( isnull( originalCounterSignedOrder ) ) {
          customerOrder := FillingCapacityOrder::CreateCustomOrder( macroPlan, fco, fco.Quantity() );
          customerOrder.OrderTag( "反签" );
        } else {
          originalCounterSignedOrder.Quantity( originalCounterSignedOrder.Quantity() + fco.Quantity() );
        }
      } else if ( fco.OrderType() = "授权" ) {
        originalAuthorizedOrder := select( macroPlan, SalesDemand.astype( CustomerOrder ), tempCO, tempCO.CustomerName() = fco.Customer()  and 
                                                                                                   tempCO.ProductID()    = fco.ProductID() and 
                                                                                                   tempCO.OrderTag()     = "授权"
                                          );
        if ( isnull( originalCounterSignedOrder ) ) {
          if ( isnull( originalAuthorizedOrder ) ) {
            customOrder := FillingCapacityOrder::CreateCustomOrder( macroPlan, fco, fco.Quantity() );
            customOrder.OrderTag( "授权" );
          } else {
            originalAuthorizedOrder.Quantity( originalAuthorizedOrder.Quantity() + fco.Quantity() );
          }
        } else {
          numberOfReverseSignatures := originalCounterSignedOrder.Quantity();
          newNumberOfAuthorizations := ifexpr( ( fco.Quantity() - numberOfReverseSignatures ) >= 0, fco.Quantity() - numberOfReverseSignatures, 0 );
          numberOfReverseSignatures := ifexpr( ( fco.Quantity() - numberOfReverseSignatures ) >= 0, 0, numberOfReverseSignatures - fco.Quantity() );
          
          if ( numberOfReverseSignatures >= 0 ) {
            originalCounterSignedOrder.Quantity( numberOfReverseSignatures );
          } else {
            originalCounterSignedOrder.Delete();
          }
          
          if ( newNumberOfAuthorizations > 0 ) {
            if ( isnull( originalAuthorizedOrder ) ) {
              customerOrder := FillingCapacityOrder::CreateCustomOrder( macroPlan, fco, newNumberOfAuthorizations );
              customerOrder.OrderTag( "授权" );
            } else {
              originalAuthorizedOrder.Quantity( originalAuthorizedOrder.Quantity() + newNumberOfAuthorizations );
            }
          }
        }
      }
    }
  *]
}

 _Main/BL/Type_Global_MappingCustomOrder/StaticMethod_SynchronizeMacroPlanData.qbl

@@ -14,8 +14,9 @@
                                                                       ExecuteUser := executionUser
                                                                      );
                                            
      Global_MappingCustomOrder::CreateCustomOrder( globalOTDTable, macroPlan );
      
    try {
      Global_MappingCustomOrder::CreateCustomOrder( globalOTDTable, macroPlan );
      
      global_BrokerExecuteLog.ExecutionStatus( "Complete" );
      global_BrokerExecuteLog.SuccessDateTime( DateTime::ActualTime().Format( "Y-M-D H2:m:s" ) );

 _Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl

@@ -51,7 +51,7 @@
        }
      operation := Operation::FindOperationTypeIndex( id );
      if(not isnull(operation)){
            account := Account_MP::FindByName( this, "Operation cost" );
            account := Account_MP::FindByName( this, "Operating cost" );
            isfromdb := false;
            existoperationcost := OperationCost::FindOperationCostTypeIndex( id );
            if( isnull( existoperationcost ) ){
@@ -67,10 +67,9 @@
                  timeunit := connecteditem.TimeUnit();
                  OperationCost::Create( id, operation, account, "Volume", start, timeunit, lengthoftime, cost, isfromdb );
                }

    
              }
      }

      }
    }
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_PanelFillingCapacityOrder_ButtonDeduct_OnClick.def

@@ -13,7 +13,11 @@
  {
    Body:
    [*
      H_FunctionClass::SM_OrderHedgingEx( MacroPlan, ApplicationMacroPlanner.GetUserName() );
      //H_FunctionClass::SM_OrderHedgingEx( MacroPlan, ApplicationMacroPlanner.GetUserName() );
      
      FillingCapacityOrder::OrderOffset( MacroPlan );
      
      WebMessageBox::Success( "冲减成功！！！", true );
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Component_FormPriorityFactor/Response_ListPriorityFactor_OnClick#144.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FormPriorityFactor/Response_ListPriorityFactor_OnClick#582.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FormPriorityFactor/Response_ListPriorityFactor_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FormPriorityFactorGrading/Response_ListPriorityFactorGrading_OnClick.def

ÎļþÒÑɾ³ý