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

lazhen

2024-08-23 526dbb667f8fc6bff6cfd88755da1b284092b43f

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

 _Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl

@@ -14,7 +14,7 @@
    traverse ( archiveExecutionStatus, TemporaryDemandData, tdd ,tdd.Origin() = "" or tdd.StartDate() >= macroPlan.StartOfPlanning().Date()) {
      targetProduct_MP       := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = tdd.ProductID() );
      targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = tdd.StockingPointID() );
      info( tdd.SalesSegmentName() );
      // info( tdd.SalesSegmentName() );
      if ( not isnull( targetProduct_MP ) and not isnull( targetStockingPoint_MP ) ) {
        forcest := Forecast::Create( targetProduct_MP,
                          targetStockingPoint_MP,

 _Main/BL/Type_Archive/StaticMethod_Success.qbl

@@ -23,7 +23,11 @@
      archiveExecutionStatus.AES_TemporaryDemandData().Source().FlatQuery( "truncate table A_Forecasts" );
      
      // 杩斿洖鎴愬姛娑堟伅
      if( message <> ''){
        RequirementImportExecutionStatus::Create( archiveExecutionStatus, code, "Complete", userName, message, true );
      }else{
      RequirementImportExecutionStatus::Create( archiveExecutionStatus, code, "Complete", userName, Translations::A_VWED_RequirementImportSuccessful(), true );
      }
    } else {
      RequirementImportExecutionStatus::Create( archiveExecutionStatus, code, "Complete", userName, message, false );
    }

 _Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl

@@ -2,12 +2,16 @@
#parent: #root
StaticMethod Dispatch (
  const MacroPlan macroPlan,
  RecycleBin owner
  RecycleBin owner,
  String versionFlag
)
{
  TextBody:
  [*
    // Akari Aug-21-2024 (created)
    owner.DispatchShiftPlan( relflush );
    // owner.RB_DispatchShiftPlanBroker().Source().FlatQuery( "truncate table A_DispatchShiftPlan" );
    
    now := DateTime::Now();
    macroPlanName := macroPlan.MDSMacroPlan().Description();
    traverse( macroPlan,Unit.UnitPeriod.astype( UnitPeriodTime ).ShiftPlan,shiftPlan ){
@@ -25,6 +29,7 @@
                                ShiftDate := shiftPlan.UnitPeriodTime().Period_MP().StartDate(),
                                Tips := shiftPlan.Remark(),
                                VersionName := macroPlanName,
                                VersionFlag := versionFlag,
                                FactoryName := factory.ID(),
                                InterfaceTime := now
                                );

 _Main/UI/MacroPlannerWebApp/Component_Form568/Component_pOperation.def

@@ -13,7 +13,7 @@
      [
        Image: 'EXPORT1'
        Label: '瀵煎嚭'
        Taborder: 0
        Taborder: 2
      ]
    }
    Component bDownload id:bDownload_774
@@ -24,7 +24,7 @@
      [
        Image: 'DOWNLOAD'
        Label: '涓嬭浇'
        Taborder: 1
        Taborder: 3
      ]
    }
    Component dhXMLDataListener
@@ -50,7 +50,27 @@
      ]
      Properties:
      [
        Taborder: 2
        Taborder: 4
      ]
    }
    Component Button593
    {
      #keys: '[414996.1.20921786]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: '鍙戝竷鐗堟湰'
        Taborder: 0
      ]
    }
    Component Button633
    {
      #keys: '[414996.1.20921810]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: '姹囨姤鐗堟湰'
        Taborder: 1
      ]
    }
  ]

 _Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button593_OnClick.def

对比新文件
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: pOperation/Button593
Response OnClick () id:Response_pOperation_Button593_OnClick
{
  #keys: '[414996.1.20921852]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      DispatchShiftPlan::Dispatch( MacroPlan,RecycleBin,this.Label() );
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button633_OnClick.def

对比新文件
@@ -0,0 +1,16 @@
Quintiq file version 2.0
#parent: pOperation/Button633
Response OnClick () id:Response_pOperation_Button633_OnClick
{
  #keys: '[414996.1.20921936]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      DispatchShiftPlan::Dispatch( MacroPlan,RecycleBin,this.Label() );
    *]
  }
}