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

xiaoding721

2024-10-09 f02b0d3f28293029ab1da8220e7a984de8dea645

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

 _Main/BL/Relations/Relation_PackagingPlanCapability_MacroPlan_MacroPlan_PackagingPlanCapability.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Relations/Relation_PackagingPlanNewCapability_MacroPlan_MacroPlan_PackagingPlanNewCapa.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation PackagingPlanNewCapability_MacroPlan_MacroPlan_PackagingPlanNewCapability
{
  #keys: '1[413988.0.1594771453]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide MacroPlan
  {
    #keys: '3[413988.0.1594771455][413988.0.1594771454][413988.0.1594771456]'
    Cardinality: '0to1'
    ObjectDefinition: PackagingPlanNewCapability
    OwningSide: 'Reference'
  }
  RelationSide.RightSide PackagingPlanNewCapability
  {
    #keys: '3[413988.0.1594771458][413988.0.1594771457][413988.0.1594771459]'
    Cardinality: '1toN'
    ObjectDefinition: MacroPlan
    OwningSide: 'Owned'
  }
}

 _Main/BL/Type_CC_EngineRackCell/Function_CalcEstimatedTotalCost.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
Quintiq file version 2.0
#parent: #root
Function CalcEstimatedTotalCost
{
  TextBody:
  [*
    // lihongji Oct-9-2024 (created)
    
    value := this.StorageFeesForRentedWarehouses()             + 
             this.OutboundExpensesForRentedWarehouses()        + 
             this.ExternalRentalWarehouseTransportationCosts() + 
             this.RentalWarehouseStorageFees()                 +
             this.CleaningCost()
    
    this.EstimatedTotalCost( value );
  *]
}

 _Main/BL/Type_CC_EngineRackCell/Function_CalcTotalCost.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
Quintiq file version 2.0
#parent: #root
Function CalcTotalCost
{
  TextBody:
  [*
    // lihongji Oct-9-2024 (created)
    
    value := this.EstimatedTotalCost() * this.Coefficient();
    
    this.TotalCost( value );
  *]
}

 _Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl

@@ -12,8 +12,8 @@
    // åˆ›å»ºè¡Œ
    genrations := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.Generation().TrimBoth() <> "", tempPMP.Generation() );
    mqbmlbs    := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.MQBMLB().TrimBoth() <> "", tempPMP.MQBMLB() );
    traverse ( genrations, Elements, g, g.ToUpper() = "EVO5" or g.ToUpper() = "GEN3" ) {
      traverse ( mqbmlbs, Elements, m, m.ToUpper() = "MLB" or m.ToUpper() = "MQB" ) {
    traverse ( genrations, Elements, g ) {
      traverse ( mqbmlbs, Elements, m ) {
        macroPlan.CC_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
      }
    }
@@ -26,58 +26,74 @@
    }
    
    // åˆ›å»ºå•å…ƒæ ¼
    traverse ( macroPlan, CC_EngineRackRow, ccerr ) {
      
    traverse ( macroPlan, CC_EngineRackRow, ccerr ) { // å¾ªçŽ¯è¡Œ
      info( "当前遍历的行：", ccerr.Generation(), " ", ccerr.MLB_MQB() );
      traverse ( macroPlan, CC_EngineRackColumn, ccerc ) { // å¾ªçŽ¯åˆ—
      // å‘动机成本参数
      lce  := select( macroPlan, LogisticsCostEngine, tempLCE, tempLCE.Generation() = ccerr.Generation() and tempLCE.MLB_MQB() = ccerr.MLB_MQB() and tempLCE.Factory() = "长春工厂" );
        lce  := select( macroPlan, LogisticsCostEngine, tempLCE, tempLCE.Generation() = ccerr.Generation() and tempLCE.MLB_MQB() = ccerr.MLB_MQB() and tempLCE.Factory() = "长春工厂" 
                        and tempLCE.StartDate() <= ccerc.StartDate() and tempLCE.EndDate() >= ccerc.StartDate().StartOfNextMonth() );
      
      // æ–™æž¶æˆæœ¬å‚æ•°
      lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "长春工厂" );
        lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "长春工厂" 
                        and tempLCMR.StartDate() <= ccerc.StartDate() and tempLCMR.EndDate() >= ccerc.StartDate().StartOfNextMonth() );
      
      traverse ( macroPlan, CC_EngineRackColumn, ccerc ) {
        // è¿è¾“成本参数
        lct  := select( macroPlan, LogisticsCostTransport, tempLCT, tempLCT.Product() = "发动机" and tempLCT.Origin() = "CC åŽ‚内库" and tempLCT.Destination() = "长春外租库" );
        
        // å½“前月末最后一天日期                
        lastDayOfThisMonth := ccerc.StartDate().StartOfNextMonth() - 1; 
        
        cell := ccerr.CC_EngineRackCell( relnew );
        
        // ç©ºæ–™æž¶æ•°é‡ï¼ˆé•¿æ˜¥åŽ‚该产品的料架总数量 - å‘动机库存 / åŒ…装容量 ï¼‰
        lastDayOfThisMonth := ccerc.StartDate().StartOfNextMonth() - 1;
        plannedInventory := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriod, tempPISPIP,
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().IsLeaf()                          and
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().ParentID()   = "产成品"           and
                                 exists( tempPISPIP.ProductInStockingPoint_MP().Product_MP(), AllParent.AsParent, tempPMP, tempPMP.ID() = "发动机" )         and
                                 tempPISPIP.ProductInStockingPoint_MP().StockingPointID()         = "长春外租库"       and
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().Generation() = ccerr.Generation() and
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB()     = ccerr.MLB_MQB()    and
                                 tempPISPIP.Start().Date()                                                  = lastDayOfThisMonth,
                                 tempPISPIP.PlannedInventoryLevelEnd() );
        cell.PackagingCapacity( guard( lce.PackagingCapacity(), 0 ) );
        cell.PackagingCapacity( guard( lce.PackagingCapacity(), 1 ) );
        cell.PlannedInventory( plannedInventory );
        
        // å¤–租库入库费用（发动机销量 / åŒ…装容量[向上取整] * æ–™æž¶å…¥åº“单价）
        engineSales := sum( macroPlan, FSImportData, tempFSID, 
                            tempFSID.Unit()              = "长春工厂"               and
                            tempFSID.Unit()              = FinancialProductionReport::GetDefaultCCUnit() and
                            tempFSID.Generation()        = ccerr.Generation()       and
                            tempFSID.MqbMlb()            = ccerr.MLB_MQB()          and
                            tempFSID.StartDate().Year()  = ccerc.StartDate().Year() and
                            tempFSID.StartDate().Month() = ccerc.StartDate().Month(),
                            tempFSID.Quantity() );
        cell.StorageFeesForRentedWarehouses( guard( [Number] ( engineSales / guard( lce.PackagingCapacity(), 0 ) ) * guard( lcmr.WarehousingPrice(), 0 ), 0 ) );
        cell.StorageFeesForRentedWarehouses( [Number] ( engineSales / guard( lce.PackagingCapacity(), 1 ) * guard( lcmr.WarehousingPrice(), 1 ) ) );
             
        // å¤–租库出库费用（发动机产量 / åŒ…装容量[向上取整] * æ–™æž¶å‡ºåº“单价）
        engineProductions := sum( macroPlan, FPImportData, tempFPID, 
                                  tempFPID.Unit()              = "长春工厂"               and
                                  tempFPID.Unit()              = FinancialProductionReport::GetDefaultCCUnit() and
                                  tempFPID.Generation()        = ccerr.Generation()       and
                                  tempFPID.MqbMlb()            = ccerr.MLB_MQB()          and
                                  tempFPID.StartDate().Year()  = ccerc.StartDate().Year() and
                                  tempFPID.StartDate().Month() = ccerc.StartDate().Month(),
                                  tempFPID.Quantity() );
        cell.OutboundExpensesForRentedWarehouses( guard( [Number] ( engineProductions / guard( lce.PackagingCapacity(), 0 ) ) * guard( lcmr.OutboundPrice(), 0 ), 0 ) );
        cell.OutboundExpensesForRentedWarehouses( [Number] ( engineProductions / guard( lce.PackagingCapacity(), 1 ) ) * guard( lcmr.OutboundPrice(), 1 ) );
        
        // å¤–租库运输费用：发动机运输量 / åŒ…装容量 / è£…载容量（向上取整） * æ–™æž¶è¿è¾“单价
        
        transportationQuantity := sum( macroPlan, Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT, 
                                       tempPIT.Product_MP().Generation()                                                =  ccerr.Generation() and
                                       tempPIT.Product_MP().MQBMLB()                                                    =  ccerr.MLB_MQB()    and
                                       tempPIT.Trip().Departure().Date()                                                >= ccerc.StartDate()  and
                                       tempPIT.Trip().Arrival().Date()                                                  <= lastDayOfThisMonth and
                                       tempPIT.Trip().LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID()      = "CC åŽ‚内库"         and
                                       tempPIT.Trip().LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID() = "长春外租库",
                                       tempPIT.Quantity()
                                      );
        cell.ExternalRentalWarehouseTransportationCosts( transportationQuantity / guard( lce.PackagingCapacity(), 1 ) / guard( lct.LoadingCapacity(), 1 ) * guard( lct.TransportPrice(), 1 ) );
        
        // å¤–租库仓储费用：料架总数量 - å‘动机库存 / åŒ…装容量（向上取整），再乘以空料架仓储单价得到空料架仓储费用。发动机库存取Actual inventories里取到长春外租库该发动机的仓储量，料架总数量需要手动维护。
        cell.UnitPriceOfEmptyShelfStorage( lcmr.StoragePrice() );
        
        // æ¸…洗费用：发动机入库量 / åŒ…装容量 * æ–™æž¶æ¸…洗单价。发动机入库量取发动机销量，包装容量取自发动机成本表。料架清洗单价取料架成本表。
        cell.CleaningCost( guard( engineSales / guard( lce.PackagingCapacity(), 0 ) * lcmr.CleanPrice(), 0 ) );
        cell.CleaningCost( engineSales / guard( lce.PackagingCapacity(), 1 ) * lcmr.CleanPrice() );
        
        cell.CC_EngineRackColumn( relset, ccerc );
      }

 _Main/BL/Type_DL_EngineRackCell/Attribute_PackagingCapacity.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute PackagingCapacity
{
  #keys: '3[413988.0.1594771571][413988.0.1594771570][413988.0.1594771572]'
  ValueType: Real
}

 _Main/BL/Type_DL_EngineRackCell/Attribute_PlannedInventory.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute PlannedInventory
{
  #keys: '3[413988.0.1594771558][413988.0.1594771557][413988.0.1594771559]'
  ValueType: Real
}

 _Main/BL/Type_DL_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
Quintiq file version 2.0
#parent: #root
Function CalcNumberOfEmptyShelves
{
  TextBody:
  [*
    // lihongji Oct-9-2024 (created)
    
    value := guard( this.TotalQuantityOfMaterialRacks() - ( this.PlannedInventory() / this.PackagingCapacity() ), 0 );
    
    this.NumberOfEmptyShelves( value );
  *]
}

 _Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl

@@ -9,11 +9,14 @@
    macroPlan.DL_EngineRackRow( relflush );
    macroPlan.DL_EngineRackColumn( relflush );
    
    // åˆ›å»ºè¡ŒEVO5 MLB, EVO5 MQB, GEN3 MLB, GEN3 MQB
    macroPlan.DL_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MLB" );
    macroPlan.DL_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MQB" );
    macroPlan.DL_EngineRackRow( relnew, Generation := "GEN3", MLB_MQB := "MLB" );
    macroPlan.DL_EngineRackRow( relnew, Generation := "GEN3", MLB_MQB := "MQB" );
    // åˆ›å»ºè¡Œ
    genrations := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.Generation().TrimBoth() <> "", tempPMP.Generation() );
    mqbmlbs    := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.MQBMLB().TrimBoth() <> "", tempPMP.MQBMLB() );
    traverse ( genrations, Elements, g ) {
      traverse ( mqbmlbs, Elements, m ) {
        macroPlan.DL_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
      }
    }
    
    // åˆ›å»ºåˆ—
    indexDate := macroPlan.StartOfPlanning().Date().StartOfMonth();
@@ -23,13 +26,35 @@
    }
    
    // åˆ›å»ºå•å…ƒæ ¼
    traverse ( macroPlan, DL_EngineRackRow, dlerr ) {
      traverse ( macroPlan, DL_EngineRackColumn, dlerc ) {
    traverse ( macroPlan, DL_EngineRackRow, dlerr ) { // å¾ªçŽ¯è¡Œ
      info( "当前遍历的行：", dlerr.Generation(), " ", dlerr.MLB_MQB() );
      traverse ( macroPlan, DL_EngineRackColumn, dlerc ) { // å¾ªçŽ¯åˆ—
        // å‘动机成本参数
        lce  := select( macroPlan, LogisticsCostEngine, tempLCE, tempLCE.Generation() = dlerr.Generation() and tempLCE.MLB_MQB() = dlerr.MLB_MQB() and tempLCE.Factory() = "大连工厂" 
                        and tempLCE.StartDate() <= dlerc.StartDate() and tempLCE.EndDate() >= dlerc.StartDate().StartOfNextMonth() );
        
        // å½“前月末最后一天日期                
        lastDayOfThisMonth := dlerc.StartDate().StartOfNextMonth() - 1; 
        
        cell := dlerr.DL_EngineRackCell( relnew );
        
        // å¤–租库入库费用（发动机销量 / åŒ…装容量[向上取整] * æ–™æž¶å…¥åº“单价）
        // ç©ºæ–™æž¶æ•°é‡ï¼šå¤§è¿žåŽ‚该产品的料架总数量 - å‘动机库存 / åŒ…装容量（向上取整）
        plannedInventory := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriod, tempPISPIP,
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().IsLeaf()                                                                and
                                 exists( tempPISPIP.ProductInStockingPoint_MP().Product_MP(), AllParent.AsParent, tempPMP, tempPMP.ID() = "发动机" )         and
                                 tempPISPIP.ProductInStockingPoint_MP().StockingPointID()                                               = "大连外租库"       and
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().Generation()                                       = dlerr.Generation() and
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB()                                           = dlerr.MLB_MQB()    and
                                 tempPISPIP.Start().Date()                                                                              = lastDayOfThisMonth,
                                 tempPISPIP.PlannedInventoryLevelEnd() );
        cell.PackagingCapacity( guard( lce.PackagingCapacity(), 1 ) );
        cell.PlannedInventory( plannedInventory );
        
        // å¤–租库出库费用（发动机产量 / åŒ…装容量[向上取整] * æ–™æž¶å‡ºåº“单价）
        // CC外租库入库费用：发动机销量 / åŒ…装容量（向上取整）* æ–™æž¶å…¥åº“单价
        
        // CC外租库出库费用：发动机销量 / åŒ…装容量（向上取整）* æ–™æž¶å‡ºåº“单价
        
        cell.DL_EngineRackColumn( relset, dlerc );
      }
    }
  *]

 _Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl

@@ -10,21 +10,29 @@
  TextBody:
  [*
    // ç”„兰鸽 Jun-25-2024 (created)
    startofplanning           := owner.StartOfPlanning();
    startofyear               := startofplanning.StartOfYear().Date();
    startofendyear            := startofplanning.StartOfNextYear().Date();
    //查询日期返回需要在计划日期之内
    weekstart             := owner.StartOfPlanning().Date();
    traverse( owner, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day() ){
      if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Day() ){
        periodtime          := period.StartDate();
        periodname          := periodtime.Format( "M2/D2/Y" );
        
        this.Column( relnew, Name := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
    if( startdate < startofendyear and enddate > startofyear ){
      if( startdate < startofyear ){
        startdate             := startofyear;
      }
      
      if( enddate > startofendyear ){
        enddate               := startofendyear;
      }
      if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Day() ){
        for( start := startdate; start <= enddate; start := start.DateTime().StartOfNextDay().Date() ){
          periodname          := start.Format( "M2/D2/Y" );
          this.Column( relnew, Name := periodname, StartDate := start, EndDate := start, TimeUnit := Translations::MP_GlobalParameters_Day() );
        }
      }
      if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Week() ){
        if( period.StartDate() = weekstart ){
          weekperiodname    := weekstart.Format( "M2/D2/Y" );
          this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart + Duration::Days( 6 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
          weekstart         := ( weekstart + Duration::Days( 7 ) ).Date();
        for( start := startdate; start <= enddate; start := start.StartOfNextWeek() ){
          periodname          := start.Format( "M2/D2/Y" );
          weekend             := ( start.StartOfNextWeek() - Duration::Days( 1 ) ).Date();
          
          this.Column( relnew, Name := periodname, StartDate := start, EndDate := weekend, TimeUnit := Translations::MP_GlobalParameters_Week() );
        }
      }
    }

 _Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl

@@ -30,7 +30,6 @@
      traverse( stockingpoint, ProductInStockingPoint_MP, pisp,  pisp.Product_MP().IsLeaf() and not pisp.IsSystem() 
                and exists( pisp.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent ) 
                and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ) ) ){
        weekstart           := owner.StartOfPlanning().Date();
        pispips             := selectsortedset( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() 
                                                    and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day(), pispip.Start() );
        row := table.GetRow( pisp.ProductID() );
@@ -50,8 +49,7 @@
          //库存需要取最后一天
          row.SetCellInventoryValue( daycolumn, [Real]inventoryquantity );
      
          if( pispip.Start() = weekstart + Duration::Days( 6 ) or pispip.Period_MP() = endperiod ){
            weekstart       := ( weekstart + Duration::Days( 7 ) ).Date();
          if( pispip.Start().Date() = weekcolumn.EndDate() or pispip.Period_MP() = endperiod ){
              
            row.SetCellInventoryValue( weekcolumn, [Real]inventoryquantity );
          } 

 _Main/BL/Type_InterfaceInventoryReport/StaticMethod_GenerateData.qbl

@@ -39,7 +39,7 @@
                                                              , MLBMQB                  := product.MQBMLB()
                                                              , Power                   := product.Power()
                                                              , Product                 := product.ID()
                                                              , InventoryDate           := column.Period()
                                                              , InventoryDate           := column.StartDate()
                                                              , InventoryEndQty         := cell.EndingInventory()
                                                              , InventoryMinQty         := cell.MinimumInventory()
                                                              , InventoryMaxQty         := cell.MaximumInventory()

 _Main/BL/Type_InventorySummaryColumn/Attribute_Period.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InventorySummaryReport/Method_GenerateColumn.qbl

@@ -29,19 +29,15 @@
        }
      }else if( timeunit = Translations::MP_GlobalParameters_Week() ){
        for( start := starttime; start <= endtime; start := start.StartOfNextWeek() ){
          periodtime          := start.Date();
          periodname          := periodtime.Format( "M2/D2/Y" );
          weekend             := ( start.StartOfNextWeek() - Duration::Days( 1 ) ).Date();
          
          this.InventorySummaryColumn( relnew, Name := periodname, StartDate := periodtime, EndaDate := weekend, TimeUnit := Translations::MP_GlobalParameters_Week() );
          this.InventorySummaryColumn( relnew, Name := weekend.Format( "M2/D2/Y" ), StartDate := start.Date(), EndaDate := weekend, TimeUnit := Translations::MP_GlobalParameters_Week() );
        }
      }else if( timeunit = Translations::MP_GlobalParameters_Month() ){
        for( start := starttime; start <= endtime; start := start.StartOfNextMonth() ){
          periodtime          := start.Date();
          periodname          := periodtime.Format( "M2/D2/Y" );
          monthend            := ( start.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
          
          this.InventorySummaryColumn( relnew, Name := periodname, StartDate := periodtime, EndaDate := monthend, TimeUnit := Translations::MP_GlobalParameters_Month() );
          this.InventorySummaryColumn( relnew, Name := monthend.Format( "M2/D2/Y" ), StartDate := start.Date(), EndaDate := monthend, TimeUnit := Translations::MP_GlobalParameters_Month() );
        }
      }
    }

 _Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl

@@ -50,7 +50,7 @@
            periodname        := periodtime.Format( "M2/D2/Y" );
            
            //天，选择日颗粒度时，期末库存，最小库存，最大库存和平均库存的数值保持一致
            daycolumn         := selectobject( table, InventorySummaryColumn, column, column.Name() = periodname, column.Period() = periodtime, column.TimeUnit() = Translations::MP_GlobalParameters_Day() );
            daycolumn         := selectobject( table, InventorySummaryColumn, column, column.Name() = periodname, column.StartDate() = periodtime, column.TimeUnit() = Translations::MP_GlobalParameters_Day() );
            quantity          := ifexpr( pispip.Period_MP().IsHistorical(), [Number]pispip.ActualInventoryLevelEnd(), [Number]pispip.PlannedInventoryLevelEnd() );
            factoryrow.SetCellValue( daycolumn, quantity );
            allrow.SetCellValue( daycolumn, quantity );
@@ -77,9 +77,9 @@
    selections                := selectset( interface, InventoryPointSelection, selection, allsps.Find( selection.StockpoingPoint() ) >= 0 and selection.IsIncluded() );
    productids                := selectuniquevalues( selections, Elements, selection, selection.ProductID() );
    //最后将这些库位中零件号的数量进行加总
    traverse( table, InventorySummaryColumn, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.Period() < startofplanning.Date() ){
    traverse( table, InventorySummaryColumn, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() < startofplanning.Date() ){
      traverse( productids, Elements, productid ){
        column.GenerateCell( selections, ccsps, dlsps, table, column.Period(), column.Period(), productid, allunit, ccunit, dlunit );
        column.GenerateCell( selections, ccsps, dlsps, table, column.StartDate(), column.EndaDate(), productid, allunit, ccunit, dlunit );
      }
    }
      

 _Main/BL/Type_MachiningPipelineReport/Method_GenerateColumn.qbl

@@ -11,20 +11,29 @@
  [*
    // ç”„兰鸽 Jun-25-2024 (created)
    //查询日期返回需要在计划日期之内
    weekstart             := owner.StartOfPlanning().Date();
    traverse( owner, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day() ){
      if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Day() ){
        periodtime          := period.StartDate();
        periodname          := periodtime.Format( "M2/D2/Y" );
        
        this.Column( relnew, Name := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
    startofplanning           := owner.StartOfPlanning();
    startofyear               := startofplanning.StartOfYear().Date();
    startofendyear            := startofplanning.StartOfNextYear().Date();
    //查询日期返回需要在计划日期之内
    if( startdate < startofendyear and enddate > startofyear ){
      if( startdate < startofyear ){
        startdate             := startofyear;
      }
      
      if( enddate > startofendyear ){
        enddate               := startofendyear;
      }
      if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Day() ){
        for( start := startdate; start <= enddate; start := start.DateTime().StartOfNextDay().Date() ){
          periodname          := start.Format( "M2/D2/Y" );
          this.Column( relnew, Name := periodname, StartDate := start, EndDate := start, TimeUnit := Translations::MP_GlobalParameters_Day() );
        }
      }
      if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Week() ){
        if( period.StartDate() = weekstart ){
          weekperiodname    := weekstart.Format( "M2/D2/Y" );
          this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart + Duration::Days( 6 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
          weekstart         := ( weekstart + Duration::Days( 7 ) ).Date();
        for( start := startdate; start <= enddate; start := start.StartOfNextWeek() ){
          periodname          := start.Format( "M2/D2/Y" );
          weekend             := ( start.StartOfNextWeek() - Duration::Days( 1 ) ).Date();
          
          this.Column( relnew, Name := periodname, StartDate := start, EndDate := weekend, TimeUnit := Translations::MP_GlobalParameters_Week() );
        }
      }
    }

 _Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl

@@ -9,9 +9,6 @@
    // ç”„兰鸽 Jun-24-2024 (created)
    owner.FinancialProductionSource( relflush );
    productparent             := MachiningPipelineReport::GetDefaultProductParent();
    //ccunit                    := MachiningPipelineReport::GetDefaultCCUnit();
    //dlunit                    := MachiningPipelineReport::GetDefaultDLUnit();
    //allunit                   := EnginePipelineReport::GetDefaultAllUnit();
    source                    := owner.MachiningPipelineSource( relnew, Name := MachiningPipelineReport::GetDefaultName() );
    table                     := source.Report( relnew, ID := source.Name(), Name := source.Name() );
    showtable                 := source.Report( relnew, ID := source.Name() + 'Show', Name := source.Name(), IsShow := true );
@@ -31,23 +28,15 @@
      iscc                    := stockingpoint.ID().StartsWith( 'CC' ) or unit.ID().StartsWith( 'CC' ) or exists( parentunits, Elements, punit, punit.ID().StartsWith( 'CC' ) );//unit.ID() = ccunit or exists( parentunits, Elements, punit, punit.ID() = ccunit );
      //是否属于大连工厂
      isdl                    := stockingpoint.ID().StartsWith( 'DL' ) or unit.ID().StartsWith( 'DL' ) or exists( parentunits, Elements, punit, punit.ID().StartsWith( 'DL' ) );//unit.ID() = dlunit or exists( parentunits, Elements, punit, punit.ID() = dlunit );
      //是否属于长春装配线CC厂内库
    //  isccassemnly            := stockingpoint.ID().EndsWith( '厂内库' ) and ( stockingpoint.ID().StartsWith( 'CC' ) or stockingpoint.ID().StartsWith( '长春' ) );//unit.ID() = MachiningPipelineReport::GetDefaultCCAssemnlyUnit() or exists( parentunits, Elements, punit, punit.ID() = MachiningPipelineReport::GetDefaultCCAssemnlyUnit() );
      //是否属于大连装配线DL厂内库
    //  isdlassemnly            := stockingpoint.ID().EndsWith( '厂内库' ) and ( stockingpoint.ID().StartsWith( 'DL' ) or stockingpoint.ID().StartsWith( '大连' ) );//unit.ID() = MachiningPipelineReport::GetDefaultDLAssemnlyUnit() or exists( parentunits, Elements, punit, punit.ID() = MachiningPipelineReport::GetDefaultDLAssemnlyUnit() );
      //是否属于长春机加产线
      isccproduction          := stockingpoint.ID().EndsWith( '线边库' ) and ( stockingpoint.ID().StartsWith( 'CC' ) or stockingpoint.ID().StartsWith( '长春' ) );//unit.ID() = MachiningPipelineReport::GetDefaultCCProductionUnit() or exists( parentunits, Elements, punit, punit.ID() = MachiningPipelineReport::GetDefaultCCProductionUnit() );
      //是否属于大连机加产线
      isdlproduction          := unit.ID().EndsWith( 'MoMo' ) and unit.ID().StartsWith( 'DL' );//unit.ID() = MachiningPipelineReport::GetDefaultDLProductionUnit() or exists( parentunits, Elements, punit, punit.ID() = MachiningPipelineReport::GetDefaultDLProductionUnit() );
      if( iscc or isdl ){
        traverse( stockingpoint, ProductInStockingPoint_MP, pisp,  pisp.Product_MP().IsLeaf() and not pisp.IsSystem() 
        traverse( stockingpoint, ProductInStockingPoint_MP, pisp,  pisp.Product_MP().IsLeaf() and not pisp.IsSystem()// and pisp.ProductID() = '06K103011CM'
                  and exists( pisp.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent ) 
                  and exists( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 or pispip.DependentDemandAndSalesDemandQuantity() <> 0 ) ) ){
          isccassemnly        := stockingpoint.ID().EndsWith( pisp.Product_MP().ParentID() + '线边库' ) and ( stockingpoint.ID().StartsWith( 'CC' ) or stockingpoint.ID().StartsWith( '长春' ) );
          isdlassemnly        := stockingpoint.ID().EndsWith( pisp.Product_MP().ParentID() ) and ( stockingpoint.ID().StartsWith( 'DL' ) or stockingpoint.ID().StartsWith( '大连' ) );
          pispips             := selectsortedset( pisp, ProductInStockingPointInPeriod, pispip, not pispip.Period_MP().IsHistorical() 
                                                  and pispip.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 or pispip.DependentDemandAndSalesDemandQuantity() <> 0 ), pispip.Start() );
          traverse( pispips, Elements, pispip ){
          traverse( pispips, Elements, pispip){//, pispip.Start().Month() = 1 and pispip.Start().Day() = 2
            products.Add( pisp.Product_MP() );
            
            //天
@@ -57,18 +46,17 @@
            
            row               := table.GetRow( pisp.ProductID() );
              
            //装配线
            if( isccassemnly or isdlassemnly ){
              quantity        := [Number]pispip.DependentDemandAndSalesDemandQuantity();//四舍五入
              row.SetCellProductionValue( daycolumn, isccassemnly, [Real]quantity );
              row.SetCellProductionValue( weekcolumn, isccassemnly, [Real]quantity );
            }
              
            //机加线
            if( isccproduction or isdlproduction ){
            if( isccassemnly or isdlassemnly ){
              //装配线
              quantity        := [Number]pispip.DependentDemandAndSalesDemandQuantity();//四舍五入
              row.SetAssemblyPlanValue(  daycolumn, isccassemnly, [Real]quantity );
              row.SetAssemblyPlanValue( weekcolumn, isccassemnly, [Real]quantity );
              //生产
              supplyqty       := [Number]pispip.NewSupplyQuantity();//四舍五入
              row.SetCellProductionValue( daycolumn, isccproduction, [Real]supplyqty );
              row.SetCellProductionValue( weekcolumn, isccproduction, [Real]supplyqty );
    //          info( '****************', quantity, supplyqty );
              row.SetCellProductionValue( daycolumn, isccassemnly, [Real]supplyqty );
              row.SetCellProductionValue( weekcolumn, isccassemnly, [Real]supplyqty );
            }
            
            //库存

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Package#2.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW1_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Package#3.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_KW2_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Package#1.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_PL_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Package.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKG_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Package.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_CC_ZKM_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Package#4.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW12_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Package#5.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_AGW3_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Package#3.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_KW_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Package#2.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_PL_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Package.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKG_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Package.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZKM_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Package#1.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/Attribute_DL_ZK_Unpacking.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCapability/_ROOT_Type_PackagingPlanCapability.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl

@@ -79,7 +79,8 @@
            
            // èŽ·å–最大包装数量
            maxPackageReflection   := Reflection::FindAttribute( "PackagingPlanCapability", ppc.PackagingPlanRow().FactoryAbbreviation() + "_" + ppc.PackagingPlanRow().Category() + "_Package" );
            maxPackageQuantity     := maxPackageReflection.GetNumber( macroPlan.PackagingPlanCapability() );
    //        maxPackageQuantity     := maxPackageReflection.GetNumber( macroPlan.PackagingPlanCapability() ); // æ­¤å¤„需要修改
            maxPackageQuantity     := 100000;
            
            // èŽ·å–最终包装数量
            finalPackagingQuantity := minvalue( ceil( needPackagingQuantity / ppls.LotSize() ), ceil( ( maxPackageQuantity - prePPC.Package() ) / ppls.LotSize() ) ) * ppls.LotSize();

 _Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyPackagingQuantity.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute MaximumDailyPackagingQuantity
{
  #keys: '3[413988.0.1594771467][413988.0.1594771466][413988.0.1594771468]'
  ValueType: Real
}

 _Main/BL/Type_PackagingPlanNewCapability/Attribute_MaximumDailyUnpackingQuantity.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute MaximumDailyUnpackingQuantity
{
  #keys: '3[413988.0.1594771477][413988.0.1594771476][413988.0.1594771478]'
  ValueType: Real
}

 _Main/BL/Type_PackagingPlanNewCapability/Attribute_ProductionLine.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute ProductionLine
{
  #keys: '3[413988.0.1594771444][413988.0.1594771443][413988.0.1594771445]'
  ValueType: String
}

 _Main/BL/Type_PackagingPlanNewCapability/_ROOT_Type_PackagingPlanNewCapability.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
Quintiq file version 2.0
#root
#parent: #DomainModel
Type PackagingPlanNewCapability
{
  #keys: '5[413988.0.1594210998][413988.0.1594210996][0.0.0][413988.0.1594210997][413988.0.1594210999]'
  BaseType: Object
  StructuredName: 'PackagingPlanNewCapabilitys'
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlActions.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
Quintiq file version 2.0
Component pnlActions
{
  #keys: '[413988.0.1596179622]'
  BaseType: 'WebPanel'
  Children:
  [
    Component btnOk
    {
      #keys: '[413988.0.1596179626]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'OK'
        Taborder: 0
      ]
    }
    Component btnCancel
    {
      #keys: '[413988.0.1596179628]'
      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_DialogCreateEditPackagingPlanNewCapability/Component_pnlContent.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
Quintiq file version 2.0
Component pnlContent
{
  #keys: '[413988.0.1596179620]'
  BaseType: 'WebPanel'
  Children:
  [
    Component ddslProductionLine
    {
      #keys: '[413988.0.1596148502]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.ProductionLine'
        Label: 'Production line'
        Taborder: 0
      ]
    }
    Component npMaximumDailyPackagingQuantity
    {
      #keys: '[413988.0.1596148605]'
      BaseType: 'WebNumberPicker'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.MaximumDailyPackagingQuantity'
        Label: 'Maximum daily packaging quantity'
        Taborder: 1
      ]
    }
    Component npMaximumDailyUnpackingQuantity
    {
      #keys: '[413988.0.1596148618]'
      BaseType: 'WebNumberPicker'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.MaximumDailyUnpackingQuantity'
        Label: 'Maximum daily unpacking quantity'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [
    Padding: 'true'
    Taborder: 0
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_Edit.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: #root
Method Edit (
  PackagingPlanNewCapability selection
) id:Method_DialogCreateEditPackagingPlanNewCapability_Edit
{
  #keys: '[413988.0.1596179841]'
  Body:
  [*
    data := shadow( selection );
    
    DataHolderDialogData.Data( &data );
    
    ApplicationMacroPlanner.ShowFormModal( this );
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_New.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
Quintiq file version 2.0
#parent: #root
Method New () id:Method_DialogCreateEditPackagingPlanNewCapability_New
{
  #keys: '[413988.0.1596179843]'
  Body:
  [*
    data := MacroPlan.PackagingPlanNewCapability( relshadow );
    
    DataHolderDialogData.Data( &data );
    
    ApplicationMacroPlanner.ShowFormModal( this );
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Method_OnOK.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
Quintiq file version 2.0
#parent: #root
Method OnOK () id:Method_DialogCreateEditPackagingPlanNewCapability_OnOK
{
  #keys: '[413988.0.1596179844]'
  Body:
  [*
    // On ok
    Form.ApplyChanges();
    
    data := DataHolderDialogData.Data();
    
    data.Commit();
    
    Form.Close();
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/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.0.1596179632]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      Form.Close();
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnOk_OnClick.def

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

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlContent_ddslProductionLine_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
Quintiq file version 2.0
#parent: pnlContent/ddslProductionLine
Response OnCreated () id:Response_pnlContent_ddslProductionLine_OnCreated
{
  #keys: '[413988.0.1596148773]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  Precondition:
  [*
    return not isnull( MacroPlan );
  *]
  QuillAction
  {
    Body:
    [*
      uids := selectuniquevalues( MacroPlan, Unit, tempU, true, tempU.ID() );
      
      this.Strings( uids.Concatenate( ";" ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/_ROOT_Component_DialogCreateEditPackagingPlanNewCapability.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
OrphanComponent DialogCreateEditPackagingPlanNewCapability
{
  #keys: '[413988.0.1596179618]'
  BaseType: 'WebForm'
  Children:
  [
    #child: pnlContent
    #child: pnlActions
    Component DataHolderDialogData id:DataHolderDialogData_915
    {
      #keys: '[413988.0.1596179977]'
      BaseType: 'WebDataHolder'
      Databinding: 'shadow[PackagingPlanNewCapability]*'
      Properties:
      [
        Taborder: 2
      ]
    }
  ]
  Properties:
  [
    Alignment: 'trailing'
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    Padding: 'false'
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_abpContent.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
Quintiq file version 2.0
Component abpContent
{
  #keys: '[413988.0.1594809024]'
  BaseType: 'listActionBarPage'
  Properties:
  [
    Taborder: 1
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_cmContent.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
Quintiq file version 2.0
Component cmContent
{
  #keys: '[413988.0.1594809029]'
  BaseType: 'listContextMenu'
  Children:
  [
    Component MenuSeparator
    {
      #keys: '[121142.1.1147171519]'
      BaseType: 'MenuSeparator'
      IsDerived: true
      Properties:
      [
        Taborder: 3
      ]
    }
    Component mSelectAll
    {
      #keys: '[413988.0.1596149028]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'SELECTION_VIEW'
        Shortcut: 'Ctrl+A'
        Taborder: 2
        Title: 'Select all'
      ]
    }
    Component mNew
    {
      #keys: '[413988.0.1596149298]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'ADD2'
        Taborder: 4
        Title: 'New'
      ]
    }
    Component mEdit
    {
      #keys: '[413988.0.1596149554]'
      BaseType: 'WebMenu'
      Properties:
      [
        BindOnDoubleClick: true
        Image: 'PENCIL'
        Taborder: 5
        Title: 'Edit'
      ]
    }
    Component mDelete
    {
      #keys: '[413988.0.1596149809]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'DELETE'
        Taborder: 6
        Title: 'Delete'
      ]
    }
  ]
  Properties:
  [
    Taborder: 0
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_lstContent.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
Quintiq file version 2.0
Component lstContent
{
  #keys: '[413988.0.1594809021]'
  BaseType: 'WebList'
  Children:
  [
    Component deContent
    {
      #keys: '[413988.0.1594809022]'
      BaseType: 'WebDataExtractor'
      Properties:
      [
        DataType: 'MacroPlan'
        Source: 'MacroPlan'
        Taborder: 0
        Transformation: 'PackagingPlanNewCapability'
      ]
    }
    #child: abpContent
    Component dslContent
    {
      #keys: '[413988.0.1594809027]'
      BaseType: 'WebDataSetLevel'
      Children:
      [
        #child: cmContent
      ]
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductionLine","title":"ProductionLine","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductionLine"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaximumDailyPackagingQuantity","title":"MaximumDailyPackagingQuantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaximumDailyPackagingQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaximumDailyUnpackingQuantity","title":"MaximumDailyUnpackingQuantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaximumDailyUnpackingQuantity"}}]'
        ContextMenu: 'cmContent'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [
    Taborder: 0
  ]
  ResponseDefinitions:
  [
    DelegatedResponseDefinition OnClick id:Responsedef_lstContent_WebMenu_OnClick
    {
      #keys: '[413988.0.1596148973]'
      Initiator: 'WebMenu'
      IsInherited: false
      ResponseType: 'OnClick'
      Arguments:
      [
        ResponseDefinitionArgument selection
        {
          #keys: '[3777.0.12953454]'
          Binding: 'this.Selection()'
        }
      ]
    }
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW1.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_KW2.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_PL.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKG.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_CC_ZKM.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW12.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_AGW3.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_KW.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_PL.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZK.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKG#502.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_p_DL_ZKM.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Component_pnlContent.def

@@ -5,18 +5,7 @@
  BaseType: 'WebPanel'
  Children:
  [
    #child: p_DL_ZKG
    #child: p_DL_ZKM
    #child: p_DL_ZK
    #child: p_DL_PL
    #child: p_DL_KW
    #child: p_DL_AGW12
    #child: p_DL_AGW3
    #child: p_CC_ZKG
    #child: p_CC_ZKM
    #child: p_CC_PL
    #child: p_CC_KW1
    #child: p_CC_KW2
    #child: lstContent
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Method_Opne.def

@@ -1,14 +1,10 @@
Quintiq file version 2.0
#parent: #root
Method Opne (
  PackagingPlanCapability ppc
) id:Method_DialogPackagingPlanCapability_Opne
Method Opne () id:Method_DialogPackagingPlanCapability_Opne
{
  #keys: '[413988.0.1402004588]'
  Body:
  [*
    DataHolderDialog.Data( ppc );
    
    ApplicationMacroPlanner.ShowFormModal( this );
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mDelete_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
Quintiq file version 2.0
#parent: lstContent
Response OnClick (
  structured[PackagingPlanNewCapability] selection
) id:Response_lstContent_mDelete_OnClick
{
  #keys: '[413988.0.1596149948]'
  CanBindMultiple: false
  DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
  Initiator: 'mDelete'
  QuillAction
  {
    Body:
    [*
      MacroPlan::DeleteObjects( selection );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mEdit_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
Quintiq file version 2.0
#parent: lstContent
Response OnClick (
  PackagingPlanNewCapability selection
) id:Response_lstContent_mEdit_OnClick
{
  #keys: '[413988.0.1596149701]'
  CanBindMultiple: false
  DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
  Initiator: 'mEdit'
  QuillAction
  {
    Body:
    [*
      dlg := construct( DialogCreateEditPackagingPlanNewCapability );
      
      dlg.Edit( selection );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mNew_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: lstContent
Response OnClick () id:Response_lstContent_mNew_OnClick
{
  #keys: '[413988.0.1596149457]'
  CanBindMultiple: false
  DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
  Initiator: 'mNew'
  Precondition:
  [*
    return not isnull( MacroPlan );
  *]
  QuillAction
  {
    Body:
    [*
      dlg := construct( DialogCreateEditPackagingPlanNewCapability );
      
      dlg.New();
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/Response_lstContent_mSelectAll_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
Quintiq file version 2.0
#parent: lstContent
Response OnClick () id:Response_lstContent_mSelectAll_OnClick
{
  #keys: '[413988.0.1596149206]'
  CanBindMultiple: false
  DefinitionID => /lstContent/Responsedef_lstContent_WebMenu_OnClick
  Initiator: 'mSelectAll'
  QuillAction
  {
    Body:
    [*
      this.SelectAll();
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanCapability/_ROOT_Component_DialogPackagingPlanCapability.def

@@ -9,16 +9,6 @@
  [
    #child: pnlContent
    #child: pnlActions
    Component DataHolderDialog
    {
      #keys: '[413988.0.1402317641]'
      BaseType: 'WebDataHolder'
      Databinding: 'PackagingPlanCapability'
      Properties:
      [
        Taborder: 2
      ]
    }
  ]
  Properties:
  [
@@ -26,6 +16,8 @@
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    MinimumColumns: 100
    MinimumRows: 30
    Padding: 'false'
    Title: 'Packaging Plan Capability'
  ]

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanLotSize/_ROOT_Component_DialogPackagingPlanLotSize.def

@@ -16,6 +16,7 @@
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    MinimumColumns: 100
    MinimumRows: 30
    Padding: 'false'
    Title: 'Packaging Plan Lot Size'

 _Main/UI/MacroPlannerWebApp/Component_FormMachiningPipelineReport/Component_PanelExport.def

@@ -12,7 +12,7 @@
      Properties:
      [
        Image: 'EXPORT1'
        Label: '导入'
        Label: '导出'
        Taborder: 1
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def

@@ -21,7 +21,7 @@
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'Maximum quantity'
        Label: 'Maximum unpackaged quantity'
        Taborder: 1
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_pHeader_bPackagingCapability_OnClick.def

@@ -9,14 +9,9 @@
  {
    Body:
    [*
      if ( isnull( MacroPlan.PackagingPlanCapability() ) ) {
        MacroPlan.PackagingPlanCapability( relnew );
      }
      
      
      dlg := construct( DialogPackagingPlanCapability );
      
      dlg.Opne( MacroPlan.PackagingPlanCapability() );
      dlg.Opne();
    *]
    GroupServerCalls: false
  }