From 5128c0e142caaac77b03c48f4f302805a9066fc5 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 17 十月 2023 17:43:54 +0800
Subject: [PATCH] 产能分配规则导入导出修改
---
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def | 2 +-
_Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Export.qbl | 4 ++--
_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Import.qbl | 4 ++--
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def | 2 +-
_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl | 4 ++--
_Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Import.qbl | 5 +++--
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Export.qbl b/_Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Export.qbl
similarity index 95%
rename from _Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Export.qbl
rename to _Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Export.qbl
index d50d284..8cf249e 100644
--- a/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Export.qbl
+++ b/_Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Export.qbl
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: #root
-EDIBroker GlobalOTDTable_CARRC_Export
+EDIBroker GlobalOTDSOP_CARRC_Export
{
- MDSDefinition: GlobalOTDTable
+ MDSDefinition: GlobalOTDSOP
TimeZone: 'ACT'
UseOSTimeZone: false
EDIModelLink.Source Source11
diff --git a/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Import.qbl b/_Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Import.qbl
similarity index 90%
rename from _Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Import.qbl
rename to _Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Import.qbl
index e539ed2..ad30317 100644
--- a/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Import.qbl
+++ b/_Main/BL/EDI/Broker_GlobalOTDSOP_CARRC_Import.qbl
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: #root
-EDIBroker GlobalOTDTable_CARRC_Import
+EDIBroker GlobalOTDSOP_CARRC_Import
{
- MDSDefinition: GlobalOTDTable
+ MDSDefinition: GlobalOTDSOP
TimeZone: 'ACT'
UseOSTimeZone: false
EDIModelLink.Destination Destination13
@@ -17,6 +17,7 @@
EDIMLColumn Division { Attribute: Division ValueType: String }
EDIMLColumn ModuleMaterialCode { Attribute: ModuleMaterialCode ValueType: String }
EDIMLColumn PanelMaterialCode { Attribute: PanelMaterialCode ValueType: String }
+ EDIMLColumn PanelMaterialStockingPointID { Attribute: PanelMaterialStockingPointID ValueType: String }
EDIMLColumn StockingPointID { Attribute: StockingPointID ValueType: String }
}
}
diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl
index 4397413..a6abe7c 100644
--- a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl
+++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl
@@ -1,13 +1,13 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Export (
- GlobalOTDTable globalOTDTable
+ GlobalOTDSOP globalOTDSOP
) as BinaryValue
{
TextBody:
[*
// hongjli Sep-25-2023 (created)
- binaryValue := globalOTDTable.GlobalOTDTable_CARRC_Export().ExecuteToXLS( true ).AsBinaryValue();
+ binaryValue := globalOTDSOP.GlobalOTDSOP_CARRC_Export().ExecuteToXLS( true ).AsBinaryValue();
return binaryValue;
*]
diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Import.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Import.qbl
index a4eddc6..e18f952 100644
--- a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Import.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Import (
- GlobalOTDTable globalOTDTable,
+ GlobalOTDSOP globalOTDSOP,
String base64String
)
{
@@ -9,6 +9,6 @@
[*
binaryData := BinaryData::FromBase64EncodedString( base64String );
- globalOTDTable.GlobalOTDTable_CARRC_Import().ExecuteFromXLS( &binaryData, true );
+ globalOTDSOP.GlobalOTDSOP_CARRC_Import().ExecuteFromXLS( &binaryData, true );
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def
index 602baba..2d9b279 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def
@@ -9,7 +9,7 @@
{
Body:
[*
- Application.Download( "浜ц兘鍒嗛厤缁撴灉瑙勫垯.xlsx", CapacityAllocationResultsRuleConfiguration::Export( GlobalOTDTable ).AsBinaryData() );
+ Application.Download( "浜ц兘鍒嗛厤缁撴灉瑙勫垯.xlsx", CapacityAllocationResultsRuleConfiguration::Export( GlobalOTDSOP ).AsBinaryData() );
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def
index 3e90d91..fc89b7a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def
@@ -16,7 +16,7 @@
fileName := uploadJson.Get( "name" ).GetString();
base64String := uploadJson.Get( "data" ).GetString();
- CapacityAllocationResultsRuleConfiguration::Import( GlobalOTDTable, base64String );
+ CapacityAllocationResultsRuleConfiguration::Import( GlobalOTDSOP, base64String );
WebMessageBox::Success( "涓婁紶鎴愬姛", true );
}
--
Gitblit v1.9.3