已修改11个文件
已添加1个文件
77 ■■■■ 文件已修改
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate0.qbl 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory#575.qbl 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Test.qbl 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryInterfaceDataDetail/_ROOT_Type_InventoryInterfaceDataDetail.qbl 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_InventoryPointSelection/Attribute_Dtype.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Component_pnlContent.def 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Method_InventoryPointSelection.def 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPointSelection/Component_ListInventoryPointSelection.def 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
@@ -194,9 +194,9 @@
          product := tempProducts.Element( i );
          productionQuantity := product.ProductionQuantity();
          
          if( line.Tips().LikeUserLocale( "保养" ) and productionQuantity > 0){
            product.DispatchShiftSchedulingDetail( relnew,ShiftVolume := 0 ,SingleShiftName := "白班");
          }
    //      if( line.Tips().LikeUserLocale( "保养" ) and productionQuantity > 0){
    //        product.DispatchShiftSchedulingDetail( relnew,ShiftVolume := 0 ,SingleShiftName := "白班");
    //      }
          
          if( singleShiftVolume1 > 0 and productionQuantity > 0){
            tempProductQuantity := singleShiftVolume1 - productionQuantity;
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl
@@ -7,7 +7,8 @@
  String partno,
  String inventory,
  String fac,
  Number quantitiy
  Number quantitiy,
  String dtype
) as InventoryInterfaceDataDetail
{
  TextBody:
@@ -21,9 +22,9 @@
    if( not isnull( product ) and exists( product.GetAllParent(), Elements, proparent, proparent.ID() = 'PL' ) ){
      quantitiy   := floor( [Real]quantitiy / 4 );
    }
    iidl          := selectobject( iid, InventoryInterfaceDataDetail, detail, detail.InventoryPoint() = inventory and detail.Fac() = fac );
    iidl          := selectobject( iid, InventoryInterfaceDataDetail, detail, detail.InventoryPoint() = inventory and detail.Fac() = fac and detail.Dtype() = dtype );
    if( isnull( iidl ) ){
      iidl        := iid.InventoryInterfaceDataDetail( relnew, Date := date, PartNumber := partno, InventoryPoint := inventory, Fac := fac, Quantity := quantitiy );
      iidl        := iid.InventoryInterfaceDataDetail( relnew, Date := date, PartNumber := partno, InventoryPoint := inventory, Fac := fac, Quantity := quantitiy, Dtype := dtype );
    }else{
      iidl.Quantity( quantitiy );
    }
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate0.qbl
@@ -14,7 +14,7 @@
  [*
    // ç”„兰鸽 Jul-26-2024 (created)
    traverse( scenariomanager, ScenarioMP, smp ){
      MDSMacroPlan::Root( smp.DatasetMDSID() ) -> InventoryInterfaceData::Generate( interfaceDataset, date, partno, inventory, fac, quantitiy );
      MDSMacroPlan::Root( smp.DatasetMDSID() ) -> InventoryInterfaceData::Generate( interfaceDataset, date, partno, inventory, fac, quantitiy, '' );
    }
  *]
}
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory#575.qbl
@@ -17,8 +17,8 @@
    // èŽ·å–æŒ‡å®šæ—¥æœŸåº“å­˜æŽ¥å£æ•°æ®
    //发动机成品库存
    traverse( inventorys, Elements, inventory ){
      iidl              := InventoryInterfaceData::Generate( macroplan, owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
      iidl.Dtype( inventory.DType() );
      InventoryInterfaceData::Generate( macroplan, owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total(), inventory.DType() );
    //  iidl.Dtype( inventory.DType() );
    }
  *]
}
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory.qbl
@@ -22,11 +22,11 @@
        if( inventory.Fac() = 'DL' and inventory.Lgort() = 'All' ){
          inventoryname := inventory.LineType();
        }
        InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() );
        InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total(), '' );
      }
      //发动机成品库存
      traverse( loginfo, FinishedEngineInventory, inventory ){
        InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
        InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total(), inventory.DType() );
      }
    }
  *]
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Test.qbl
@@ -11,8 +11,8 @@
    
    iid1 := interfaceDataset.InventoryInterfaceData( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports" );
    
    iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "PXSN", Quantity := 900 );
    iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "LPLE", Quantity := 800 );
    iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "3PLE", Quantity := 3100 );
    iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "PXSN", Quantity := 900, Dtype := "APS" );
    iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "LPLE", Quantity := 800, Dtype := "HTTP" );
    iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "3PLE", Quantity := 3100, Dtype := "eee" );
  *]
}
_Main/BL/Type_InventoryInterfaceDataDetail/_ROOT_Type_InventoryInterfaceDataDetail.qbl
@@ -7,10 +7,18 @@
  BaseType: Object
  OnCreate:
  [*
    ips := select( this, InventoryInterfaceData.InterfaceDataset.InventoryPointSelection, tempIPS, tempIPS.ProductID() = this.PartNumber() and tempIPS.InventoryPoint() = this.InventoryPoint() and this.Fac() = tempIPS.Fac() );
    ips := select( this, InventoryInterfaceData.InterfaceDataset.InventoryPointSelection, tempIPS,
                   tempIPS.ProductID() = this.PartNumber() and
                   tempIPS.InventoryPoint() = this.InventoryPoint() and
                   this.Fac() = tempIPS.Fac() and
                   this.Dtype() = tempIPS.Dtype() );
    
    if ( isnull( ips ) ) {
      ips := this.InventoryInterfaceData().InterfaceDataset().InventoryPointSelection( relnew, ProductID := this.PartNumber(), InventoryPoint := this.InventoryPoint(), Fac := this.Fac() );
      ips := this.InventoryInterfaceData().InterfaceDataset().InventoryPointSelection( relnew,
                                                                                       ProductID := this.PartNumber(),
                                                                                       InventoryPoint := this.InventoryPoint(),
                                                                                       Fac := this.Fac(),
                                                                                       Dtype := this.Dtype() );
    }
    
    this.InventoryPointSelection( relset, ips );
_Main/BL/Type_InventoryPointSelection/Attribute_Dtype.qbl
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
Quintiq file version 2.0
#parent: #root
Attribute Dtype
{
  #keys: '3[416456.0.19351383][416456.0.19351382][416456.0.19351384]'
  ValueType: String
}
_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Component_pnlContent.def
@@ -51,6 +51,17 @@
      [
        DisplayField: 'Name'
        Label: 'StockingPoint'
        Taborder: 3
      ]
    }
    Component eDtype
    {
      #keys: '[416456.0.20811940]'
      BaseType: 'WebEditField'
      Properties:
      [
        Enabled: false
        Label: 'Dtype'
        Taborder: 2
      ]
    }
_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Method_InventoryPointSelection.def
@@ -11,6 +11,7 @@
    
    efProductID.Text( dhInventoryPointSelection.Data().ProductID() );
    efInventoryPoint.Text( dhInventoryPointSelection.Data().InventoryPoint() );
    eDtype.Text( dhInventoryPointSelection.Data().Dtype() );
    
    spmp := select( MacroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = inventoryPointSelection.StockpoingPoint() );
    ddlStockingPoint.Data( spmp );
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPointSelection/Component_ListInventoryPointSelection.def
@@ -29,7 +29,7 @@
      ]
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImgIsIncluded","title":"ImgIsIncluded","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImgIsIncluded"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InventoryPoint","title":"InventoryPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InventoryPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockpoingPoint","title":"StockpoingPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockpoingPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}}]'
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImgIsIncluded","title":"ImgIsIncluded","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImgIsIncluded"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InventoryPoint","title":"InventoryPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InventoryPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockpoingPoint","title":"StockpoingPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockpoingPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Dtype","title":"Dtype","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Dtype"}}]'
        ContextMenu: 'listContextMenuInventoryPointSelection'
        Taborder: 2
      ]
_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
@@ -181,14 +181,23 @@
              dataType: 'string'
              index: 2
              subtotals: ''
              width: 150
              width: 114
            }
            column_Dtype
            {
              columnId: 'Dtype'
              dataPath: 'Dtype'
              dataType: 'string'
              index: 3
              subtotals: ''
              width: 81
            }
            column_StockpoingPoint
            {
              columnId: 'StockpoingPoint'
              dataPath: 'StockpoingPoint'
              dataType: 'string'
              index: 3
              index: 4
              subtotals: ''
              width: 150
            }
@@ -197,7 +206,7 @@
              columnId: 'Fac'
              dataPath: 'Fac'
              dataType: 'string'
              index: 4
              index: 5
              subtotals: ''
              width: 89
            }