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

xiaoding721

2024-10-18 e2494303609cb24dd805b65c2654b82538be8c36

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

 _Main/BL/Type_MachineLogisticsCostReportCell/StaticMethod_CreateData.qbl

@@ -1,8 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateData (
  MacroPlan macroPlan,
  String factory
  MacroPlan macroPlan
)
{
  TextBody:
@@ -36,15 +35,24 @@
                        and tempLCM.StartDate() <= mlcrc.StartDate() and tempLCM.EndDate() >= mlcrc.StartDate().StartOfNextMonth() );
        
        // è¿è¾“成本参数
        lct  := select( macroPlan, LogisticsCostTransport, tempLCT, tempLCT.Product() = mlcrr.Category() and 
                        tempLCT.Origin() = "长春外租库" and tempLCT.Destination() = "CC åŽ‚内库" );
        lct  := select( macroPlan, LogisticsCostTransport, tempLCT, 
                        tempLCT.Product()     = mlcrr.Category()                                                   and 
                        tempLCT.Origin()      = ifexpr( mlcrr.Factory() = "大连工厂", "长春外租库", "大连厂内库" ) and 
                        tempLCT.Destination() = ifexpr( mlcrr.Factory() = "大连工厂", "大连场内库", "长春外租库" ) );
        lct1 := select( macroPlan, LogisticsCostTransport, tempLCT, 
                        tempLCT.Product()     = mlcrr.Category()                                                   and 
                        tempLCT.Origin()      = ifexpr( mlcrr.Factory() = "大连工厂", "大连厂内库", "CC åŽ‚内库" ) and 
                        tempLCT.Destination() = ifexpr( mlcrr.Factory() = "大连工厂", "大连外租库", "长春外租库" ) );
                        
         // å½“前月末最后一天日期                
        lastDayOfThisMonth := mlcrc.StartDate().StartOfNextMonth() - 1; 
        
        cell := mlcrr.MachineLogisticsCostReportCell( relnew );
          
        // è®¾ç½®åŒ…装费用（包装量 * åŒ…装单价）
        packageQuantity := sum( macroPlan, PackagingPlanRow.PackagingPlanCell, tempPPC, 
                                tempPPC.PackagingPlanRow().Category()             = mlcrr.Category()          and
                                tempPPC.PackagingPlanRow().Factory()              = factory                   and
                                tempPPC.PackagingPlanRow().Factory()              = mlcrr.Factory()           and
                                tempPPC.PackagingPlanColumn().StartDate().Year()  = mlcrc.StartDate().Year()  and
                                tempPPC.PackagingPlanColumn().StartDate().Month() = mlcrc.StartDate().Month(),
                                tempPPC.Package() );
@@ -53,7 +61,7 @@
        // è®¾ç½®æ‹†åŒ…费用（拆包量 * æ‹†åŒ…单价）
        unpackingQuantity := sum( macroPlan, PackagingPlanRow.PackagingPlanCell, tempPPC, 
                                  tempPPC.PackagingPlanRow().Category()             = mlcrr.Category()          and
                                  tempPPC.PackagingPlanRow().Factory()              = factory                   and
                                  tempPPC.PackagingPlanRow().Factory()              = mlcrr.Factory()           and
                                  tempPPC.PackagingPlanColumn().StartDate().Year()  = mlcrc.StartDate().Year()  and
                                  tempPPC.PackagingPlanColumn().StartDate().Month() = mlcrc.StartDate().Month(),
                                  tempPPC.Unpacking() );
@@ -67,20 +75,40 @@
          
        // è®¾ç½®è°ƒæ‹¨è´¹ç”¨ï¼ˆè°ƒæ‹¨æ•°é‡ / åŒ…装容量 / è£…载容量 * è¿è¾“单价）
        transferQuantity := sum( macroPlan, TransferPlanRow.TransferPlanCell, tempTPC,
                                 tempTPC.TransferPlanRow().Category()              = mlcrr.Category()                                       and
                                 tempTPC.TransferPlanRow().Name()                  = ifexpr( factory = "大连工厂", "CC to DL", "DL to CC" ) and
                                 tempTPC.TransferPlanColumn().ColumnDate().Year()  = mlcrc.StartDate().Year()                               and
                                 tempTPC.TransferPlanColumn().ColumnDate().Month() = mlcrc.StartDate().Month(),
                                 tempTPC.TransferPlanRow().Category()                      = mlcrr.Category()                                               and
                                 tempTPC.TransferPlanRow().Name()                          = ifexpr( mlcrr.Factory() = "大连工厂", "CC to DL", "DL to CC" ) and
                                 guard( tempTPC.TransferPlanColumn().ColumnDate().Year()   = mlcrc.StartDate().Year(), false )                              and
                                 guard(  tempTPC.TransferPlanColumn().ColumnDate().Month() = mlcrc.StartDate().Month(), false ),
                                 [Number]tempTPC.Value() );
        cell.TransferCost( 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.StorageFeesForRentedWarehouses( packageQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.WarehousingPrice(), 1 ) );
          
        // å¤–租库出库费用（出库量[拆包量] / åŒ…装容量 * å‡ºåº“单价）
      //  cell.OutboundExpensesForRentedWarehouses( unpackingQuantity / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.OutboundPrice(), 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
                                       tempPIT.Trip().Departure().Date()                                                >= mlcrc.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( lcm.PackagingCapacity(), 1 ) / guard( lct1.LoadingCapacity(), 1 ) * guard( lct1.TransportPrice(), 1 ) );
        
        // å¤–租库仓储费用：仓储数量/包装容量*仓储单价
        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().Product_MP().ParentID()                                         =  mlcrr.Category()   and
                                 tempPISPIP.Start().Date()                                                                              >= mlcrc.StartDate()  and
                                 tempPISPIP.End().Date()                                                                                <= lastDayOfThisMonth and
                                 tempPISPIP.ProductInStockingPoint_MP().StockingPointID()                                               =  ifexpr( mlcrr.Factory() = "大连工厂", "大连外租库", "长春外租库" ),
                                 tempPISPIP.PlannedInventoryLevelEnd() );
        cell.RentalWarehouseStorageFees( plannedInventory / guard( lcm.PackagingCapacity(), 1 ) * guard( lcm.StoragePrice(), 1 ) );
        
        cell.MachineLogisticsCostReportColumn( relset, mlcrc );
      }

 _Main/BL/Type_MachineLogisticsCostReportRow/Method_Filter.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Method Filter (
  String factory
) declarative remote as Boolean
{
  TextBody: 'return this.Factory() = factory;'
}

 _Main/BL/Type_PackagingPlanCell/Attribute_NewSupply.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute NewSupply
{
  #keys: '3[415754.0.436130246][415754.0.436130245][415754.0.436130247]'
  Description: '供应'
  ValueType: Real
}

 _Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl

@@ -36,13 +36,8 @@
        // åˆ›å»ºå•å…ƒæ ¼
        cell := select( ppr, PackagingPlanCell, tempPPCell, tempPPCell.PackagingPlanColumn() = ppc );
        if ( isnull( cell ) ) {
          cell := ppr.PackagingPlanCell( relnew );
          cell.NetDemand( pispipl.InventoryLevelEnd() + pispipl.NewSupplyQuantity() - pispipl.DependentDemandAndSalesDemandQuantity() );
          cell.EndingInventory( pispipl.InventoryLevelEnd() );
          cell := ppr.PackagingPlanCell( relnew ); 
          cell.PackagingPlanColumn( relset, ppc );
        } else {
          cell.NetDemand( cell.NetDemand() + ( pispipl.InventoryLevelEnd() + pispipl.NewSupplyQuantity() - pispipl.DependentDemandAndSalesDemandQuantity() ) );
          cell.EndingInventory( cell.EndingInventory() + pispipl.InventoryLevelEnd() );
        }
        
        // è®¾ç½®è°ƒå‡º
@@ -65,12 +60,26 @@
          cell.TransferIn( cell.TransferIn() + pit.Quantity() );
        }
        
        // é•¿æ˜¥å·¥åŽ‚特殊情况设置包装库存和非包装库存
        // å¤§è¿žå·¥åŽ‚设置值
        if ( factory = "大连工厂" ) {
          // å‡€éœ€æ±‚&剩余库存&供应量
          cell.NetDemand( cell.NetDemand() + pispipl.DependentDemandAndSalesDemandQuantity() );
          cell.EndingInventory( cell.EndingInventory() + pispipl.InventoryLevelEnd() );
          cell.NewSupply( cell.NewSupply() + pispipl.NewSupplyQuantity() );
        }
        
        // é•¿æ˜¥å·¥åŽ‚设置值
        if ( factory = "长春工厂" ) {
          // å‰©ä½™åº“å­˜&供应量
          cell.EndingInventory( cell.EndingInventory() + pispipl.InventoryLevelEnd() );
          cell.NewSupply( cell.NewSupply() + pispipl.NewSupplyQuantity() );
          
          // å‡€éœ€æ±‚【只取线边库】&包装库存&非包装库存
          if ( pisp.StockingPointID().Regex( "外租库" ) ) {
            cell.CC_PackagingInventory( pispipl.InventoryLevelEnd() );
          } else if ( pisp.StockingPointID().Regex( "线边库" ) ) {
            cell.CC_UnpackagedInventory( pispipl.InventoryLevelEnd() );
            cell.NetDemand( cell.NetDemand() + pispipl.DependentDemandAndSalesDemandQuantity() );
          }
        }
        

 _Main/BL/Type_PackagingPlanCell/StaticMethod_SetPackagingAndUnpackingValues.qbl

@@ -91,5 +91,56 @@
        }
      }
    }
    
    // è®¾ç½®æ‹†åŒ…值（符合lotsize和一日最大包装量）
    traverse ( macroPlan, PackagingPlanRow, ppr/*, ppr.Factory() = "大连工厂" and ppr.ProductID() = "06K103011CM"*/ ) {
      traverse ( ppr, PackagingPlanCell, ppcell/*, ppcell.StartDate() <= Date::Construct( 2025, 1, 4 )*/ ) {
        // Product_MP
        pmp                     := select( macroPlan, Product_MP, tempPMP, tempPMP.IsLeaf() and tempPMP.ID() = ppr.ProductID() );
        // åŒ…装lotsize
        ppls                    := select( macroPlan, PackagingPlanLotSize, tempPPLS, tempPPLS.Factory() = ppr.Factory() and 
                                           tempPPLS.ProductID() = ifexpr( exists( macroPlan, PackagingPlanLotSize, tempPPLS1, tempPPLS1.ProductID() = pmp.ID() ),
                                                                          pmp.ID(),
                                                                          pmp.ParentID() ) );
        // ä¸€æ—¥åŒ…装容量
        ppnc                    := select( macroPlan, PackagingPlanNewCapability, tempPPNC, tempPPNC.Factory() = ppr.Factory() and 
                                           tempPPNC.ProductID() = ifexpr( exists( macroPlan, PackagingPlanNewCapability, tempPPNC1, tempPPNC1.ProductID() = pmp.ID() ),
                                                                          pmp.ID(),
                                                                          pmp.ParentID() ) );
        // Unit
        us                      := selectset( macroPlan, Unit, tempU, tempU.ID().Regex( ppr.FactoryAbbreviation() + " " + ppr.Category() ) );
         
        // å½“前非包装库存 + ä¸‹ä¸€å¤©çš„NewSupply < ä¸‹ä¸€å¤©çš„净需求
        if ( ppcell.UnpackagedInventory() < guard( ppcell.Next().NetDemand(), 0 ) and not isnull( ppls ) and not isnull( ppnc ) ) {
          // éœ€è¦åŒ…装的数量
          needPackagingQuantity := abs( ppcell.PackagingInventory() ).Round( 0 );
          // åŒ…装开始的索引
          indexPPCell           := ppcell.Previous();
          
    //      info( "产线个数：", us.Size(), "    å¼€å§‹æ—¶é—´ï¼š", ppcell.StartDate().Format( "Y-M2-D2" ), "    åŒ…装库存数量：", ppcell.PackagingInventory(), "    éœ€è¦åŒ…装的数量：", needPackagingQuantity, 
    //            "    åŒ…装lotsize：",guard( ppls.LotSize(), 0 ), "    æœ€å¤§åŒ…装容量：", ppnc.MaximumDailyPackagingQuantity() );
          
          while ( not isnull( indexPPCell )                                                   and 
                  indexPPCell.StartDate() >= plannedStartDate                                 and 
                  exists( us, Elements.UnitPeriod.astype( UnitPeriodTime ).ShiftPlan, tempSP, 
                          tempSP.UnitPeriodTime().StartDate() = indexPPCell.StartDate(),
                          tempSP.Outcome() <> "" )                                            and
                  needPackagingQuantity > 0 ) {
            // èƒ½åŒ…装的数量
            canPackagingQuantity  := ifexpr( ceil( needPackagingQuantity / ppls.LotSize() ) < floor( ppnc.MaximumDailyPackagingQuantity() / ppls.LotSize() ),
                                             ceil( needPackagingQuantity / ppls.LotSize() ),
                                             floor( ppnc.MaximumDailyPackagingQuantity() / ppls.LotSize() ) ) * ppls.LotSize();
    //        info( "开始包装的日期：", indexPPCell.StartDate().Format( "Y-M2-D2" ), "    èƒ½åŒ…装的数量:", canPackagingQuantity );
            
            indexPPCell.Package( canPackagingQuantity );
            Transaction::Transaction().Propagate( attribute( PackagingPlanCell, PackagingInventory ) );
            Transaction::Transaction().Propagate( attribute( PackagingPlanCell, UnpackagedInventory ) );
            
            needPackagingQuantity := needPackagingQuantity - canPackagingQuantity;
            indexPPCell           := indexPPCell.Previous();
          }
        }
      }
    }
  *]
}

 _Main/Sys/Repr/Global/PackagingPlanCell.qrp

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
Quintiq file version 2.0
#parent: #root
TypeRepresentation PackagingPlanCell
{
  AttributeRepresentation EndingInventory
  {
    AttributeKey: '[413988.0.1393320114]'
    Synonym: 'Inventory end'
  }
  AttributeRepresentation NetDemand
  {
    AttributeKey: '[413988.0.1393320104]'
    Synonym: 'Demand'
  }
  AttributeRepresentation NewSupply
  {
    AttributeKey: '[415754.0.436130245]'
    Synonym: 'New supply'
  }
  AttributeRepresentation Out
  {
    AttributeKey: '[413988.0.1393320156]'
    Synonym: 'Transport-out'
  }
  AttributeRepresentation Package
  {
    AttributeKey: '[413988.0.1393320188]'
    Synonym: 'Package'
  }
  AttributeRepresentation PackagingInventory
  {
    AttributeKey: '[413988.0.1393320143]'
    Synonym: 'Packaged'
  }
  AttributeRepresentation TransferIn
  {
    AttributeKey: '[413988.0.1393320166]'
    Synonym: 'Transport-in'
  }
  AttributeRepresentation UnpackagedInventory
  {
    AttributeKey: '[413988.0.1393320130]'
    Synonym: 'Unpackaged'
  }
  AttributeRepresentation Unpacking
  {
    AttributeKey: '[413988.0.1393320198]'
    Synonym: 'Unpackage'
  }
  RelationRepresentation AsFirst { RelationKey: '[413988.0.1425205682]' Visibility: 'Normal' }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Component_pnlContent.def

@@ -25,6 +25,8 @@
      [
        DataBinding: 'DataHolderDialogData.Data.MaximumDailyPackagingQuantity'
        Label: 'Maximum daily packaging quantity'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 2
      ]
    }
@@ -36,6 +38,8 @@
      [
        DataBinding: 'DataHolderDialogData.Data.MaximumDailyUnpackingQuantity'
        Label: 'Maximum daily unpacking quantity'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 3
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnOk_OnClick.def

@@ -6,7 +6,9 @@
  DefinitionID: 'Responsedef_WebButton_OnClick'
  Precondition:
  [*
    return not exists( MacroPlan, PackagingPlanNewCapability, tempPPNC, true, tempPPNC.ProductionLine() = ddslFactory.Text() );
    return not exists( MacroPlan, PackagingPlanNewCapability, tempPPNC, true, 
                       tempPPNC.Factory()   = ddslFactory.Text()   and
                       tempPPNC.ProductID() = ddslProductID.Text() );
  *]
  QuillAction
  {

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanLotSize/Component_pHeader.def

@@ -61,6 +61,8 @@
      Properties:
      [
        Label: 'Lot size'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 2
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanMaximumQuantity/Component_pCC.def

@@ -13,6 +13,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.CC_ZKG'
        Label: 'ZKG(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 0
      ]
    }
@@ -24,6 +26,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.CC_ZKM'
        Label: 'ZKM(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 1
      ]
    }
@@ -35,6 +39,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.CC_PL'
        Label: 'PL(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 2
      ]
    }
@@ -46,6 +52,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.CC_KW'
        Label: 'KW(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 3
      ]
    }
@@ -57,6 +65,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.CC_AGW'
        Label: 'AGW(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 4
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_DialogPackagingPlanMaximumQuantity/Component_pDL.def

@@ -13,6 +13,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.DL_ZKG'
        Label: 'ZKG(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 0
      ]
    }
@@ -24,6 +26,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.DL_ZKM'
        Label: 'ZKM(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 1
      ]
    }
@@ -35,6 +39,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.DL_PL'
        Label: 'PL(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 2
      ]
    }
@@ -46,6 +52,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.DL_KW'
        Label: 'KW(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 3
      ]
    }
@@ -57,6 +65,8 @@
      [
        DataBinding: 'DataHolderDialog.Data.DL_AGW'
        Label: 'AGW(pcs)'
        Mask: 'NUMBER'
        Min: '0'
        Taborder: 4
      ]
    }

 _Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def

@@ -45,6 +45,8 @@
          Properties:
          [
            DataType: 'MacroPlan'
            FilterArguments: 'factory:QLibMacroPlannerWebUI::ApplicationMacroPlanner.dhSelectedFactoryMCRR'
            FixedFilter: 'object.Filter( factory )'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'MachineLogisticsCostReportRow'

 _Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Response_pHeader_bRefresh_OnClick.def

@@ -13,7 +13,7 @@
  {
    Body:
    [*
      MachineLogisticsCostReportCell::CreateData( MacroPlan, ddslFactory.Text() );
      MachineLogisticsCostReportCell::CreateData( MacroPlan );
      
      WebMessageBox::Success( Translations::A_VWED_Success() );
    *]

 _Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_MatrixEditor493.def

@@ -26,7 +26,7 @@
      ]
      Properties:
      [
        Attributes: 'NetDemand;EndingInventory;UnpackagedInventory;PackagingInventory;Out;TransferIn;Package;Unpacking'
        Attributes: 'NetDemand;NewSupply;EndingInventory;Out;TransferIn;UnpackagedInventory;PackagingInventory;Package;Unpacking'
        Column: 'PackagingPlanColumn'
        Row: 'PackagingPlanRow'
        Taborder: 0