xiaoding721
2024-11-11 a80361675b58ab61191e977723f94c01f87d9753
修改锁定期的库存点和产品的顺序
已重命名1个文件
已修改10个文件
已添加2个文件
已删除2个文件
169 ■■■■ 文件已修改
_Main/BL/Type_DispatchShiftPlan/Function_CalcFac.qbl 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlActions.def 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent661.def 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_cbAllProduct_OnChanged.def 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_ddlProduct_OnSelectionChanged.def 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_cbAllStockingPoint_OnChanged.def 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged.def 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnCancel_OnClick.def 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_cbAllProductInStockingPoint_OnChanged.def 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent_dsLockDate_OnCreated.def 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_DispatchShiftPlan/Function_CalcFac.qbl
@@ -6,9 +6,9 @@
  [*
    // Akari Aug-21-2024 (created)
    value := "";
    if( this.FactoryName() = "大连工厂" ){
    if( this.FactoryName().LikeUserLocale( "大连" ) or  this.FactoryName().LikeUserLocale( "DL" ) ){
      value := "DL";
    }else if( this.FactoryName() = "长春工厂"){
    }else if( this.FactoryName().LikeUserLocale( "长春" ) or  this.FactoryName().LikeUserLocale( "CC" )){
      value := "CC";
    }
    
_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl
@@ -52,6 +52,7 @@
         dispatchShiftPlan.VersionName( macroPlanName );
         dispatchShiftPlan.InterfaceTime( now );
       }else{
         if( shiftPlan.Outcome() <> "" ){
         interfaceLoginfo.DispatchShiftPlan( relnew,ID := OS:: GenerateGUIDAsString(),
                                             ProductLine := productLine,
                                             FactoryName := factory.ID(),
@@ -63,7 +64,7 @@
                                             InterfaceTime := now );
       }
    }
    }
    DispatchShiftPlan::Publish( interfaceLoginfo );
    // owner.RB_DispatchShiftPlanBroker().AsyncExecute();
  *]
}
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pProduct#519.def ÐÞ¸Ä
@@ -1,41 +1,41 @@
Quintiq file version 2.0
Component pProduct
Component pStockingPoint
{
  #keys: '[414996.1.172931824]'
  #keys: '[414996.1.206961942]'
  BaseType: 'WebPanel'
  Children:
  [
    Component ddlProduct
    Component ddlStockingPoint
    {
      #keys: '[414996.1.172931898]'
      #keys: '[414996.1.206961943]'
      BaseType: 'WebDropDownList'
      Databinding: 'Product_MP'
      Databinding: 'StockingPoint_MP'
      Children:
      [
        Component deContent id:deContent_245
        Component deContent
        {
          #keys: '[414996.1.172931899]'
          #keys: '[414996.1.206961944]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'Product_MP'
            Transformation: 'StockingPoint_MP'
          ]
        }
      ]
      Properties:
      [
        DisplayField: 'ID'
        Label: '产品'
        Label: '库存点'
        NumberOfColumns: 50
        Taborder: 0
      ]
    }
    Component cbAllProduct
    Component cbAllStockingPoint
    {
      #keys: '[414996.1.172931904]'
      #keys: '[414996.1.206961945]'
      BaseType: 'WebCheckbox'
      Properties:
      [
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlActions.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component pnlActions
{
  #keys: '[412672.0.1039310286]'
  #keys: '[414996.1.206961981]'
  BaseType: 'WebPanel'
  Children:
  [
    Component btnOk
    {
      #keys: '[412672.0.1039310290]'
      #keys: '[414996.1.206961982]'
      BaseType: 'WebButton'
      Properties:
      [
@@ -17,7 +17,7 @@
    }
    Component btnCancel
    {
      #keys: '[412672.0.1039310292]'
      #keys: '[414996.1.206961983]'
      BaseType: 'WebButton'
      Properties:
      [
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component pnlContent
{
  #keys: '[412672.0.1039310284]'
  #keys: '[414996.1.206961940]'
  BaseType: 'WebPanel'
  Children:
  [
    Component dsLockDate
    {
      #keys: '[412672.0.1039341942]'
      #keys: '[414996.1.206961941]'
      BaseType: 'WebDateSelector'
      Properties:
      [
@@ -15,13 +15,13 @@
        Taborder: 3
      ]
    }
    #child: pProduct
    #child: pStockingPoint
    #child: pnlContent661
    Component dhSelectProduct id:dhSelectProduct_159
    Component dhSelectStockingPoint
    {
      #keys: '[414996.1.172932445]'
      #keys: '[414996.1.206961950]'
      BaseType: 'WebDataHolder'
      Databinding: 'Product_MP'
      Databinding: 'StockingPoint_MP'
      Properties:
      [
        Taborder: 1
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent661.def
@@ -1,25 +1,25 @@
Quintiq file version 2.0
Component pnlContent661
{
  #keys: '[414996.1.172932399]'
  #keys: '[414996.1.206961946]'
  BaseType: 'WebPanel'
  Children:
  [
    Component ddlProductInStockingPoint
    {
      #keys: '[414996.1.172932647]'
      #keys: '[414996.1.206961947]'
      BaseType: 'WebDropDownList'
      Databinding: 'ProductInStockingPoint_MP'
      Children:
      [
        Component deContent404
        {
          #keys: '[414996.1.172932649]'
          #keys: '[414996.1.206961948]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'Product_MP'
            Source: 'dhSelectProduct'
            DataType: 'StockingPoint_MP'
            Source: 'dhSelectStockingPoint'
            Taborder: 0
            Transformation: 'ProductInStockingPoint_MP'
          ]
@@ -27,15 +27,15 @@
      ]
      Properties:
      [
        DisplayField: 'StockingPointID'
        Label: '库存点'
        DisplayField: 'ProductID'
        Label: '产品'
        NumberOfColumns: 50
        Taborder: 0
      ]
    }
    Component cbAllProductInStockingPoint
    {
      #keys: '[414996.1.172932676]'
      #keys: '[414996.1.206961949]'
      BaseType: 'WebCheckbox'
      Properties:
      [
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_cbAllProduct_OnChanged.def
ÎļþÒÑɾ³ý
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pProduct_ddlProduct_OnSelectionChanged.def
ÎļþÒÑɾ³ý
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_cbAllStockingPoint_OnChanged.def
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
Quintiq file version 2.0
#parent: pStockingPoint/cbAllStockingPoint
Response OnChanged () id:Response_pStockingPoint_cbAllStockingPoint_OnChanged
{
  #keys: '[414996.1.206961938]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      if( this.Checked() ){
        ddlStockingPoint.Enabled( false,"" );
      }else{
        ddlStockingPoint.Enabled( true,"" );
      }
    *]
  }
}
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged.def
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#parent: pStockingPoint/ddlStockingPoint
Response OnSelectionChanged (
  StockingPoint_MP selection
) id:Response_pStockingPoint_ddlStockingPoint_OnSelectionChanged
{
  #keys: '[414996.1.206961939]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      dhSelectStockingPoint.Data( selection );
    *]
  }
}
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnCancel_OnClick.def
@@ -2,7 +2,7 @@
#parent: pnlActions/btnCancel
Response OnClick () id:Response_pnlActions_btnCancel_OnClick
{
  #keys: '[412672.0.1039310296]'
  #keys: '[414996.1.206961979]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def
@@ -2,26 +2,37 @@
#parent: pnlActions/btnOk
Response OnClick () id:Response_pnlActions_btnOk_OnClick
{
  #keys: '[412672.0.1039310295]'
  #keys: '[414996.1.206961980]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      if( cbAllProduct.Checked() ){
      if( cbAllStockingPoint.Checked() ){
        if( cbAllProductInStockingPoint.Checked() ){
          // é”å®šå…¨éƒ¨äº§å“
        traverse( MacroPlan,Product_MP,product ){
          traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
            LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
          }
        }
      }else{
        if( cbAllProductInStockingPoint.Checked() ){
          product := ddlProduct.Data();
          // é”å®šæŒ‡å®šäº§å“ä¸‹çš„全部库存点
          product := ddlProductInStockingPoint.Data().Product_MP();
          traverse( product,ProductInStockingPoint_MP,productInStockingPoint ){
            LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
          }
        }
        }else{
        if( cbAllProductInStockingPoint.Checked() ){
          // é”å®šæŒ‡å®šåº“存点下的全部产品
          stockingPoint := ddlStockingPoint.Data();
          traverse( stockingPoint,ProductInStockingPoint_MP,productInStockingPoint ){
            LockPeriod::Create( productInStockingPoint,dsLockDate.Date() );
          }
        }else{
          // é”å®šæŒ‡å®šåº“存点的指定产品
          LockPeriod::Create( ddlProductInStockingPoint.Data(),dsLockDate.Date() );
        } 
      }
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent661_cbAllProductInStockingPoint_OnChanged.def
@@ -2,7 +2,7 @@
#parent: pnlContent661/cbAllProductInStockingPoint
Response OnChanged () id:Response_pnlContent661_cbAllProductInStockingPoint_OnChanged
{
  #keys: '[414996.1.172932951]'
  #keys: '[414996.1.206961937]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
  GroupServerCalls: true
@@ -14,7 +14,6 @@
        ddlProductInStockingPoint.Enabled( false,"" ); 
      }else{
        ddlProductInStockingPoint.Enabled( true,"" );
        cbAllProduct.Checked( false );
      }
    *]
  }
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlContent_dsLockDate_OnCreated.def
@@ -2,7 +2,7 @@
#parent: pnlContent/dsLockDate
Response OnCreated () id:Response_pnlContent_dsLockDate_OnCreated
{
  #keys: '[414996.1.172933211]'
  #keys: '[414996.1.206961936]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  GroupServerCalls: true
_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def
@@ -7,8 +7,8 @@
  BaseType: 'WebForm'
  Children:
  [
    #child: pnlContent
    #child: pnlActions
    #child: pnlContent
  ]
  Properties:
  [