From 526dbb667f8fc6bff6cfd88755da1b284092b43f Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 23 八月 2024 10:20:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button593_OnClick.def | 16 ++++++++
_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl | 7 +++
_Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button633_OnClick.def | 16 ++++++++
_Main/BL/Type_Archive/StaticMethod_Success.qbl | 6 ++
_Main/UI/MacroPlannerWebApp/Component_Form568/Component_pOperation.def | 26 +++++++++++-
_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl | 2
6 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl b/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
index 0b65024..a363c8e 100644
--- a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
+++ b/_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,
diff --git a/_Main/BL/Type_Archive/StaticMethod_Success.qbl b/_Main/BL/Type_Archive/StaticMethod_Success.qbl
index 5844f72..2e39f8a 100644
--- a/_Main/BL/Type_Archive/StaticMethod_Success.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_Success.qbl
@@ -23,7 +23,11 @@
archiveExecutionStatus.AES_TemporaryDemandData().Source().FlatQuery( "truncate table A_Forecasts" );
// 杩斿洖鎴愬姛娑堟伅
- RequirementImportExecutionStatus::Create( archiveExecutionStatus, code, "Complete", userName, Translations::A_VWED_RequirementImportSuccessful(), true );
+ 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 );
}
diff --git a/_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl b/_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl
index cbf8db1..1402b5a 100644
--- a/_Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl
+++ b/_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
);
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form568/Component_pOperation.def b/_Main/UI/MacroPlannerWebApp/Component_Form568/Component_pOperation.def
index 0a1c73c..0a92700 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form568/Component_pOperation.def
+++ b/_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
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button593_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button593_OnClick.def
new file mode 100644
index 0000000..c85d3c1
--- /dev/null
+++ b/_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() );
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button633_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form568/Response_pOperation_Button633_OnClick.def
new file mode 100644
index 0000000..78c0710
--- /dev/null
+++ b/_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() );
+ *]
+ }
+}
--
Gitblit v1.9.3