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

xiaoding721

2024-09-11 7dcc1a44431ff8f08a28359c1bc62a29229e87b4

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

 _Main/BL/Type_ProductInStockingPointInPeriod#228/Attribute_Notes.qbl

@@ -2,6 +2,7 @@
#parent: #root
Attribute Notes
{
  #keys: '3[415754.0.163308688][415754.0.163308687][415754.0.163308689]'
  #keys: '3[415754.0.230714680][415754.0.230714679][415754.0.230714681]'
  Description: '备注'
  ValueType: String
}

 _Main/BL/Type_ProductInStockingPointInPeriod#228/Function_CalcNotes.qbl

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def

@@ -5,28 +5,6 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component efGeneration
    {
      #keys: '[413988.0.1457133350]'
      BaseType: 'WebEditField'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.Generation'
        Label: 'Generation'
        Taborder: 1
      ]
    }
    Component efMLB_MQB
    {
      #keys: '[413988.0.1457133352]'
      BaseType: 'WebEditField'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.MLB_MQB'
        Label: 'MLB/MQB'
        Taborder: 2
      ]
    }
    Component npPackagingCapacity id:npPackagingCapacity_758
    {
      #keys: '[413988.0.1457544780]'
@@ -94,6 +72,28 @@
        Taborder: 0
      ]
    }
    Component ddslGeneration
    {
      #keys: '[415754.0.233210686]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.Generation'
        Label: 'Generation'
        Taborder: 1
      ]
    }
    Component ddslMLB_MQB
    {
      #keys: '[415754.0.233210698]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.MLB_MQB'
        Label: 'MLB/MQB'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslGeneration_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#parent: pnlContent/ddslGeneration
Response OnCreated () id:Response_pnlContent_ddslGeneration_OnCreated
{
  #keys: '[415754.0.233250871]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.Generation() );
      
      this.Strings( values.Concatenate( ";" ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Response_pnlContent_ddslMLB_MQB_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#parent: pnlContent/ddslMLB_MQB
Response OnCreated () id:Response_pnlContent_ddslMLB_MQB_OnCreated
{
  #keys: '[415754.0.233261089]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, true, tempPMP.MQBMLB() );
      
      this.Strings( values.Concatenate( ";" ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def

@@ -5,17 +5,6 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component efProduct
    {
      #keys: '[413988.0.1457092665]'
      BaseType: 'WebEditField'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.Product'
        Label: '产品'
        Taborder: 1
      ]
    }
    Component npPackagePrice
    {
      #keys: '[413988.0.1457167071]'
@@ -116,6 +105,17 @@
        Taborder: 0
      ]
    }
    Component ddslProduct
    {
      #keys: '[415754.0.234419580]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        DataBinding: 'DataHolderDialogData.Data.Product'
        Label: '产品'
        Taborder: 1
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Response_pnlContent_ddslProduct_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#parent: pnlContent/ddslProduct
Response OnCreated () id:Response_pnlContent_ddslProduct_OnCreated
{
  #keys: '[415754.0.233261627]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      values := selectuniquevalues( MacroPlan, Product_MP, tempPMP, tempPMP.ParentID() = "机加件", tempPMP.ID() );
      
      this.Strings( values.Concatenate( ";" ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw

@@ -13,7 +13,7 @@
        {
          mode: 'open'
          rowPosition: 1
          rowSpan: 25
          rowSpan: 21
          columnPosition: 1
          columnSpan: 10
        }
@@ -64,30 +64,12 @@
              subtotals: ''
              width: 150
            }
            column_StartDate
            {
              columnId: 'StartDate'
              dataPath: 'StartDate'
              dataType: 'date'
              index: 3
              subtotals: ''
              width: 150
            }
            column_TimeUnit
            {
              columnId: 'TimeUnit'
              dataPath: 'TimeUnit'
              dataType: 'string'
              index: 4
              subtotals: ''
              width: 150
            }
            column_BaseSalary
            {
              columnId: 'BaseSalary'
              dataPath: 'BaseSalary'
              dataType: 'real'
              index: 5
              index: 3
              subtotals: ''
              width: 150
            }
@@ -175,10 +157,10 @@
    userconfigurableinformation
    {
    }
    image: 'MONEY_BILL_FIRE'
    page: ''
    group: ''
    index: 0
    image: 'MONEY_BILL_FIRE'
    description: ''
  }
  formatversion: 2