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

xiaoding721

2024-12-09 bc05ba97955c569e0c2887c51d6c3e054dbcdf63

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

 _Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_Publish.qbl

@@ -14,7 +14,7 @@
                                    .Add( "planningQty", aopdata.PlanningQty() )
                                    .Add( "sequence", aopdata.Sequence() )
                                    .Add( "factoryName", aopdata.FactoryName() )
                                    .Add( "Remark", aopdata.Note() )
                                    .Add( "remark", aopdata.Note() )
                                    .Add( "fac", aopdata.Fac() )
                                    .Add( "versionName", aopdata.VersionName() )
                                    .Add( "interfaceTime", aopdata.InterfaceTime().Format( 'Y-M2-D2 H:m:s' ) ).Build();/*"2024-10-01 12:00:00" )*/

 _Main/BL/Type_PackagingPlanCell/StaticMethod_GenerateReport.qbl

@@ -1,19 +1,23 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GenerateReport (
  MacroPlan macroPlan
  MacroPlan macroPlan,
  InterfaceDataset interfaceDataset
)
{
  TextBody:
  [*
    // åˆ›å»ºæ•°æ®
    PackagingPlanCell::CreateData( macroPlan );
    //PackagingPlanCell::CreateData( macroPlan );
    
    // è®¾ç½®åŒ…装&拆包-数量（大连工厂）
    PackagingPlanCell::SetPackagingAndUnpackingValuesDL( macroPlan );
    //PackagingPlanCell::SetPackagingAndUnpackingValuesDL( macroPlan );
    
    // è®¾ç½®åŒ…装&拆包-数量（长春工厂）
    PackagingPlanCell::SetPackagingAndUnpackingValuesCC( macroPlan );
    //PackagingPlanCell::SetPackagingAndUnpackingValuesCC( macroPlan );
    
    // è®¾ç½®èµ·å§‹åŒ…装库存
    PackagingPlanCell::SetInitialPackagingInventory( macroPlan, interfaceDataset );
    
    //traverse ( macroPlan, PackagingPlanRow, ppr, ( ppr.ProductID() = "Windshield" and ppr.StockingPointID() = "Bosch" ) or ( ppr.ProductID() = "Windshield" and ppr.StockingPointID() = "Components (Spain)" ) ) {
    //  traverse ( ppr, PackagingPlanCell, ppc/*, ppc.StartDate() = Date::Construct( 2020, 4, 1 )*/ ) {

 _Main/BL/Type_PackagingPlanCell/StaticMethod_SetInitialPackagingInventory.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
Quintiq file version 2.0
#parent: #root
StaticMethod SetInitialPackagingInventory (
  MacroPlan macroPlan,
  InterfaceDataset interfaceDataset
)
{
  TextBody:
  [*
    iids := maxset( interfaceDataset, InventoryInterfaceData, tempIID, true, tempIID.Date() );
    
    traverse ( iids, Elements, iid, exists( iid, InventoryInterfaceDataDetail, tempIIDD, tempIIDD.InventoryPoint() = "SMEC" or tempIIDD.InventoryPoint() = "PMTL" ) ) {
      traverse ( iid, InventoryInterfaceDataDetail, iidd, iidd.InventoryPoint() = "SMEC" or iidd.InventoryPoint() = "PMTL" ) {
        factory := ifexpr( iidd.InventoryPoint() = "SMEC", "长春工厂", "大连工厂" );
        
        ppcell  := select( macroPlan, PackagingPlanRow.PackagingPlanCell, tempPPCell, 
                           tempPPCell.PackagingPlanRow().ProductID()    = iidd.PartNumber()                          and
                           tempPPCell.PackagingPlanColumn().StartDate() = ( macroPlan.StartOfPlanning().Date() - 1 ) and
                           tempPPCell.PackagingPlanRow().Factory()      =  factory );
        ppcell.PackagingInventory( iidd.Quantity() );
      }
    }
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Method_OnOK.def

@@ -53,7 +53,7 @@
    if( ccplannames.Size() > 0 ){
      showlabel     := showlabel.Concat( ccshowname.Concat( ccplannames.Concatenate( "、" ) ) ).Concat( "；");
    }
    showlabel       := showlabel.Concat( '。' );
    showlabel       := showlabel.Replace( showlabel.Length() - 1, 1, '。' );
    currentuser     := QuintiqUser::CurrentUser().DisplayName();
    if( WebMessageBox::Question( this, showlabel, 'OK|Cancel' ) = 0 ){
      InterfaceDataset.PublishPlanReportData( MacroPlan,Archive, cbCustomDemand.Checked()

 _Main/UI/MacroPlannerWebApp/Component_FormLogisticsCostMachining/Component_ListLogisticsCostMachining.def

@@ -28,7 +28,7 @@
      ]
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product","title":"产品","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Product"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Factory","title":"工厂","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Factory"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"开始时间","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"结束时间","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagingCapacity","title":"包装容量","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagingCapacity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WarehousingPrice","title":"入库单价(RMB/托)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WarehousingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OutboundPrice","title":"出库单价(RMB/托)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OutboundPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagePrice","title":"包装单价(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnpackingPrice","title":"拆包单价(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnpackingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BufferPaperPrice","title":"缓冲纸单价(RMB/托)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BufferPaperPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StoragePrice","title":"仓储单价(RMB/托)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StoragePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WoodenCratePrice","title":"木箱单价","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WoodenCratePrice"}}]'
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product","title":"产品","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Product"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Factory","title":"工厂","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Factory"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"开始时间","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"结束时间","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagingCapacity","title":"包装容量","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagingCapacity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WarehousingPrice","title":"入库单价(RMB/托)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WarehousingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OutboundPrice","title":"出库单价(RMB/托)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OutboundPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PackagePrice","title":"包装单价(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PackagePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnpackingPrice","title":"拆包单价(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnpackingPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BufferPaperPrice","title":"缓冲纸单价(RMB/pcs)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BufferPaperPrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StoragePrice","title":"仓储单价(RMB/托)","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StoragePrice"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"WoodenCratePrice","title":"木箱单价","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"WoodenCratePrice"}}]'
        ContextMenu: 'listContextMenuLogisticsCostMachining'
        Taborder: 2
      ]

 _Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_pHeader_bGenerateReport_OnClick.def

@@ -7,13 +7,13 @@
  DefinitionID: 'Responsedef_WebButton_OnClick'
  Precondition:
  [*
    return not isnull( MacroPlan );
    return not isnull( MacroPlan ) and not isnull( InterfaceDataset );
  *]
  QuillAction
  {
    Body:
    [*
      PackagingPlanCell::GenerateReport( MacroPlan );
      PackagingPlanCell::GenerateReport( MacroPlan, InterfaceDataset );
      
      WebMessageBox::Success( Translations::A_VWED_Success() );
    *]

 _Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw

@@ -401,7 +401,7 @@
              dataType: 'real'
              index: 9
              subtotals: ''
              width: 135
              width: 146
            }
            column_StoragePrice
            {