BUG修复

lihongji

2024-11-02 6f15693d25602dda1f6765994c37c4c05ac23442

BUG修复

 _Main/BL/Type_Archive/StaticMethod_Test.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Test (
  MacroPlan macroPlan,
  InterfaceDataset interfaceDataset,
  Archive archive
)
{
  Description: '测试方法，测试专用'
  TextBody: 'info( 123 );'
}

 _Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl

@@ -73,7 +73,7 @@
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB()                                           =  dlerr.MLB_MQB()          and
                                 tempPISPIP.Start().Date()                                                                              >= dlerc.StartDate()        and 
                                 tempPISPIP.End().Date()                                                                                <= lastDayOfThisMonth,
                                 tempPISPIP.PlannedInventoryLevelEnd() );
                                 tempPISPIP.PlannedInventoryLevelEnd() ) / ( lastDayOfThisMonth - dlerc.StartDate() );
        cell.PackagingCapacity( guard( lce.PackagingCapacity(), 1 ) );
        cell.PlannedInventory( plannedInventory );
        cell.NumberOfEmptyShelves( [Number] guard( ( cell.TotalQuantityOfMaterialRacks() - guard( cell.PlannedInventory() / cell.PackagingCapacity(), 0 ) - guard( mrcc.Quantity(), 0 ) ) * guard( mrpc.Quantity(), 1 ), 0 ) );

 _Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl

@@ -39,12 +39,12 @@
                        tempLCT.Product()     = mlcrr.Category()                                                                                                                         and
                        tempLCT.Origin()      = ifexpr( mlcrr.Category() = "AGW", "DL AGW", ifexpr( mlcrr.Factory() = "大连工厂", "DL", "CC" ) + " " + mlcrr.Category() + "外租库" )     and
                        tempLCT.Destination() = ifexpr( mlcrr.Category() = "AGW", "CC AGW库房", ifexpr( mlcrr.Factory() = "大连工厂", "DL", "CC" ) + " " + mlcrr.Category() + "线边库" ) );

    
         // å½“前月末最后一天日期
        lastDayOfThisMonth := mlcrc.StartDate().StartOfNextMonth() - 1;

    
        cell := mlcrr.MachineLogisticsCostReportCell( relnew );

    
        // è®¾ç½®åŒ…装费用（包装量 * åŒ…装单价）
        packageQuantity := sum( macroPlan, PackagingPlanRow.PackagingPlanCell, tempPPC,
                                tempPPC.PackagingPlanRow().Category()             = mlcrr.Category()          and
@@ -53,7 +53,7 @@
                                tempPPC.PackagingPlanColumn().StartDate().Month() = mlcrc.StartDate().Month(),
                                tempPPC.Package() );
        cell.PackingCharges( packageQuantity * guard( lcm.PackagePrice(), 1 ) );

    
        // è®¾ç½®æ‹†åŒ…费用（拆包量 * æ‹†åŒ…单价）
        unpackingQuantity := sum( macroPlan, PackagingPlanRow.PackagingPlanCell, tempPPC,
                                  tempPPC.PackagingPlanRow().Category()             = mlcrr.Category()          and
@@ -62,13 +62,13 @@
                                  tempPPC.PackagingPlanColumn().StartDate().Month() = mlcrc.StartDate().Month(),
                                  tempPPC.Unpacking() );
        cell.UnpackingCost( unpackingQuantity * guard( lcm.UnpackingPrice(), 1 ) );

    
        // è®¾ç½®ç¼“冲纸费用（包装类 * ç¼“冲纸单价）
        cell.BufferPaperCost( packageQuantity * guard( lcm.BufferPaperPrice(), 1 ) );

    
          // è®¾ç½®æœ¨ç®±å•ä»·
        cell.WoodenCratePriceReal( guard( lcm.WoodenCratePrice(), 1 ) );

    
        // è®¾ç½®è°ƒæ‹¨è´¹ç”¨ï¼ˆè°ƒæ‹¨æ•°é‡ / åŒ…装容量 / è£…载容量 * è¿è¾“单价）
        transferQuantity := sum( macroPlan, TransferPlanRow.TransferPlanCell, tempTPC,
                                 tempTPC.TransferPlanRow().Category()                      = mlcrr.Category()                                               and
@@ -77,13 +77,13 @@
                                 guard(  tempTPC.TransferPlanColumn().ColumnDate().Month() = mlcrc.StartDate().Month(), false ),
                                 [Number]tempTPC.Value() );
        cell.TransferCost( [Number] ( [Number] ( transferQuantity / guard( lcm.PackagingCapacity(), 1 ) ) / guard( lct.LoadingCapacity(), 1 ) ) * guard( lct.TransportPrice(), 1 ) );

    
        // å¤–租库入库费用（入库量[包装量] / åŒ…装容量 * å…¥åº“单价）
        cell.StorageFeesForRentedWarehouses( packageQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.WarehousingPrice(), 1 ) );

    
        // å¤–租库出库费用（出库量[拆包量] / åŒ…装容量 * å‡ºåº“单价）
        cell.OutboundExpensesForRentedWarehouses( unpackingQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.OutboundPrice(), 1 ) );

    
        // å¤–租库运输费用（运输数量 / åŒ…装容量 / è£…载容量 * è¿è¾“单价）
        transportationQuantity := sum( macroPlan, Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT,
                                       tempPIT.Product_MP().ParentID()                                                  =  mlcrr.Category()                                                                       and
@@ -102,9 +102,8 @@
                                       tempPIT.Trip().LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID() =  ifexpr( mlcrr.Factory() = "大连工厂", "DL", "CC" ) + " " + mlcrr.Category() + "线边库",
                                       tempPIT.Quantity()
                                      );

        cell.ExternalRentalWarehouseTransportationCosts( transportationQuantity / guard( lcm.PackagingCapacity(), 1 ) / guard( lct.LoadingCapacity(), 1 ) * guard( lct.TransportPrice(), 1 ) );

    
        // å¤–租库仓储费用：仓储数量/包装容量*仓储单价
        plannedInventory := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriod, tempPISPIP,
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().IsLeaf()                                                                 and
@@ -115,15 +114,25 @@
                                 tempPISPIP.ProductInStockingPoint_MP().StockingPointID()                                               =  ifexpr( mlcrr.Factory() = "大连工厂", "DL", "CC" ) + " " + mlcrr.Category() + "外租库",
                                 tempPISPIP.PlannedInventoryLevelEnd() );
        cell.RentalWarehouseStorageFees( plannedInventory / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.StoragePrice(), 1 ) );

    
        
        
        // å¤§è¿žå·¥åŽ‚（外租库入库费用、外租库出库费用、外租库运输费用、外租库仓储费用）为0
        if ( mlcrr.Factory() = "大连工厂" ) {
          cell.StorageFeesForRentedWarehouses( 0 );
          cell.OutboundExpensesForRentedWarehouses( 0 );
          cell.ExternalRentalWarehouseTransportationCosts( 0 );
          cell.RentalWarehouseStorageFees( 0 );
        }
        
        // é¢„计总费用
        cell.EstimatedTotalCost( cell.PackingCharges() + cell.UnpackingCost() + cell.BufferPaperCost() + cell.WoodenCrateCost() + cell.TransferCost() +
                                 cell.StorageFeesForRentedWarehouses() + cell.OutboundExpensesForRentedWarehouses() + cell.ExternalRentalWarehouseTransportationCosts() +
                                 cell.RentalWarehouseStorageFees() );

    
        // ç³»æ•°
        cell.Coefficient( 1.05 );

    
        // æ€»è´¹ç”¨
        cell.TotalCost( cell.EstimatedTotalCost() * cell.Coefficient() );
        

 _Main/BL/Type_MacroPlan/Attribute_A_Attribute1.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute A_Attribute1
{
  #keys: '3[413988.1.66825227][413988.1.66825226][413988.1.66825228]'
  Description: '上线计划属性'
  ValueType: String
}

 _Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_PostLayingProcessing.qbl

@@ -11,13 +11,13 @@
    pls    := selectuniquevalues( macroPlan, NewAssemblyOnlinePlanRow, tempNAOPR, true, tempNAOPR.ProductionLine() );
    
    // æ˜¯å¦æ‰§è¡Œå¤„理标志
    isFlag := false;
    isFlag := true;
    
    traverse ( pls, Elements, pl
    //           , pl = "CC MoMo" 
    //           , pl = "DL ZKM" 
              ) {              
      traverse ( macroPlan, NewAssemblyOnlinePlanColumn, naopc
    //             , naopc.StartDate() <= Date::Construct( 2025, 2, 15 ) 
    //             , naopc.StartDate() <= Date::Construct( 2025, 1, 11 )
                ) {
        // éœ€è¦å¤„理的数量
        targetQuantity := ifexpr( pl = "CC MoMo", guard( macroPlan.AssemblyOnlineQuantity().CCMoMo(), 0 ),

 _Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl

@@ -119,6 +119,7 @@
    }
    
    // å¤„理铺线后续处理
    info( "处理铺线后续处理-----------------------------" );
    NewAssemblyOnlinePlanCell::PostLayingProcessing( macroPlan );
  *]
}

 _Main/BL/Type_NewOfflinePlanCell/StaticMethod_UpdateOrder.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
Quintiq file version 2.0
#parent: #root
StaticMethod UpdateOrder (
  NewOfflinePlanCell nopc,
  String value,
  String attrName
)
{
  TextBody:
  [*
    if ( value.Length() <> 3 ) {
      error( "字符长度不等于3" );
    }
    
    if ( value.SubString( 0, 1 ) <> "#" ) {
      error( "字符没有以“# â€å¼€å¤´" );
    }
    
    if ( guard( [Number]value.SubString( 1, 2 ) <= 0, true ) ) {
      error( "不符合格式" );
    };
    
    nopc.Order( value );
    nopc.OrderNr( [Number]value.SubString( 1, 2 ) );
  *]
}

 _Main/BL/Type_NewOfflinePlanCell/StaticMethod_UpdateQuantity.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
Quintiq file version 2.0
#parent: #root
StaticMethod UpdateQuantity (
  NewOfflinePlanCell nopc,
  Real value,
  String attrName
)
{
  TextBody: 'nopc.Quantity( value );'
}

 _Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def

@@ -87,6 +87,7 @@
        Component MenuWholeShift { #keys: '[413988.0.1263894682]' BaseType: 'Menu' Properties: [ Image: 'FISH_BOWL' Text: '测试整班' ] }
        Component menuSeparator604 { #keys: '[413988.0.1559834087]' BaseType: 'Menu' Properties: [ Separator: true ] }
        Component ComponentMenu710 { #keys: '[413988.0.1559834106]' BaseType: 'ComponentMenu' Properties: [ ComponentType: 'frmStandardAnalysis627' Text: '' ] }
        Component MenuTest2 { #keys: '[413988.1.66484180]' BaseType: 'Menu' Properties: [ Image: 'OSZILLOGRAPH' Text: '测试专用【Archive::Test】' ] }
      ]
      Properties:
      [
@@ -112,6 +113,7 @@
          c: menuSeparator891
          c: MenuWholeShift
          c: menuSeparator604
          c: MenuTest2
        }
      ]
    }

 _Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Response_MacroPlanner_mbMainMenu_MenuTest2_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: mbMainMenu/MenuTest2
Response OnClick () id:Response_MacroPlanner_mbMainMenu_MenuTest2_OnClick
{
  #keys: '[413988.1.66484197]'
  Body:
  [*
    Archive::Test( MacroPlan, InterfaceDataset, Archive );
  *]
  CanBindMultiple: false
  DefinitionID: 'Responsedef_Menu_OnClick'
  Precondition:
  [*
    return not isnull( MacroPlan ) and not isnull( InterfaceDataset ) and not isnull( Archive );
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/_ROOT_Component_DialogAttributeConfiguration.def

@@ -16,6 +16,7 @@
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    MinimumColumns: 100
    Padding: 'false'
    Title: 'Attribute configuration'
  ]

 _Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration1/Component_pnlActions.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
Quintiq file version 2.0
Component pnlActions
{
  #keys: '[413988.1.68081947]'
  BaseType: 'WebPanel'
  Children:
  [
    Component btnOk
    {
      #keys: '[413988.1.68081951]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'OK'
        Taborder: 0
      ]
    }
    Component btnCancel
    {
      #keys: '[413988.1.68081953]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'Cancel'
        Taborder: 1
      ]
    }
  ]
  Properties:
  [
    Alignment: 'trailing'
    Border: true
    ExcludeFromActiveComponent: true
    FixedSize: true
    Orientation: 'horizontal'
    Padding: 'true'
    Style: 'footer'
    Taborder: 1
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration1/Component_pnlContent.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
Quintiq file version 2.0
Component pnlContent
{
  #keys: '[413988.1.68081945]'
  BaseType: 'WebPanel'
  Children:
  [
    Component efAttribute id:efAttribute_969
    {
      #keys: '[413988.1.68082211]'
      BaseType: 'WebEditField'
      Properties:
      [
        DataBinding: 'MacroPlan.A_Attribute1'
        Label: 'Attribute'
        Taborder: 0
      ]
    }
  ]
  Properties:
  [
    Padding: 'true'
    Taborder: 0
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration1/Response_pnlActions_btnCancel_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
Quintiq file version 2.0
#parent: pnlActions/btnCancel
Response OnClick () id:Response_pnlActions_btnCancel_OnClick
{
  #keys: '[413988.1.68081957]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      Form.Close();
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration1/Response_pnlActions_btnOk_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: pnlActions/btnOk
Response OnClick () id:Response_pnlActions_btnOk_OnClick
{
  #keys: '[413988.1.68081956]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      Form.ApplyChanges();
      Form.Close();
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration1/_ROOT_Component_DialogAttributeConfiguration1.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
OrphanComponent DialogAttributeConfiguration1
{
  #keys: '[413988.1.68081943]'
  BaseType: 'WebForm'
  Children:
  [
    #child: pnlContent
    #child: pnlActions
  ]
  Properties:
  [
    Alignment: 'trailing'
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    MinimumColumns: 100
    Padding: 'false'
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormDL_EngineRackReport/Component_MatrixEditor392.def

@@ -26,7 +26,7 @@
      ]
      Properties:
      [
        Attributes: 'TotalQuantityOfMaterialRacks;NumberOfEmptyShelves;CCStorageFeesForRentedWarehouses;CCOutboundExpensesForRentedWarehouses;CCRentalWarehouseStorageFees;CCShortDistanceTransportationCosts;CCCleaningCost;DLStorageFeesForRentedWarehouses;DLOutboundExpensesForRentedWarehouses;DLExternalRentalWarehouseTransportationCosts;DLRentalWarehouseStorageFees;CleaningCost;DLRentalWarehouseMaterialRackCost;CCExternalRentalWarehouseDLMaterialRackCost;CCLineHaulCost;EstimatedTotalCost;Coefficient;TotalCost'
        Attributes: 'TotalQuantityOfMaterialRacks;NumberOfEmptyShelves;CCStorageFeesForRentedWarehouses;CCOutboundExpensesForRentedWarehouses;CCShortDistanceTransportationCosts;CCCleaningCost;DLStorageFeesForRentedWarehouses;DLOutboundExpensesForRentedWarehouses;DLExternalRentalWarehouseTransportationCosts;DLRentalWarehouseStorageFees;CleaningCost;DLRentalWarehouseMaterialRackCost;CCExternalRentalWarehouseDLMaterialRackCost;CCLineHaulCost;EstimatedTotalCost;Coefficient;TotalCost'
        Column: 'DL_EngineRackColumn'
        Row: 'DL_EngineRackRow'
        Taborder: 0

 _Main/UI/MacroPlannerWebApp/Component_FormNewAssemblyOnlinePlan/Component_matrixeditorContextMenu229#1.def

@@ -37,6 +37,28 @@
        Title: '要生成的产线（测试专用）'
      ]
    }
    Component mAttributeConfiguration id:mAttributeConfiguration_549
    {
      #keys: '[413988.1.66911936]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'ATTRIBUTE'
        Taborder: 5
        Title: '属性配置'
      ]
    }
    Component mAttributeConfirm id:mAttributeConfirm_715
    {
      #keys: '[413988.1.66912077]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'EDITOR_ACCESSIBILITY_WORLD'
        Taborder: 6
        Title: '属性确认'
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_FormNewAssemblyOnlinePlan/Response_matrixeditorContextMenu229_1_mAttributeConfiguration_OnClick#593.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
Quintiq file version 2.0
#parent: matrixeditorContextMenu229_1/mAttributeConfiguration_549
Response OnClick () id:Response_matrixeditorContextMenu229_mAttributeConfiguration_OnClick_593
{
  #keys: '[413988.1.66911935]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  Precondition:
  [*
    return not isnull( MacroPlan );
  *]
  QuillAction
  {
    Body:
    [*
      if ( MacroPlan.A_Attribute1() = "" ) {
        MacroPlan.A_Attribute1( "Quantity;Order" );
      }
      
      dlg := construct( DialogAttributeConfiguration1 );
      
      ApplicationMacroPlanner.ShowFormModal( dlg );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormNewAssemblyOnlinePlan/Response_matrixeditorContextMenu229_1_mAttributeConfirm_OnClick#844.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
Quintiq file version 2.0
#parent: matrixeditorContextMenu229_1/mAttributeConfirm_715
Response OnClick () id:Response_matrixeditorContextMenu229_mAttributeConfirm_OnClick_844
{
  #keys: '[413988.1.66912076]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMenu_OnClick'
  Precondition:
  [*
    return not isnull( MacroPlan );
  *]
  QuillAction
  {
    Body:
    [*
      if ( MacroPlan.A_Attribute1() = "" ) {
        MacroPlan.A_Attribute1( "Quantity;Order" );
      }
      
      MatrixEditor515.Attributes( MacroPlan.A_Attribute1() );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_MatrixEditor515_OnUpdateValue#14.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
Quintiq file version 2.0
#parent: MatrixEditor515
Response OnUpdateValue (
  NewOfflinePlanCell cell,
  Real value
) id:Response_MatrixEditor515_OnUpdateValue_14
{
  #keys: '[413988.1.64671632]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMatrixEditor_OnUpdateValue'
  QuillAction
  {
    Body:
    [*
      NewOfflinePlanCell::UpdateQuantity( cell, value, focusedattribute );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_MatrixEditor515_OnUpdateValue.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
Quintiq file version 2.0
#parent: MatrixEditor515
Response OnUpdateValue (
  NewOfflinePlanCell cell,
  String value
) id:Response_MatrixEditor515_OnUpdateValue
{
  #keys: '[413988.1.64691773]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebMatrixEditor_OnUpdateValue'
  QuillAction
  {
    Body:
    [*
      NewOfflinePlanCell::UpdateOrder( cell, value, focusedattribute );
    *]
    GroupServerCalls: false
  }
}