From c387abc9e569157fdd976b350ec4a3b78a9e87cb Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 23 八月 2024 17:57:45 +0800
Subject: [PATCH] 修改换型设置和热试比例的名称
---
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Version.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Product.qbl | 8 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_New.def | 2
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Version.qbl | 6
_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl | 8
_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_MS64Data_AOnlineAndMOfflinePlanMS64Data_.qbl | 23 +++
_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Product.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningQty.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionTo.qbl | 8 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_SetDefaultValue.def | 2
_var/_Main/Data/MP_ChangeoverLossSetting.xlsx | 0
_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_GetDefalutName.qbl | 2
_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Product.qbl | 6
_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl | 6
_Main/UI/MacroPlannerWebApp/Views/Change_loss_setting_view.vw | 18 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/_ROOT_Component_DialogCreateEditHotTestRatio.def | 4
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_OnOK.def | 2
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_EndDate.qbl | 8 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/_ROOT_Component_DialogCreateEditChangeoverLossSetting.def | 6
_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/_ROOT_Type_AOnlineAndMOfflinePlanMS64Data.qbl | 10 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_StartDate.qbl | 8 +
_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_InterfaceDataset_InterfaceDataset_AOnline.qbl | 23 +++
_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/_ROOT_Component_FormChangeoverLossSetting.def | 4
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_IsActive.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_StartDate.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Version.qbl | 8 +
_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_InterfaceDataset_InterfaceDataset_AOnlin.qbl | 23 +++
_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_PIRData_AOnlineAndMOfflinePlanPIRData_PIR.qbl | 23 +++
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/_ROOT_Type_AOnlineAndMOfflinePlanPIR.qbl | 10 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_New.def | 4
_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningDate.qbl | 8 +
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def | 4
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Werk.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuEdit_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_ListRoutings_MenuHotTestRatio_OnClick.def | 6
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Product.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionFrom.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/_ROOT_Type_AOnlineAndMOfflinePlanPIRData.qbl | 10 +
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeoverLossSetting_On.def | 4
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Werk.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_EndDate.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Werk.qbl | 8 +
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl | 30 ++++
_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuNew_OnClick.def | 4
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/_ROOT_Type_AOnlineAndMOfflinePlanMS64.qbl | 10 +
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_Edit.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def | 4
48 files changed, 355 insertions(+), 39 deletions(-)
diff --git a/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl b/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl
index 519502e..e7936d6 100644
--- a/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl
+++ b/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl
@@ -21,7 +21,7 @@
EDITableTransformation
{
InputTable: ChangeLossSettingExcel
- OutputTable: ChangeLossSetting
+ OutputTable: ChangeoverLossSetting
EDIColumnMatch { InputColumn: ChangeLossNr OutputColumn: ChangeLossNr }
EDIColumnMatch { InputColumn: Product1 OutputColumn: Product1 }
EDIColumnMatch { InputColumn: Product2 OutputColumn: Product2 }
@@ -30,8 +30,8 @@
}
EDIXLSLink.Destination OutputChangeLossSettingsToExcel
{
- FileName: 'MP_ChangeLossSettings'
- EDIXLSLinkTable ChangeLossSetting
+ FileName: 'MP_ChangeoverLossSettings'
+ EDIXLSLinkTable ChangeoverLossSetting
{
Columns:
[
diff --git a/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl b/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl
index 2a98355..011a29e 100644
--- a/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl
+++ b/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl
@@ -5,7 +5,7 @@
MDSDefinition: MacroPlan
TimeZone: 'ACT'
UseOSTimeZone: false
- EDIModelLink.Destination Destination1
+ EDIModelLink.Destination OutputChangeLossSettingsToModel
{
EDIMLTable ChangeLossSettingExcel
{
@@ -24,7 +24,7 @@
{
EDITableTransformation
{
- InputTable: ChangeLossSetting
+ InputTable: ChangeoverLossSetting
OutputTable: ChangeLossSettingExcel
EDIColumnMatch { InputColumn: ChangeLossNr OutputColumn: ChangeLossNr }
EDIColumnMatch { InputColumn: Product1 OutputColumn: Product1 }
@@ -34,8 +34,8 @@
}
EDIXLSLink.Source InputChangeLossSettingsFromExcel
{
- FileName: 'MP_ChangeLossSetting.xlsx'
- EDIXLSLinkTable ChangeLossSetting
+ FileName: 'MP_ChangeoverLossSetting.xlsx'
+ EDIXLSLinkTable ChangeoverLossSetting
{
Columns:
[
diff --git a/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_InterfaceDataset_InterfaceDataset_AOnlin.qbl b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_InterfaceDataset_InterfaceDataset_AOnlin.qbl
new file mode 100644
index 0000000..d0fae83
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_InterfaceDataset_InterfaceDataset_AOnlin.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AOnlineAndMOfflinePlanMS64_InterfaceDataset_InterfaceDataset_AOnlineAndMOfflinePlanMS64
+{
+ #keys: '1[415136.0.1039640163]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceDataset
+ {
+ #keys: '3[415136.0.1039640165][415136.0.1039640164][415136.0.1039640166]'
+ Cardinality: '0to1'
+ ObjectDefinition: AOnlineAndMOfflinePlanMS64
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide AOnlineAndMOfflinePlanMS64
+ {
+ #keys: '3[415136.0.1039640168][415136.0.1039640167][415136.0.1039640169]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceDataset
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_MS64Data_AOnlineAndMOfflinePlanMS64Data_.qbl b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_MS64Data_AOnlineAndMOfflinePlanMS64Data_.qbl
new file mode 100644
index 0000000..82ca49b
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanMS64_MS64Data_AOnlineAndMOfflinePlanMS64Data_.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AOnlineAndMOfflinePlanMS64_MS64Data_AOnlineAndMOfflinePlanMS64Data_MS64
+{
+ #keys: '1[415136.0.1039640176]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide MS64Data
+ {
+ #keys: '3[415136.0.1039640178][415136.0.1039640177][415136.0.1039640179]'
+ Cardinality: '0to1'
+ ObjectDefinition: AOnlineAndMOfflinePlanMS64
+ OwningSide: 'Owned'
+ }
+ RelationSide.RightSide MS64
+ {
+ #keys: '3[415136.0.1039640181][415136.0.1039640180][415136.0.1039640182]'
+ Cardinality: '0to1'
+ ObjectDefinition: AOnlineAndMOfflinePlanMS64Data
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_InterfaceDataset_InterfaceDataset_AOnline.qbl b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_InterfaceDataset_InterfaceDataset_AOnline.qbl
new file mode 100644
index 0000000..a6b8863
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_InterfaceDataset_InterfaceDataset_AOnline.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AOnlineAndMOfflinePlanPIR_InterfaceDataset_InterfaceDataset_AOnlineAndMOfflinePlanPIR
+{
+ #keys: '1[415136.0.1039640067]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide InterfaceDataset
+ {
+ #keys: '3[415136.0.1039640069][415136.0.1039640068][415136.0.1039640070]'
+ Cardinality: '0to1'
+ ObjectDefinition: AOnlineAndMOfflinePlanPIR
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide AOnlineAndMOfflinePlanPIR
+ {
+ #keys: '3[415136.0.1039640072][415136.0.1039640071][415136.0.1039640073]'
+ Cardinality: '1toN'
+ ObjectDefinition: InterfaceDataset
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_PIRData_AOnlineAndMOfflinePlanPIRData_PIR.qbl b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_PIRData_AOnlineAndMOfflinePlanPIRData_PIR.qbl
new file mode 100644
index 0000000..c2525bc
--- /dev/null
+++ b/_Main/BL/Relations/Relation_AOnlineAndMOfflinePlanPIR_PIRData_AOnlineAndMOfflinePlanPIRData_PIR.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation AOnlineAndMOfflinePlanPIR_PIRData_AOnlineAndMOfflinePlanPIRData_PIR
+{
+ #keys: '1[415136.0.1039640080]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide PIRData
+ {
+ #keys: '3[415136.0.1039640082][415136.0.1039640081][415136.0.1039640083]'
+ Cardinality: '1toN'
+ ObjectDefinition: AOnlineAndMOfflinePlanPIR
+ OwningSide: 'Owned'
+ }
+ RelationSide.RightSide PIR
+ {
+ #keys: '3[415136.0.1039640085][415136.0.1039640084][415136.0.1039640086]'
+ Cardinality: '0to1'
+ ObjectDefinition: AOnlineAndMOfflinePlanPIRData
+ OwningSide: 'Reference'
+ }
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_EndDate.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_EndDate.qbl
new file mode 100644
index 0000000..b9e9140
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_EndDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EndDate
+{
+ #keys: '3[415136.0.1039640140][415136.0.1039640139][415136.0.1039640141]'
+ Description: '缁撴潫鏃ユ湡'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_IsActive.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_IsActive.qbl
new file mode 100644
index 0000000..3e4245e
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_IsActive.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsActive
+{
+ #keys: '3[415136.0.1039640227][415136.0.1039640226][415136.0.1039640228]'
+ Description: '鏄惁婵�娲�'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Product.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Product.qbl
new file mode 100644
index 0000000..775fd68
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Product.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Product
+{
+ #keys: '3[415136.0.1039640197][415136.0.1039640196][415136.0.1039640198]'
+ Description: '鐗╂枡鍙�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_StartDate.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_StartDate.qbl
new file mode 100644
index 0000000..09b22be
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_StartDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[415136.0.1039640137][415136.0.1039640136][415136.0.1039640138]'
+ Description: '寮�濮嬫椂闂�'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Version.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Version.qbl
new file mode 100644
index 0000000..52108f8
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Version.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Version
+{
+ #keys: '3[415136.0.1039640134][415136.0.1039640133][415136.0.1039640135]'
+ Description: '鐗堟湰'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionFrom.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionFrom.qbl
new file mode 100644
index 0000000..dad9f08
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionFrom.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute VersionFrom
+{
+ #keys: '3[415136.0.1039640207][415136.0.1039640206][415136.0.1039640208]'
+ Description: '浠庣増鏈�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionTo.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionTo.qbl
new file mode 100644
index 0000000..c4f21ac
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_VersionTo.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute VersionTo
+{
+ #keys: '3[415136.0.1039640217][415136.0.1039640216][415136.0.1039640218]'
+ Description: '鍒扮増鏈�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Werk.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Werk.qbl
new file mode 100644
index 0000000..febc7ca
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/Attribute_Werk.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Werk
+{
+ #keys: '3[415136.0.1039640131][415136.0.1039640130][415136.0.1039640132]'
+ Description: '宸ュ巶浠g爜'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Version.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Version.qbl
new file mode 100644
index 0000000..1605a4b
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Version.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Version
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Werk.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Werk.qbl
new file mode 100644
index 0000000..b54c735
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/DefaultValue_Werk.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Werk
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/_ROOT_Type_AOnlineAndMOfflinePlanMS64.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/_ROOT_Type_AOnlineAndMOfflinePlanMS64.qbl
new file mode 100644
index 0000000..5bead81
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/_ROOT_Type_AOnlineAndMOfflinePlanMS64.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type AOnlineAndMOfflinePlanMS64
+{
+ #keys: '5[415136.0.1039640128][415136.0.1039640126][0.0.0][415136.0.1039640127][415136.0.1039640129]'
+ BaseType: Object
+ Description: '瑁呴厤涓婄嚎璁″垝+鏈哄姞涓嬬嚎璁″垝-鏌ヨ鏉′欢'
+ StructuredName: 'AOnlineAndMOfflinePlanMS64s'
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Product.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Product.qbl
new file mode 100644
index 0000000..45ff6e7
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Product.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Product
+{
+ #keys: '3[415136.0.1039640151][415136.0.1039640150][415136.0.1039640152]'
+ Description: '鐗╂枡鍙�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Product.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Product.qbl
new file mode 100644
index 0000000..6e10c8e
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Product.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Product
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/_ROOT_Type_AOnlineAndMOfflinePlanMS64Data.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/_ROOT_Type_AOnlineAndMOfflinePlanMS64Data.qbl
new file mode 100644
index 0000000..f4ff4f8
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/_ROOT_Type_AOnlineAndMOfflinePlanMS64Data.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type AOnlineAndMOfflinePlanMS64Data
+{
+ #keys: '5[415136.0.1039640148][415136.0.1039640146][0.0.0][415136.0.1039640147][415136.0.1039640149]'
+ BaseType: Object
+ Description: '瑁呴厤涓婄嚎璁″垝+鏈哄姞涓嬬嚎璁″垝-鏁版嵁'
+ StructuredName: 'AOnlineAndMOfflinePlanMS64Datas'
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_EndDate.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_EndDate.qbl
new file mode 100644
index 0000000..549395e
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_EndDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EndDate
+{
+ #keys: '3[415136.0.1039640058][415136.0.1039640057][415136.0.1039640059]'
+ Description: '缁撴潫鏃ユ湡'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_StartDate.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_StartDate.qbl
new file mode 100644
index 0000000..279fc98
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_StartDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute StartDate
+{
+ #keys: '3[415136.0.1039640048][415136.0.1039640047][415136.0.1039640049]'
+ Description: '寮�濮嬫椂闂�'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Version.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Version.qbl
new file mode 100644
index 0000000..1ba610c
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Version.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Version
+{
+ #keys: '3[415136.0.1039640038][415136.0.1039640037][415136.0.1039640039]'
+ Description: '鐗堟湰'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Werk.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Werk.qbl
new file mode 100644
index 0000000..cd7a4e7
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/Attribute_Werk.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Werk
+{
+ #keys: '3[415136.0.1039640028][415136.0.1039640027][415136.0.1039640029]'
+ Description: '宸ュ巶浠g爜'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
new file mode 100644
index 0000000..73c5697
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -0,0 +1,30 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GenerateData (
+ InterfaceDataset owner,
+ String werk,
+ const MacroPlan macroplan,
+ Date startdate,
+ Date enddate
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Aug-23-2024 (created)
+ owner.AOnlineAndMOfflinePlanPIR( relflush );
+ pir := owner.AOnlineAndMOfflinePlanPIR( relnew, Werk := werk, Version := macroplan.ScenarioName(), StartDate := startdate, EndDate := enddate );
+ totalrows := 0;
+ traverse( macroplan, AssemblyOnlinePlanColumn, column ){
+ traverse( column, AssemblyOnlinePlanCell, cell, cell.Value() <> '' and cell.AssemblyOnlinePlanRow().RowNr() = '1' ){
+ quantityrow := cell.AssemblyOnlinePlanRow();
+
+ pir.PIRData( relnew, Product := quantityrow.ProductID()
+ , PlanningDate := column.ColumnDate()
+ , PlanningQty := [Number]cell.Value());
+ }
+ }
+ totalrows := totalrows + pir.PIRData( relsize );
+
+ //traverse( macroplan, OfflinePlanTable
+ *]
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/_ROOT_Type_AOnlineAndMOfflinePlanPIR.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/_ROOT_Type_AOnlineAndMOfflinePlanPIR.qbl
new file mode 100644
index 0000000..7c26cdc
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/_ROOT_Type_AOnlineAndMOfflinePlanPIR.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type AOnlineAndMOfflinePlanPIR
+{
+ #keys: '5[415136.0.1039640013][415136.0.1039640011][0.0.0][415136.0.1039640012][415136.0.1039640014]'
+ BaseType: Object
+ Description: '瑁呴厤涓婄嚎璁″垝+鏈哄姞涓嬬嚎璁″垝-鏌ヨ鏉′欢'
+ StructuredName: 'AOnlineAndMOfflinePlanPIRs'
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningDate.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningDate.qbl
new file mode 100644
index 0000000..b8f1839
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningDate.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PlanningDate
+{
+ #keys: '3[415136.0.1039640107][415136.0.1039640106][415136.0.1039640108]'
+ Description: '鎺掍骇鏃ユ湡'
+ ValueType: Date
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningQty.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningQty.qbl
new file mode 100644
index 0000000..2f029a0
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_PlanningQty.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PlanningQty
+{
+ #keys: '3[415136.0.1039640117][415136.0.1039640116][415136.0.1039640118]'
+ Description: '瀵瑰簲鏃ユ湡鐨勮鍒掓暟閲�'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Product.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Product.qbl
new file mode 100644
index 0000000..6a8e404
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Product.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Product
+{
+ #keys: '3[415136.0.1039640097][415136.0.1039640096][415136.0.1039640098]'
+ Description: '鐗╂枡鍙�'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/_ROOT_Type_AOnlineAndMOfflinePlanPIRData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/_ROOT_Type_AOnlineAndMOfflinePlanPIRData.qbl
new file mode 100644
index 0000000..18331d8
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/_ROOT_Type_AOnlineAndMOfflinePlanPIRData.qbl
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type AOnlineAndMOfflinePlanPIRData
+{
+ #keys: '5[415136.0.1039640021][415136.0.1039640019][0.0.0][415136.0.1039640020][415136.0.1039640022]'
+ BaseType: Object
+ Description: '瑁呴厤涓婄嚎璁″垝+鏈哄姞涓嬬嚎璁″垝-鏁版嵁'
+ StructuredName: 'AOnlineAndMOfflinePlanPIRDatas'
+}
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_GetDefalutName.qbl b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_GetDefalutName.qbl
index 3375894..390d381 100644
--- a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_GetDefalutName.qbl
+++ b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_GetDefalutName.qbl
@@ -5,6 +5,6 @@
TextBody:
[*
// 鐢勫叞楦� Aug-22-2024 (created)
- return 'MP_ChangeLossSetting.xlsx';
+ return 'MP_ChangeoverLossSetting.xlsx';
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def
index 3fde688..f6b290e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def
@@ -5,14 +5,14 @@
BaseType: 'WebActionBarGroup'
Children:
[
- Component ButtonChangeLossSetting
+ Component ButtonChangeoverLossSetting
{
#keys: '[415136.0.747550259]'
BaseType: 'WebButton'
Properties:
[
Image: 'GEAR'
- Label: 'Change loss setting'
+ Label: 'Changeover loss setting'
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeLossSetting_OnClic.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeoverLossSetting_On.def
similarity index 77%
rename from _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeLossSetting_OnClic.def
rename to _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeoverLossSetting_On.def
index d04f14a..30f172a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeLossSetting_OnClic.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeoverLossSetting_On.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
-#parent: ActionBarGroupRestraint/ButtonChangeLossSetting
-Response OnClick () id:Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeLossSetting_OnClick
+#parent: ActionBarGroupRestraint/ButtonChangeoverLossSetting
+Response OnClick () id:Response_MacroPlanner_ActionBarGroupRestraint_ButtonChangeoverLossSetting_OnClick
{
#keys: '[415136.0.748214014]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_Edit.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_Edit.def
index fc9c24e..223e502 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_Edit.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_Edit.def
@@ -2,7 +2,7 @@
#parent: #root
Method Edit (
ChangeLossSetting selection
-) id:Method_DialogCreateEditChangeLossSetting_Edit
+) id:Method_DialogCreateEditChangeoverLossSetting_Edit
{
#keys: '[415136.0.746200731]'
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_New.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_New.def
index 8e07d45..f7be2ae 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_New.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_New.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
#parent: #root
Method New (
- FormChangeLossSetting form
-) id:Method_DialogCreateEditChangeLossSetting_New
+ FormChangeoverLossSetting form
+) id:Method_DialogCreateEditChangeoverLossSetting_New
{
#keys: '[415136.0.746200358]'
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_OnOK.def
index 8135b6d..140fd36 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Method_OnOK.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-Method OnOK () id:Method_DialogCreateEditChangeLossSetting_OnOK
+Method OnOK () id:Method_DialogCreateEditChangeoverLossSetting_OnOK
{
#keys: '[415136.0.746200837]'
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/_ROOT_Component_DialogCreateEditChangeLossSetting.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/_ROOT_Component_DialogCreateEditChangeoverLossSetting.def
similarity index 84%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/_ROOT_Component_DialogCreateEditChangeLossSetting.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/_ROOT_Component_DialogCreateEditChangeoverLossSetting.def
index 0caebb1..7d83f47 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/_ROOT_Component_DialogCreateEditChangeLossSetting.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/_ROOT_Component_DialogCreateEditChangeoverLossSetting.def
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
-OrphanComponent DialogCreateEditChangeLossSetting
+OrphanComponent DialogCreateEditChangeoverLossSetting
{
#keys: '[415136.0.735612161]'
BaseType: 'WebForm'
@@ -23,7 +23,7 @@
{
#keys: '[415136.0.735612354]'
BaseType: 'WebDataHolder'
- Databinding: 'FormChangeLossSetting'
+ Databinding: 'FormChangeoverLossSetting'
Properties:
[
Taborder: 1
@@ -38,6 +38,6 @@
ExcludeFromActiveComponent: true
Image: 'GEAR'
Padding: 'false'
- Title: 'Change loss setting'
+ Title: 'Changeover loss setting'
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_New.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_New.def
index 96f304f..3974309 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_New.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_New.def
@@ -3,7 +3,7 @@
Method New (
Routing selection,
FormRoutings formrouting
-) id:Method_DialogCreateEditThermalTrialRatio_New
+) id:Method_DialogCreateEditHotTestRatio_New
{
#keys: '[415136.0.756141435]'
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
index 0c62b57..57fd815 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_OnOK.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-Method OnOK () id:Method_DialogCreateEditThermalTrialRatio_OnOK
+Method OnOK () id:Method_DialogCreateEditHotTestRatio_OnOK
{
#keys: '[415136.0.762562093]'
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_SetDefaultValue.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_SetDefaultValue.def
index 3930cf2..acc2c38 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_SetDefaultValue.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/Method_SetDefaultValue.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-Method SetDefaultValue () id:Method_DialogCreateEditThermalTrialRatio_SetDefaultValue
+Method SetDefaultValue () id:Method_DialogCreateEditHotTestRatio_SetDefaultValue
{
#keys: '[415136.0.756141199]'
Body:
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/_ROOT_Component_DialogCreateEditThermalTrialRatio.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/_ROOT_Component_DialogCreateEditHotTestRatio.def
similarity index 89%
rename from _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/_ROOT_Component_DialogCreateEditThermalTrialRatio.def
rename to _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/_ROOT_Component_DialogCreateEditHotTestRatio.def
index dd793e2..994e996 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/_ROOT_Component_DialogCreateEditThermalTrialRatio.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditThermalTrialRatio/_ROOT_Component_DialogCreateEditHotTestRatio.def
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
-OrphanComponent DialogCreateEditThermalTrialRatio
+OrphanComponent DialogCreateEditHotTestRatio
{
#keys: '[415136.0.756140026]'
BaseType: 'WebForm'
@@ -37,6 +37,6 @@
EscapeButton: 'btnCancel'
ExcludeFromActiveComponent: true
Padding: 'false'
- Title: 'Thermal trial ratio'
+ Title: 'Hot test ratio'
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuEdit_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuEdit_OnClick.def
index 77f8962..f80189c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuEdit_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuEdit_OnClick.def
@@ -16,7 +16,7 @@
{
Body:
[*
- dlg := construct( DialogCreateEditChangeLossSetting );
+ dlg := construct( DialogCreateEditChangeoverLossSetting );
dlg.Edit( selection );
*]
GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuNew_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuNew_OnClick.def
index d302fd7..17360b7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuNew_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/Response_ListChangeLossSetting_568_MenuNew_OnClick.def
@@ -14,8 +14,8 @@
{
Body:
[*
- dlg := construct( DialogCreateEditChangeLossSetting );
- dlg.New( FormChangeLossSetting );
+ dlg := construct( DialogCreateEditChangeoverLossSetting );
+ dlg.New( FormChangeoverLossSetting );
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/_ROOT_Component_FormChangeLossSetting.def b/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/_ROOT_Component_FormChangeoverLossSetting.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/_ROOT_Component_FormChangeLossSetting.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/_ROOT_Component_FormChangeoverLossSetting.def
index a8a8401..9b6f964 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/_ROOT_Component_FormChangeLossSetting.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormChangeLossSetting/_ROOT_Component_FormChangeoverLossSetting.def
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
-OrphanComponent FormChangeLossSetting
+OrphanComponent FormChangeoverLossSetting
{
#keys: '[415136.0.735611670]'
BaseType: 'WebForm'
@@ -13,6 +13,6 @@
Properties:
[
Image: 'GEAR'
- Title: 'Change loss setting'
+ Title: 'Changeover loss setting'
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def b/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def
index edcc552..1fe70ea 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def
@@ -13,7 +13,7 @@
Taborder: 11
]
}
- Component MenuThermalTrialRatio
+ Component MenuHotTestRatio
{
#keys: '[415136.0.761890786]'
BaseType: 'WebMenu'
@@ -21,7 +21,7 @@
[
Image: 'OSZILLOGRAPH'
Taborder: 12
- Title: 'Thermal trial ratio'
+ Title: 'Hot test ratio'
]
}
Component MenuSetUphillRouting
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_ListRoutings_MenuThermalTrialRatio_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_ListRoutings_MenuHotTestRatio_OnClick.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_ListRoutings_MenuThermalTrialRatio_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_ListRoutings_MenuHotTestRatio_OnClick.def
index c85b4f6..46b6cd4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_ListRoutings_MenuThermalTrialRatio_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_ListRoutings_MenuHotTestRatio_OnClick.def
@@ -2,12 +2,12 @@
#parent: ListRoutings
Response OnClick (
Routing selection
-) id:Response_ListRoutings_MenuThermalTrialRatio_OnClick
+) id:Response_MacroPlanner_ListRoutings_MenuHotTestRatio_OnClick
{
#keys: '[415136.0.761890849]'
CanBindMultiple: false
DefinitionID => /ListRoutings/Responsedef_ListRoutings_WebMenu_OnClick
- Initiator: 'MenuThermalTrialRatio'
+ Initiator: 'MenuHotTestRatio'
Precondition:
[*
return MacroPlan::HasMacroPlan( DataHolderActiveScenario.Data(), feedback );
@@ -16,7 +16,7 @@
{
Body:
[*
- dlg := construct( DialogCreateEditThermalTrialRatio );
+ dlg := construct( DialogCreateEditHotTestRatio );
dlg.New( selection, FormRoutings );
*]
GroupServerCalls: false
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Change_loss_setting_view.vw b/_Main/UI/MacroPlannerWebApp/Views/Change_loss_setting_view.vw
index cb2cbed..0d6a63f 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/Change_loss_setting_view.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/Change_loss_setting_view.vw
@@ -4,11 +4,11 @@
{
forms
{
- form_FormChangeLossSetting
+ form_FormChangeoverLossSetting
{
- title: 'QMacroPlanner::FormChangeLossSetting'
+ title: 'QMacroPlanner::FormChangeoverLossSetting'
shown: true
- componentID: 'QMacroPlanner::FormChangeLossSetting'
+ componentID: 'QMacroPlanner::FormChangeoverLossSetting'
layout
{
mode: 'open'
@@ -19,10 +19,18 @@
}
components
{
- FormChangeLossSetting_ListChangeLossSetting
+ FormChangeoverLossSetting_PanelHeader
+ {
+ sizeRatio: 1
+ }
+ FormChangeoverLossSetting_PanelList
+ {
+ sizeRatio: 1
+ }
+ FormChangeoverLossSetting_ListChangeLossSetting
{
}
- FormChangeLossSetting_DataSetLevelChangeLossSetting
+ FormChangeoverLossSetting_DataSetLevelChangeLossSetting
{
groupDepth: -1
column_Unit_ID
diff --git a/_var/_Main/Data/MP_ChangeoverLossSetting.xlsx b/_var/_Main/Data/MP_ChangeoverLossSetting.xlsx
new file mode 100644
index 0000000..47f6222
--- /dev/null
+++ b/_var/_Main/Data/MP_ChangeoverLossSetting.xlsx
Binary files differ
--
Gitblit v1.9.3