VWED.git - Gitblit

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

xiaoding721

2024-11-07 0eb1f5073d7621ab8ec9b105ce4e08a7e4d0740c

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

已修改2个文件

已添加1个文件

	_Main/BL/Type_DL_EngineRackCell/StaticMethod_CreateData.qbl	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 _Main/BL/Type_DL_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 ) {
      traverse ( mqbmlbs, Elements, m ) {
    traverse ( genrations, Elements, g, g = "350bar" ) {
      traverse ( mqbmlbs, Elements, m, m = "MQB" ) {
        macroPlan.DL_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
      }
    }
@@ -68,12 +68,12 @@
        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().StockingPointID()                                             = "å¤§è¿åå¨æºçé¿æ¥å¤ç§åº"  and
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().Generation()                                       =  dlerr.Generation()       and
                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB()                                           =  dlerr.MLB_MQB()          and
                                 tempPISPIP.Start().Date()                                                                              >= dlerc.StartDate()        and 
                                 tempPISPIP.End().Date()                                                                                <= lastDayOfThisMonth,
                                 tempPISPIP.PlannedInventoryLevelEnd() ) / ( lastDayOfThisMonth - dlerc.StartDate() );
                                 tempPISPIP.Start().Date().Year()                                                                       = dlerc.StartDate().Year()  and 
                                 tempPISPIP.Start().Date().Month()                                                                      = dlerc.StartDate().Month(),
                                 tempPISPIP.PlannedInventoryLevelEnd() ) / ( dlerc.StartDate().StartOfNextMonth() - 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 ) );
@@ -107,7 +107,7 @@
                                        tempPIT.Quantity()
                                       );
    //    info( "æ°éï¼", transportationQuantity2 );
        cell.CCLineHaulCost( [Number] ( guard( transportationQuantity2 / lce.PackagingCapacity() / lct1.LoadingCapacity(), 0 ) * guard( lct1.TransportPrice(), 1 ) ) );
        cell.CCLineHaulCost( [Number] ( guard( ceil( ceil( transportationQuantity2 / lce.PackagingCapacity() ) / lct1.LoadingCapacity() ), 0 ) * guard( lct1.TransportPrice(), 1 ) ) );
        
        // CCçéè¿è¾è´¹ç¨ï¼è°æ¨æ°é / åè£å®¹é / è£è½½å®¹é * ææ¶è¿è¾åä»·
        cell.CCShortDistanceTransportationCosts( [Number] ( guard( transportationQuantity1 / lce.PackagingCapacity() / lct3.LoadingCapacity(), 0 ) * guard( lct3.TransportPrice(), 1 ) ) )
@@ -120,8 +120,9 @@
                                  tempF.StartDate()                       >= ( dlerc.StartDate() - 2 )  and
                                  tempF.StartDate()                       <= ( lastDayOfThisMonth - 2 ),
                                  tempF.FulfilledQuantity() );
    //                   info( "æ¶é´ï¼", dlerc.StartDate().Format( "Y-M2-D2" ), "    å¥åºæ°éï¼", inventoryQuantity, "    åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ),
    //                         "    å¥åºåä»·ï¼", guard( lcmr.WarehousingPrice(), 0 ) ); // æµè¯è¾åº
    //                   info( "æ¶é´ï¼", dlerc.StartDate().Format( "Y-M2-D2" ), "  æ¶é´åºåï¼", ( dlerc.StartDate() - 2 ).Format( "Y-M2-D2" ), "    ", ( lastDayOfThisMonth - 2 ).Format( "Y-M2-D2" ),
    //                         "    å¥åºæ°éï¼", inventoryQuantity, "    åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ),
    //                         "    å¥åºåä»·ï¼", guard( lcmrDL.WarehousingPrice(), 0 ) ); // æµè¯è¾åº
        cell.DLStorageFeesForRentedWarehouses( [Number] ( guard( inventoryQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrDL.WarehousingPrice(), 1 ) ) );
        
        // DLå¤ç§åºåºåºè´¹ç¨ï¼åå¨æºåºåºé / ææ¶å®¹éï¼åä¸åæ´ï¼* ææ¶åºåºåä»·
@@ -132,7 +133,7 @@
                                 tempPISPIPPL.Start().Date()                                        >= dlerc.StartDate()  and
                                 tempPISPIPPL.End().Date()                                          <= lastDayOfThisMonth,
                                 tempPISPIPPL.NewSupplyQuantity() );
    //    info( "æ°éï¼", outboundQuantity, "    åè£èåï¼", guard( lce.PackagingCapacity(), 0 ), "    åºåºåä»·ï¼", guard( lcmr.OutboundPrice(), 0 ) );
    //    info( "æ°éï¼", outboundQuantity, "    åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), "    åºåºåä»·ï¼", guard( lcmr.OutboundPrice(), 0 ) );
        cell.DLOutboundExpensesForRentedWarehouses( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrDL.OutboundPrice(), 1 ) ) );
        
        // DLå¤ç§åºè¿è¾è´¹ç¨ï¼åå¨æºè¿è¾é / åè£å®¹é / è£è½½å®¹éï¼åä¸åæ´ï¼* ææ¶è¿è¾åä»·
@@ -140,34 +141,21 @@
                                 tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().Generation() = dlerr.Generation()  and
                                 tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().MQBMLB()     = dlerr.MLB_MQB()     and
                                 tempPISPIPPL.ProductInStockingPoint_MP().StockingPointID()         = "å¤§è¿å¤ç§åº"        and
                                 tempPISPIPPL.Start().Date()                                        >= dlerc.StartDate()  and
                                 tempPISPIPPL.End().Date()                                          <= lastDayOfThisMonth,
                                 tempPISPIPPL.Start().Date().Year()                                 = dlerc.StartDate().Year()  and
                                 tempPISPIPPL.Start().Date().Month()                                = dlerc.StartDate().Month(),
                                 tempPISPIPPL.NewSupplyQuantity() );
        cell.DLExternalRentalWarehouseTransportationCosts( [Number] ( guard( outboundQuantity1 / lce.PackagingCapacity() / lct2.LoadingCapacity(), 0 ) * guard( lct2.TransportPrice(), 1 ) ) );
    //    info( "æ°éï¼", outboundQuantity1, "    åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), "    è£è½½å®¹éï¼", guard( lct2.LoadingCapacity(), 0 ), "    è¿è¾åä»·ï¼", guard( lct2.TransportPrice(), 1 ) );
        cell.DLExternalRentalWarehouseTransportationCosts( [Number] ( guard( ceil( ceil( outboundQuantity1 / lce.PackagingCapacity() ) / lct2.LoadingCapacity() ), 0 ) * guard( lct2.TransportPrice(), 1 ) ) );
        
        // å¤§è¿å¤ç§åºä»å¨è´¹ç¨ï¼ã350bar MQBææ¶æ»æ°é-ææ350bar MQBæ»åºå/åè£å®¹é-å®¢æ·åºææ¶æ°éã*å¤§è¿å¤ç§åºç©ºææ¶æ¯ä¾
        // DLå¤ç§åºä»å¨è´¹ç¨ï¼ææ¶æ»æ°é - åå¨æºåºå / åè£å®¹éï¼åä¸åæ´ï¼* ç©ºææ¶ä»å¨åä»·
        plannedInventory1 := 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()                                                                              >= dlerc.StartDate()        and 
                                  tempPISPIP.End().Date()                                                                                <= lastDayOfThisMonth,
                                  tempPISPIP.PlannedInventoryLevelEnd() );
        cell.DLRentalWarehouseStorageFees( [Number] guard( ( cell.TotalQuantityOfMaterialRacks() - guard( plannedInventory1  / lce.PackagingCapacity(), 0 ) - guard( mrcc.Quantity(), 0 ) ) * guard( mrpc.Quantity(), 1 ) * guard( lcmrDL.StoragePrice(), 1 ), 0 ) );
    //    info( "ç©ºææ¶æ°éï¼", cell.TotalQuantityOfMaterialRacks(), "    åºåï¼", cell.PlannedInventory(), "    å¤©æ°ï¼", dlerc.StartDate().StartOfNextMonth() - dlerc.StartDate(), 
    //          "    åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ) );
        cell.DLRentalWarehouseStorageFees( [Number] guard( ( cell.TotalQuantityOfMaterialRacks() - ceil( guard( cell.PlannedInventory() / lce.PackagingCapacity(), 0 ) ) - guard( mrcc.Quantity(), 0 ) ) * guard( mrpc.Quantity(), 1 ) * guard( lcmrDL.StoragePrice(), 1 ) * ( dlerc.StartDate().StartOfNextMonth() - dlerc.StartDate() ), 0 ) );
        
        // CCå¤ç§åºæ¸æ´è´¹ç¨ï¼åå¨æºå¥åºé / åè£å®¹é * ææ¶æ¸æ´åä»·ãåå¨æºå¥åºéååå¨æºééï¼åè£å®¹éåèªåå¨æºææ¬è¡¨ãææ¶æ¸æ´åä»·åææ¶ææ¬è¡¨ã
        clearnQuantity := sum( macroPlan, SalesDemand.astype( Forecast ), tempF, 
                               tempF.Product_MP().Generation()         =  dlerr.Generation()       and
                               tempF.Product_MP().MQBMLB()             =  dlerr.MLB_MQB()          and
                               tempF.StockingPointID()                 =  "å¤§è¿åå¨æºçé¿æ¥å¤ç§åº" and
                               tempF.StartDate().Year()                = dlerc.StartDate().Year()  and
                               tempF.StartDate().Month()               = dlerc.StartDate().Month(),
                               tempF.Quantity() );
    //    info( "æ°éï¼", clearnQuantity, "    åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), "    æ¸æ´åä»·ï¼", guard( lcmr.CleanPrice(), 0 ) );
        cell.CCCleaningCost( [Number] ( guard( clearnQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrCC.CleanPrice(), 1 ) ) );
    //    info( "æ°éï¼", transportationQuantity1, "    åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), "    æ¸æ´åä»·ï¼", guard( lcmrCC.CleanPrice(), 0 ) );
        cell.CCCleaningCost( [Number] ( guard( transportationQuantity1 / lce.PackagingCapacity(), 0 ) * guard( lcmrCC.CleanPrice(), 1 ) ) );
        
        // DLå¤ç§åºæ¸æ´è´¹ç¨ï¼åå¨æºå¥åºé / åè£å®¹é * ææ¶æ¸æ´åä»·ãåå¨æºå¥åºéååå¨æºééï¼åè£å®¹éåèªåå¨æºææ¬è¡¨ãææ¶æ¸æ´åä»·åææ¶ææ¬è¡¨ã
        cell.CleaningCost( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrDL.CleanPrice(), 1 ) ) );

 _Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl

@@ -26,8 +26,8 @@
    if( isassembleonlineplan ){//è£éä¸çº¿è®¡å
      AssemblyOnlinePlanPPPSPush::GenerateData( this, macroplan, executor );
    }
    if( isinventoryplan ){//åºåè®¡å
    //  CustomerDemandIDS::GenerateData( this, recyclebin, archive );
    if ( isinventoryplan ) { // è®¡ååºåæ°æ®
      InterfaceDataset::PushPlanInventoryData( macroplan, this );
    }
  *]
}

 _Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,45 @@
Quintiq file version 2.0
#parent: #root
StaticMethod PushPlanInventoryData (
  const MacroPlan macroPlan,
  InterfaceDataset interfaceDataset
)
{
  Description: 'åéè®¡ååºåæ°æ®æ¥å£'
  TextBody:
  [*
    table         := selectobject( interfaceDataset, InventoryPlanArchiveVersion, version, not version.IsShow() );
    
    interfaceTime := DateTime::ActualTime().Format( "Y-M2-D2 h2:m:s" );
    
    jsonarray     := JSON::Array();
    
    traverse ( table, Row, r ){
      traverse ( table, Column, c, c.TimeUnit() = Translations::MP_GlobalParameters_Day() ) {
        cell := select( r, Cell, tempC, tempC.Column() = c );
        
        if ( not isnull( cell ) ) {
          idsjson := JSON::Object().Add( "product", r.ProductID() )       
                                   .Add( "inventoryDate", c.StartDate().Format( 'Y-M2-D2' ) )
                                   .Add( "planningInventory", cell.PlanQuantity() )
                                   .Add( "versionName", macroPlan.ScenarioName() )
                                   .Add( "factoryName", ifexpr( r.Unit().Regex( "CC" ), "é¿æ¥å·¥å", "å¤§è¿å·¥å" ) )
                                   .Add( "fac", ifexpr( r.Unit().Regex( "CC" ), "CC", "DL" ) )
                                   .Add( "interfaceTime", interfaceTime ).Build();
          jsonarray.Add( idsjson );
        }
      }
    }
    
    requestbody := jsonarray.Build().AsString();
    info(  requestbody );
    //loginfo := owner.InterfaceLoginfo( relnew, ExecuteUser := executor
    //                                   , Name := Translations::InterfaceDataset_CustomerDemandPPAIDS_Name()
    //                                   , InterfaceDateTime := DateTime::ActualTime()
    //                                   , Message := 'å®¢æ·éæ±ï¼PPA+IDSï¼'
    //                                   , RequestBody := requestbody);
    ////error( '--------------------', requestbody );
    //data     := InterfaceLoginfo::CallInterfaceForDataCenter( owner, loginfo );
    //info( '----------------', data.AsString() );
  *]
}

			@@ -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 ) {
			traverse ( mqbmlbs, Elements, m ) {
			traverse ( genrations, Elements, g, g = "350bar" ) {
			traverse ( mqbmlbs, Elements, m, m = "MQB" ) {
			macroPlan.DL_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
			}
			}
			@@ -68,12 +68,12 @@
			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().StockingPointID() = "å¤§è¿åå¨æºçé¿æ¥å¤ç§åº" and
			tempPISPIP.ProductInStockingPoint_MP().Product_MP().Generation() = dlerr.Generation() and
			tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB() = dlerr.MLB_MQB() and
			tempPISPIP.Start().Date() >= dlerc.StartDate() and
			tempPISPIP.End().Date() <= lastDayOfThisMonth,
			tempPISPIP.PlannedInventoryLevelEnd() ) / ( lastDayOfThisMonth - dlerc.StartDate() );
			tempPISPIP.Start().Date().Year() = dlerc.StartDate().Year() and
			tempPISPIP.Start().Date().Month() = dlerc.StartDate().Month(),
			tempPISPIP.PlannedInventoryLevelEnd() ) / ( dlerc.StartDate().StartOfNextMonth() - 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 ) );
			@@ -107,7 +107,7 @@
			tempPIT.Quantity()
			);
			// info( "æ°éï¼", transportationQuantity2 );
			cell.CCLineHaulCost( [Number] ( guard( transportationQuantity2 / lce.PackagingCapacity() / lct1.LoadingCapacity(), 0 ) * guard( lct1.TransportPrice(), 1 ) ) );
			cell.CCLineHaulCost( [Number] ( guard( ceil( ceil( transportationQuantity2 / lce.PackagingCapacity() ) / lct1.LoadingCapacity() ), 0 ) * guard( lct1.TransportPrice(), 1 ) ) );

			// CCçéè¿è¾è´¹ç¨ï¼è°æ¨æ°é / åè£å®¹é / è£è½½å®¹é * ææ¶è¿è¾åä»·
			cell.CCShortDistanceTransportationCosts( [Number] ( guard( transportationQuantity1 / lce.PackagingCapacity() / lct3.LoadingCapacity(), 0 ) * guard( lct3.TransportPrice(), 1 ) ) )
			@@ -120,8 +120,9 @@
			tempF.StartDate() >= ( dlerc.StartDate() - 2 ) and
			tempF.StartDate() <= ( lastDayOfThisMonth - 2 ),
			tempF.FulfilledQuantity() );
			// info( "æ¶é´ï¼", dlerc.StartDate().Format( "Y-M2-D2" ), " å¥åºæ°éï¼", inventoryQuantity, " åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ),
			// " å¥åºåä»·ï¼", guard( lcmr.WarehousingPrice(), 0 ) ); // æµè¯è¾åº
			// info( "æ¶é´ï¼", dlerc.StartDate().Format( "Y-M2-D2" ), " æ¶é´åºåï¼", ( dlerc.StartDate() - 2 ).Format( "Y-M2-D2" ), " ", ( lastDayOfThisMonth - 2 ).Format( "Y-M2-D2" ),
			// " å¥åºæ°éï¼", inventoryQuantity, " åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ),
			// " å¥åºåä»·ï¼", guard( lcmrDL.WarehousingPrice(), 0 ) ); // æµè¯è¾åº
			cell.DLStorageFeesForRentedWarehouses( [Number] ( guard( inventoryQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrDL.WarehousingPrice(), 1 ) ) );

			// DLå¤ç§åºåºåºè´¹ç¨ï¼åå¨æºåºåºé / ææ¶å®¹éï¼åä¸åæ´ï¼* ææ¶åºåºåä»·
			@@ -132,7 +133,7 @@
			tempPISPIPPL.Start().Date() >= dlerc.StartDate() and
			tempPISPIPPL.End().Date() <= lastDayOfThisMonth,
			tempPISPIPPL.NewSupplyQuantity() );
			// info( "æ°éï¼", outboundQuantity, " åè£èåï¼", guard( lce.PackagingCapacity(), 0 ), " åºåºåä»·ï¼", guard( lcmr.OutboundPrice(), 0 ) );
			// info( "æ°éï¼", outboundQuantity, " åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), " åºåºåä»·ï¼", guard( lcmr.OutboundPrice(), 0 ) );
			cell.DLOutboundExpensesForRentedWarehouses( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrDL.OutboundPrice(), 1 ) ) );

			// DLå¤ç§åºè¿è¾è´¹ç¨ï¼åå¨æºè¿è¾é / åè£å®¹é / è£è½½å®¹éï¼åä¸åæ´ï¼* ææ¶è¿è¾åä»·
			@@ -140,34 +141,21 @@
			tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().Generation() = dlerr.Generation() and
			tempPISPIPPL.ProductInStockingPoint_MP().Product_MP().MQBMLB() = dlerr.MLB_MQB() and
			tempPISPIPPL.ProductInStockingPoint_MP().StockingPointID() = "å¤§è¿å¤ç§åº" and
			tempPISPIPPL.Start().Date() >= dlerc.StartDate() and
			tempPISPIPPL.End().Date() <= lastDayOfThisMonth,
			tempPISPIPPL.Start().Date().Year() = dlerc.StartDate().Year() and
			tempPISPIPPL.Start().Date().Month() = dlerc.StartDate().Month(),
			tempPISPIPPL.NewSupplyQuantity() );
			cell.DLExternalRentalWarehouseTransportationCosts( [Number] ( guard( outboundQuantity1 / lce.PackagingCapacity() / lct2.LoadingCapacity(), 0 ) * guard( lct2.TransportPrice(), 1 ) ) );
			// info( "æ°éï¼", outboundQuantity1, " åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), " è£è½½å®¹éï¼", guard( lct2.LoadingCapacity(), 0 ), " è¿è¾åä»·ï¼", guard( lct2.TransportPrice(), 1 ) );
			cell.DLExternalRentalWarehouseTransportationCosts( [Number] ( guard( ceil( ceil( outboundQuantity1 / lce.PackagingCapacity() ) / lct2.LoadingCapacity() ), 0 ) * guard( lct2.TransportPrice(), 1 ) ) );

			// å¤§è¿å¤ç§åºä»å¨è´¹ç¨ï¼ã350bar MQBææ¶æ»æ°é-ææ350bar MQBæ»åºå/åè£å®¹é-å®¢æ·åºææ¶æ°éã*å¤§è¿å¤ç§åºç©ºææ¶æ¯ä¾
			// DLå¤ç§åºä»å¨è´¹ç¨ï¼ææ¶æ»æ°é - åå¨æºåºå / åè£å®¹éï¼åä¸åæ´ï¼* ç©ºææ¶ä»å¨åä»·
			plannedInventory1 := 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() >= dlerc.StartDate() and
			tempPISPIP.End().Date() <= lastDayOfThisMonth,
			tempPISPIP.PlannedInventoryLevelEnd() );
			cell.DLRentalWarehouseStorageFees( [Number] guard( ( cell.TotalQuantityOfMaterialRacks() - guard( plannedInventory1 / lce.PackagingCapacity(), 0 ) - guard( mrcc.Quantity(), 0 ) ) * guard( mrpc.Quantity(), 1 ) * guard( lcmrDL.StoragePrice(), 1 ), 0 ) );
			// info( "ç©ºææ¶æ°éï¼", cell.TotalQuantityOfMaterialRacks(), " åºåï¼", cell.PlannedInventory(), " å¤©æ°ï¼", dlerc.StartDate().StartOfNextMonth() - dlerc.StartDate(),
			// " åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ) );
			cell.DLRentalWarehouseStorageFees( [Number] guard( ( cell.TotalQuantityOfMaterialRacks() - ceil( guard( cell.PlannedInventory() / lce.PackagingCapacity(), 0 ) ) - guard( mrcc.Quantity(), 0 ) ) * guard( mrpc.Quantity(), 1 ) * guard( lcmrDL.StoragePrice(), 1 ) * ( dlerc.StartDate().StartOfNextMonth() - dlerc.StartDate() ), 0 ) );

			// CCå¤ç§åºæ¸æ´è´¹ç¨ï¼åå¨æºå¥åºé / åè£å®¹é * ææ¶æ¸æ´åä»·ãåå¨æºå¥åºéååå¨æºééï¼åè£å®¹éåèªåå¨æºææ¬è¡¨ãææ¶æ¸æ´åä»·åææ¶ææ¬è¡¨ã
			clearnQuantity := sum( macroPlan, SalesDemand.astype( Forecast ), tempF,
			tempF.Product_MP().Generation() = dlerr.Generation() and
			tempF.Product_MP().MQBMLB() = dlerr.MLB_MQB() and
			tempF.StockingPointID() = "å¤§è¿åå¨æºçé¿æ¥å¤ç§åº" and
			tempF.StartDate().Year() = dlerc.StartDate().Year() and
			tempF.StartDate().Month() = dlerc.StartDate().Month(),
			tempF.Quantity() );
			// info( "æ°éï¼", clearnQuantity, " åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), " æ¸æ´åä»·ï¼", guard( lcmr.CleanPrice(), 0 ) );
			cell.CCCleaningCost( [Number] ( guard( clearnQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrCC.CleanPrice(), 1 ) ) );
			// info( "æ°éï¼", transportationQuantity1, " åè£å®¹éï¼", guard( lce.PackagingCapacity(), 0 ), " æ¸æ´åä»·ï¼", guard( lcmrCC.CleanPrice(), 0 ) );
			cell.CCCleaningCost( [Number] ( guard( transportationQuantity1 / lce.PackagingCapacity(), 0 ) * guard( lcmrCC.CleanPrice(), 1 ) ) );

			// DLå¤ç§åºæ¸æ´è´¹ç¨ï¼åå¨æºå¥åºé / åè£å®¹é * ææ¶æ¸æ´åä»·ãåå¨æºå¥åºéååå¨æºééï¼åè£å®¹éåèªåå¨æºææ¬è¡¨ãææ¶æ¸æ´åä»·åææ¶ææ¬è¡¨ã
			cell.CleaningCost( [Number] ( guard( outboundQuantity / lce.PackagingCapacity(), 0 ) * guard( lcmrDL.CleanPrice(), 1 ) ) );

			@@ -26,8 +26,8 @@
			if( isassembleonlineplan ){//è£éä¸çº¿è®¡å
			AssemblyOnlinePlanPPPSPush::GenerateData( this, macroplan, executor );
			}
			if( isinventoryplan ){//åºåè®¡å
			// CustomerDemandIDS::GenerateData( this, recyclebin, archive );
			if ( isinventoryplan ) { // è®¡ååºåæ°æ®
			InterfaceDataset::PushPlanInventoryData( macroplan, this );
			}
			*]
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,45 @@
			Quintiq file version 2.0
			#parent: #root
			StaticMethod PushPlanInventoryData (
			const MacroPlan macroPlan,
			InterfaceDataset interfaceDataset
			)
			{
			Description: 'åéè®¡ååºåæ°æ®æ¥å£'
			TextBody:
			[*
			table := selectobject( interfaceDataset, InventoryPlanArchiveVersion, version, not version.IsShow() );

			interfaceTime := DateTime::ActualTime().Format( "Y-M2-D2 h2:m:s" );

			jsonarray := JSON::Array();

			traverse ( table, Row, r ){
			traverse ( table, Column, c, c.TimeUnit() = Translations::MP_GlobalParameters_Day() ) {
			cell := select( r, Cell, tempC, tempC.Column() = c );

			if ( not isnull( cell ) ) {
			idsjson := JSON::Object().Add( "product", r.ProductID() )
			.Add( "inventoryDate", c.StartDate().Format( 'Y-M2-D2' ) )
			.Add( "planningInventory", cell.PlanQuantity() )
			.Add( "versionName", macroPlan.ScenarioName() )
			.Add( "factoryName", ifexpr( r.Unit().Regex( "CC" ), "é¿æ¥å·¥å", "å¤§è¿å·¥å" ) )
			.Add( "fac", ifexpr( r.Unit().Regex( "CC" ), "CC", "DL" ) )
			.Add( "interfaceTime", interfaceTime ).Build();
			jsonarray.Add( idsjson );
			}
			}
			}

			requestbody := jsonarray.Build().AsString();
			info( requestbody );
			//loginfo := owner.InterfaceLoginfo( relnew, ExecuteUser := executor
			// , Name := Translations::InterfaceDataset_CustomerDemandPPAIDS_Name()
			// , InterfaceDateTime := DateTime::ActualTime()
			// , Message := 'å®¢æ·éæ±ï¼PPA+IDSï¼'
			// , RequestBody := requestbody);
			////error( '--------------------', requestbody );
			//data := InterfaceLoginfo::CallInterfaceForDataCenter( owner, loginfo );
			//info( '----------------', data.AsString() );
			*]
			}