From 489c4a56c97d4441f54c7b60ede2864681a3620b Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期一, 25 九月 2023 20:35:51 +0800 Subject: [PATCH] Merge branch 'dev_lhj' into dev --- _Main/BL/EDI/Broker_GlobalOTDTable_CAR_Export.qbl | 65 ++ _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/_ROOT_Type_CapacityAllocationResultsRuleConfiguration.qbl | 10 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuSelectAll_OnClic.def | 17 _Main/UI/MacroPlanner/Component_FormTestButtonCollection/Response_Button398_OnClick.def | 2 _Main/BL/Type_CapacityAllocationResults/StaticMethod_Export.qbl | 13 _Main/BL/Type_CapacityAllocationResults/Attribute_ManufacturedDate.qbl | 7 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def | 34 + _Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTD.qbl | 23 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listContextMenuCapacityAllocationResultsRuleConfiguration.def | 59 ++ _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/TypeIndex_CapacityAllocationResultsRuleConfigurationTypeIndex.qbl | 20 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def | 4 _Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Export.qbl | 49 + _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_PanelCapacityAllocationResults.def | 37 + _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_DataHolderSelectCapacityAllocationResultsRuleConfiguration_OnDataCh.def | 18 _Main/BL/Type_CapacityAllocationResults/Attribute_ProductID.qbl | 7 _Main/UI/MacroPlannerWebApp/Views/Test.vw | 177 +++++++ _Main/BL/Type_CapacityAllocationResults/Attribute_StockingPointID.qbl | 7 _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_PanelMaterialCode.qbl | 9 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuDelete_OnClick.def | 18 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_abgTest_btnTest_OnClick.def | 16 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listContextMenuCapacityAllocationResults.def | 2 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_ListCapacityAllocationResults.def | 14 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def | 59 ++ _Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl | 35 _var/_Main/ProjSettings/MacroPlannerWebApp/Views/Test.vw | 42 + _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl | 14 _Main/BL/Type_CapacityAllocationResults/Attribute_Description.qbl | 7 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_Edit.def | 17 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR#39.def | 16 _Main/BL/Type_CapacityAllocationResults/Attribute_Date.qbl | 7 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/_ROOT_Component_FormCapacityAllocationResultsRuleConfiguration.def | 43 + _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgTest.def | 25 + _Main/BL/Type_CapacityAllocationResults/Attribute_ID.qbl | 7 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listActionBarPageCapacityAllocationResultsRuleConfiguration.def | 10 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def | 16 _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_ModuleMaterialCode.qbl | 9 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def | 14 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 1 _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_StockingPointID.qbl | 9 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/_ROOT_Component_DialogCreateEditCapacityAllocationResultsRuleConfiguration.def | 32 + _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listActionBarPageCapacityAllocationResults.def | 2 _Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl | 94 +++ _Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl | 21 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def | 58 ++ _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_applicationDevelopmentActionBarPageDef#1.def | 8 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlActions.def | 40 + _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Import.qbl | 14 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def | 37 + _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnCancel_OnClick.def | 15 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def | 29 + _Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl | 15 _Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_CapacityAllocationResult.qbl | 23 _Main/BL/Type_CapacityAllocationResults/Attribute_UserQuantity.qbl | 7 /dev/null | 16 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuNew_OnClick.def | 19 _Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Import.qbl | 49 + _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_Division.qbl | 8 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/_ROOT_Component_FormCapacityAllocationResults.def | 12 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_Export_OnClick.def | 16 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuEdit_OnClick.def | 21 60 files changed, 1,413 insertions(+), 62 deletions(-) diff --git a/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Export.qbl b/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Export.qbl new file mode 100644 index 0000000..d50d284 --- /dev/null +++ b/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Export.qbl @@ -0,0 +1,49 @@ +Quintiq file version 2.0 +#parent: #root +EDIBroker GlobalOTDTable_CARRC_Export +{ + MDSDefinition: GlobalOTDTable + TimeZone: 'ACT' + UseOSTimeZone: false + EDIModelLink.Source Source11 + { + EDIMLTable CapacityAllocationResultsRuleConfiguration + { + PrimaryKeyColumns: ModuleMaterialCode + PrimaryKeyColumns: PanelMaterialCode + PrimaryKeyColumns: StockingPointID + TargetType: CapacityAllocationResultsRuleConfiguration + TypeIndex: CapacityAllocationResultsRuleConfigurationTypeIndex + EDIMLColumn Division { Attribute: Division ValueType: String } + EDIMLColumn ModuleMaterialCode { Attribute: ModuleMaterialCode ValueType: String } + EDIMLColumn PanelMaterialCode { Attribute: PanelMaterialCode ValueType: String } + EDIMLColumn StockingPointID { Attribute: StockingPointID ValueType: String } + } + } + EDITransformation.Transformation Transformation11 + { + EDITableTransformation + { + InputTable: CapacityAllocationResultsRuleConfiguration + OutputTable: CapacityAllocationResultsRuleConfiguration + EDIColumnMatch { InputColumn: Division OutputColumn: Division } + EDIColumnMatch { InputColumn: ModuleMaterialCode OutputColumn: ModuleMaterialCode } + EDIColumnMatch { InputColumn: PanelMaterialCode OutputColumn: PanelMaterialCode } + EDIColumnMatch { InputColumn: StockingPointID OutputColumn: StockingPointID } + } + } + EDIXLSLink.Destination Destination12 + { + FileName: 'Destination12' + EDIXLSLinkTable CapacityAllocationResultsRuleConfiguration + { + Columns: + [ + EDIXLSLinkColumn Division { ValueType: String } + EDIXLSLinkColumn ModuleMaterialCode { ValueType: String } + EDIXLSLinkColumn PanelMaterialCode { ValueType: String } + EDIXLSLinkColumn StockingPointID { ValueType: String } + ] + } + } +} diff --git a/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Import.qbl b/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Import.qbl new file mode 100644 index 0000000..e539ed2 --- /dev/null +++ b/_Main/BL/EDI/Broker_GlobalOTDTable_CARRC_Import.qbl @@ -0,0 +1,49 @@ +Quintiq file version 2.0 +#parent: #root +EDIBroker GlobalOTDTable_CARRC_Import +{ + MDSDefinition: GlobalOTDTable + TimeZone: 'ACT' + UseOSTimeZone: false + EDIModelLink.Destination Destination13 + { + EDIMLTable CapacityAllocationResultsRuleConfiguration + { + PrimaryKeyColumns: ModuleMaterialCode + PrimaryKeyColumns: PanelMaterialCode + PrimaryKeyColumns: StockingPointID + TargetType: CapacityAllocationResultsRuleConfiguration + TypeIndex: CapacityAllocationResultsRuleConfigurationTypeIndex + EDIMLColumn Division { Attribute: Division ValueType: String } + EDIMLColumn ModuleMaterialCode { Attribute: ModuleMaterialCode ValueType: String } + EDIMLColumn PanelMaterialCode { Attribute: PanelMaterialCode ValueType: String } + EDIMLColumn StockingPointID { Attribute: StockingPointID ValueType: String } + } + } + EDITransformation.Transformation Transformation12 + { + EDITableTransformation + { + InputTable: CapacityAllocationResultsRuleCo + OutputTable: CapacityAllocationResultsRuleConfiguration + EDIColumnMatch { InputColumn: Division OutputColumn: Division } + EDIColumnMatch { InputColumn: ModuleMaterialCode OutputColumn: ModuleMaterialCode } + EDIColumnMatch { InputColumn: PanelMaterialCode OutputColumn: PanelMaterialCode } + EDIColumnMatch { InputColumn: StockingPointID OutputColumn: StockingPointID } + } + } + EDIXLSLink.Source Source12 + { + FileName: '浜ц兘鍒嗛厤缁撴灉瑙勫垯.xlsx' + EDIXLSLinkTable CapacityAllocationResultsRuleCo + { + Columns: + [ + EDIXLSLinkColumn Division { ValueType: String } + EDIXLSLinkColumn ModuleMaterialCode { ValueType: String } + EDIXLSLinkColumn PanelMaterialCode { ValueType: String } + EDIXLSLinkColumn StockingPointID { ValueType: String } + ] + } + } +} diff --git a/_Main/BL/EDI/Broker_GlobalOTDTable_CAR_Export.qbl b/_Main/BL/EDI/Broker_GlobalOTDTable_CAR_Export.qbl new file mode 100644 index 0000000..571fce9 --- /dev/null +++ b/_Main/BL/EDI/Broker_GlobalOTDTable_CAR_Export.qbl @@ -0,0 +1,65 @@ +Quintiq file version 2.0 +#parent: #root +EDIBroker GlobalOTDTable_CAR_Export +{ + MDSDefinition: GlobalOTDTable + TimeZone: 'ACT' + UseOSTimeZone: false + EDIModelLink.Source Source13 + { + EDIMLTable CapacityAllocationResults + { + TargetType: CapacityAllocationResults + EDIMLColumn Date { Attribute: Date ValueType: Date } + EDIMLColumn Description { Attribute: Description ValueType: String } + EDIMLColumn Division { Attribute: Division ValueType: String } + EDIMLColumn ID { Attribute: ID ValueType: String } + EDIMLColumn ManufacturedDate { Attribute: ManufacturedDate ValueType: Date } + EDIMLColumn ModuleBase { Attribute: ModuleBase ValueType: String } + EDIMLColumn ModuleMaterialCode { Attribute: ModuleMaterialCode ValueType: String } + EDIMLColumn ModuleMeasurementUnit { Attribute: ModuleMeasurementUnit ValueType: String } + EDIMLColumn NumberOfModules { Attribute: NumberOfModules ValueType: Real } + EDIMLColumn NumberOfPanels { Attribute: NumberOfPanels ValueType: Real } + EDIMLColumn PanelBase { Attribute: PanelBase ValueType: String } + EDIMLColumn PanelMaterialCode { Attribute: PanelMaterialCode ValueType: String } + EDIMLColumn PanelMeasurementUnit { Attribute: PanelMeasurementUnit ValueType: String } + EDIMLColumn ProductID { Attribute: ProductID ValueType: String } + EDIMLColumn RequirementDate { Attribute: RequirementDate ValueType: Date } + EDIMLColumn StockingPointID { Attribute: StockingPointID ValueType: String } + EDIMLColumn UserQuantity { Attribute: UserQuantity ValueType: Real } + EDIMLColumn VersionNumber { Attribute: VersionNumber ValueType: String } + } + } + EDITransformation.Transformation Transformation13 + { + EDITableTransformation + { + InputTable: CapacityAllocationResults + OutputTable: CapacityAllocationResults + EDIColumnMatch { InputColumn: Date OutputColumn: Date } + EDIColumnMatch { InputColumn: Description OutputColumn: Description } + EDIColumnMatch { InputColumn: ID OutputColumn: ID } + EDIColumnMatch { InputColumn: ManufacturedDate OutputColumn: ManufacturedDate } + EDIColumnMatch { InputColumn: ProductID OutputColumn: ProductID } + EDIColumnMatch { InputColumn: StockingPointID OutputColumn: StockingPointID } + EDIColumnMatch { InputColumn: UserQuantity OutputColumn: UserQuantity } + } + } + EDIXLSLink.Destination Destination14 + { + FileName: 'Destination14' + EDIXLSLinkTable CapacityAllocationResults + { + Columns: + [ + EDIXLSLinkColumn Date { ValueType: Date } + EDIXLSLinkColumn Description { ValueType: String } + EDIXLSLinkColumn ID { ValueType: String } + EDIXLSLinkColumn ProductID { ValueType: String } + EDIXLSLinkColumn StockingPointID { ValueType: String } + EDIXLSLinkColumn UserQuantity { ValueType: Real } + EDIXLSLinkColumn ManufacturedDate { ValueType: Date } + ] + } + } +} diff --git a/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_CapacityAllocationResult.qbl b/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_CapacityAllocationResult.qbl new file mode 100644 index 0000000..744cd1a --- /dev/null +++ b/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_CapacityAllocationResult.qbl @@ -0,0 +1,23 @@ +Quintiq file version 2.0 +#parent: #root +Relation CapacityAllocationResultsRuleConfiguration_CapacityAllocationResults_CapacityAllocationResults_CapacityAllocationResultsRuleConfiguration +{ + #keys: '1[414702.0.387791788]' + DefaultRelationStrategy + { + } + RelationSide.LeftSide CapacityAllocationResults + { + #keys: '3[414702.0.387791790][414702.0.387791789][414702.0.387791791]' + Cardinality: '1toN' + ObjectDefinition: CapacityAllocationResultsRuleConfiguration + OwningSide: 'Reference' + } + RelationSide.RightSide CapacityAllocationResultsRuleConfiguration + { + #keys: '3[414702.0.387791793][414702.0.387791792][414702.0.387791794]' + Cardinality: '0to1' + ObjectDefinition: CapacityAllocationResults + OwningSide: 'Reference' + } +} diff --git a/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTD.qbl b/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTD.qbl new file mode 100644 index 0000000..40be5f9 --- /dev/null +++ b/_Main/BL/Relations/Relation_CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTD.qbl @@ -0,0 +1,23 @@ +Quintiq file version 2.0 +#parent: #root +Relation CapacityAllocationResultsRuleConfiguration_GlobalOTDTable_GlobalOTDTable_CapacityAllocationResultsRuleConfiguration +{ + #keys: '1[414702.0.374991408]' + DefaultRelationStrategy + { + } + RelationSide.LeftSide GlobalOTDTable + { + #keys: '3[414702.0.374991410][414702.0.374991409][414702.0.374991411]' + Cardinality: '0to1' + ObjectDefinition: CapacityAllocationResultsRuleConfiguration + OwningSide: 'Reference' + } + RelationSide.RightSide CapacityAllocationResultsRuleConfiguration + { + #keys: '3[414702.0.374991413][414702.0.374991412][414702.0.374991414]' + Cardinality: '1toN' + ObjectDefinition: GlobalOTDTable + OwningSide: 'Owned' + } +} diff --git a/_Main/BL/Type_CapacityAllocationResults/Attribute_Date.qbl b/_Main/BL/Type_CapacityAllocationResults/Attribute_Date.qbl new file mode 100644 index 0000000..a158e2b --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/Attribute_Date.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute Date +{ + #keys: '3[414702.0.388471426][414702.0.388471425][414702.0.388471427]' + ValueType: Date +} diff --git a/_Main/BL/Type_CapacityAllocationResults/Attribute_Description.qbl b/_Main/BL/Type_CapacityAllocationResults/Attribute_Description.qbl new file mode 100644 index 0000000..4d7f093 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/Attribute_Description.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute Description +{ + #keys: '3[414702.0.388471436][414702.0.388471435][414702.0.388471437]' + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResults/Attribute_ID.qbl b/_Main/BL/Type_CapacityAllocationResults/Attribute_ID.qbl new file mode 100644 index 0000000..3a52d76 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/Attribute_ID.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute ID +{ + #keys: '3[414702.0.388471446][414702.0.388471445][414702.0.388471447]' + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResults/Attribute_ManufacturedDate.qbl b/_Main/BL/Type_CapacityAllocationResults/Attribute_ManufacturedDate.qbl new file mode 100644 index 0000000..15ee01f --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/Attribute_ManufacturedDate.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute ManufacturedDate +{ + #keys: '3[414702.0.388471486][414702.0.388471485][414702.0.388471487]' + ValueType: Date +} diff --git a/_Main/BL/Type_CapacityAllocationResults/Attribute_ProductID.qbl b/_Main/BL/Type_CapacityAllocationResults/Attribute_ProductID.qbl new file mode 100644 index 0000000..ca7c6e4 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/Attribute_ProductID.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute ProductID +{ + #keys: '3[414702.0.388471456][414702.0.388471455][414702.0.388471457]' + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResults/Attribute_StockingPointID.qbl b/_Main/BL/Type_CapacityAllocationResults/Attribute_StockingPointID.qbl new file mode 100644 index 0000000..2a28f0d --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/Attribute_StockingPointID.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute StockingPointID +{ + #keys: '3[414702.0.388471466][414702.0.388471465][414702.0.388471467]' + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResults/Attribute_UserQuantity.qbl b/_Main/BL/Type_CapacityAllocationResults/Attribute_UserQuantity.qbl new file mode 100644 index 0000000..9c3d31c --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/Attribute_UserQuantity.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute UserQuantity +{ + #keys: '3[414702.0.388471476][414702.0.388471475][414702.0.388471477]' + ValueType: Real +} diff --git a/_Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl b/_Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl new file mode 100644 index 0000000..59c9af0 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/DeclarativeReferenceRelation_CalcCapacityAllocationResultsRuleConfiguration.qbl @@ -0,0 +1,15 @@ +Quintiq file version 2.0 +#parent: #root +DeclarativeReferenceRelation CalcCapacityAllocationResultsRuleConfiguration +{ + #keys: '1[414702.0.388304510]' + Expression: + [* + targetCapacityAllocationResultsRuleConfiguration := select( this.GlobalOTDTable(), CapacityAllocationResultsRuleConfiguration, tempCARRC, + tempCARRC.ModuleMaterialCode() = this.ModuleMaterialCode() and + tempCARRC.PanelMaterialCode() = this.PanelMaterialCode() ); + + return targetCapacityAllocationResultsRuleConfiguration; + *] + Relation: CapacityAllocationResultsRuleConfiguration +} diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl index ef9782f..119198c 100644 --- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl +++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate.qbl @@ -2,27 +2,32 @@ #parent: #root StaticMethod CreateDate ( GlobalOTDTable globalOTDTable, - MacroPlan macroPlan + MacroPlan macroPlan, + Scenario scenario ) { TextBody: [* globalOTDTable.CapacityAllocationResults( relflush ); - finaleProduct_MPs := CapacityAllocationResults::ObtainTheFinalOutputProduct( macroPlan ); + finaleProductInStockingPoint_MPs := CapacityAllocationResults::ObtainTheFinalOutputProduct( macroPlan, globalOTDTable ); period_MPS := null( Period_MPs ); traverse ( macroPlan, PeriodSpecification_MP, psmp, psmp.ID() = "Planning periods" ) { period_MPS := selectsortedset( psmp, PeriodSpecificationPeriod.Period_MP, pmp, not pmp.IsHistorical(), pmp.StartDate() ); } - traverse ( finaleProduct_MPs, Elements, fpmp/*, fpmp.ID() = "ProXOver 1 D2.6 A"*/ ) { - traverse ( fpmp, ProductInStockingPoint_MP, pisp, /*pisp.Name() = "ProXOver 1 D2.6 A in Finished Cars (France)" and*/ not pisp.IsSystem() ) { - traverse ( period_MPS, Elements, pmp ) { - CapacityAllocationResults::IterativeGeneration( globalOTDTable, pisp, 1, null( NewSupply ), -1.0, pmp.StartDate() ); - } - // info( pisp.Name() ); + traverse ( finaleProductInStockingPoint_MPs, Elements, fpispmp ) { + capacityAllocationResultsRuleConfigurations := selectset( globalOTDTable, CapacityAllocationResultsRuleConfiguration, tempCARRC, tempCARRC.ModuleMaterialCode() = fpispmp.ProductID() and tempCARRC.StockingPointID() = fpispmp.StockingPointID() ); + info( "鐢熶骇鐨勪骇鍝侊細", fpispmp.ProductID(), "------浜у搧鍦ㄥ簱瀛樼偣-------锛�", fpispmp.StockingPointID() ); + traverse ( period_MPS, Elements, pmp ) { + // CapacityAllocationResults::IterativeGeneration( globalOTDTable, pisp, 1, null( NewSupply ), -1.0, pmp.StartDate() ); 鑰佺増 + CapacityAllocationResults::IterativeGeneration2( globalOTDTable, fpispmp, pmp.StartDate(), capacityAllocationResultsRuleConfigurations, 0, null( NewSupply ), 0.0 ); } } + + traverse ( globalOTDTable, CapacityAllocationResults, car ) { + car.VersionNumber( scenario.Name() ); + } *] } diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Export.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Export.qbl new file mode 100644 index 0000000..14045dd --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Export.qbl @@ -0,0 +1,13 @@ +Quintiq file version 2.0 +#parent: #root +StaticMethod Export ( + GlobalOTDTable globalOTDTable +) as BinaryValue +{ + TextBody: + [* + binaryData := globalOTDTable.GlobalOTDTable_CAR_Export().ExecuteToXLS( true ); + + return binaryData.AsBinaryValue(); + *] +} diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl new file mode 100644 index 0000000..3f70ca5 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration2.qbl @@ -0,0 +1,94 @@ +Quintiq file version 2.0 +#parent: #root +StaticMethod IterativeGeneration2 ( + GlobalOTDTable globalOTDTable, + ProductInStockingPoint_MP pisp, + Date targetDate, + CapacityAllocationResultsRuleConfigurations carrcs, + Number numberOfLayers, + NewSupply firstLevelSupply, + Real currentLayerDependentDemandQuantity +) +{ + TextBody: + [* + numberOfLayers++; + info( "鐩爣鏃堕棿锛�", targetDate.Format( "Y-M2-D2" ) ); + info( pisp.Name() ); + traverse ( pisp, ProductInStockingPointInPeriodPlanning.astype( ProductInStockingPointInPeriodPlanningLeaf ), pispippl, pispippl.Start().Date() = targetDate ) { + traverse ( pispippl, NewSupply, ns, ns.Quantity() > 0 ) { + if ( numberOfLayers = 1 ) { + firstLevelSupply := ns; + } + + ontype( ns.PeriodTask_MP() ) { + PeriodTaskOperation as pto : { + info( "Operation鍛ㄦ湡浠诲姟..." ); + traverse ( ns, PeriodTask_MP.astype( PeriodTaskOperation ).DependentDemand, dd ) { + currentLayerDependentDemandQuantity := currentLayerDependentDemandQuantity * + ns.ProcessOutput().astype( OperationOutput ).Quantity() * + dd.ProcessInput().astype( OperationInput ).Quantity(); + info( "灞傛暟锛�", numberOfLayers, " 褰撳墠渚涘簲鐨刾isp锛�", ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().Name(), " 鎬讳緵搴斿�硷細", ns.Quantity(), " 闇�瑕佷緵搴斿�硷細", currentLayerDependentDemandQuantity, + " 褰撳墠闇�姹俻isp锛�", dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().Name(), " 闇�姹傚�硷細", currentLayerDependentDemandQuantity ); + info( "-----------------------------------------------------------------------------------------------------------------" ); + CapacityAllocationResults::IterativeGeneration2( globalOTDTable, + dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(), + targetDate, + carrcs, + numberOfLayers, + firstLevelSupply, + currentLayerDependentDemandQuantity + ); + } + carrc := select( carrcs, Elements, carrc, carrc.PanelMaterialCode() = ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID() ); + if ( not isnull( carrc ) ) { + info( "鎵惧埌闈㈡澘鐗╂枡..." ); + globalOTDTable.CapacityAllocationResults( relnew, + PanelBase := pto.Operation().UnitID(), + PanelMaterialCode := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(), + NumberOfPanels := currentLayerDependentDemandQuantity, + PanelMeasurementUnit := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().UnitOfMeasureName(), + ModuleMaterialCode := firstLevelSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(), + NumberOfModules := firstLevelSupply.Quantity(), + ModuleMeasurementUnit := firstLevelSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().UnitOfMeasureName(), + ModuleBase := guard( firstLevelSupply.PeriodTask_MP().astype( PeriodTaskOperation ).Operation().UnitID(), "杞﹂亾杩愯緭" ), + Division := carrc.Division(), + RequirementDate := ns.Start().Date(), + Date := ns.Start().Date(), + Description := "", + ID := OS::GenerateGUIDAsString(), + ProductID := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(), + StockingPointID := "", + UserQuantity := currentLayerDependentDemandQuantity, + ManufacturedDate := Date::MinDate() + ); + + } + info( "-----------------------------------------------------------------------------------------------------------------" ); + } + + PeriodTaskLaneLeg as ptll : { + targetDependentDemand := select( ptll, DependentDemand, dd, dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID() = ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID() ); + currentLayerDependentDemandQuantity := ifexpr( numberOfLayers = 1, targetDependentDemand.Quantity(), currentLayerDependentDemandQuantity ); + info( "灞傛暟锛�", numberOfLayers," 褰撳墠渚涘簲鐨刾isp锛�", ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().Name(), " 鎬讳緵搴斿�硷細", ns.Quantity(), " 闇�瑕佷緵搴斿�硷細", currentLayerDependentDemandQuantity, + " 褰撳墠闇�姹俻isp锛�", targetDependentDemand.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().Name(), " 闇�姹傚�硷細", currentLayerDependentDemandQuantity ); + info( "LaneLeg鍛ㄦ湡浠诲姟..." ); + info( "-----------------------------------------------------------------------------------------------------------------" ); + CapacityAllocationResults::IterativeGeneration2( globalOTDTable, + targetDependentDemand.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(), + targetDate, + carrcs, + numberOfLayers, + firstLevelSupply, + currentLayerDependentDemandQuantity + ); + } + } + + if ( numberOfLayers = 1 ) { + firstLevelSupply := null( NewSupply ); + } + } + } + *] +} diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl index 0db5a04..6501563 100644 --- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl +++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_ObtainTheFinalOutputProduct.qbl @@ -1,25 +1,30 @@ Quintiq file version 2.0 #parent: #root StaticMethod ObtainTheFinalOutputProduct ( - MacroPlan macroPlan -) as owning Product_MPs + MacroPlan macroPlan, + GlobalOTDTable globalOTDTable +) as owning ProductInStockingPoint_MPs { TextBody: [* - finaleProducts := construct( Product_MPs ); + //finaleProducts := construct( Product_MPs ); + // + //traverse ( macroPlan, Product_MP, pmp, pmp.IsLeaf() ) { + // flag := true; + // traverse ( macroPlan, Routing.RoutingStep.Operation.OperationInput, oi, flag ) { + // if ( pmp = oi.ProductInStockingPoint_MP().Product_MP() ) { + // flag := false; + // } + // } + // if ( flag ) { + // finaleProducts.Add( pmp ); + // } + //} - traverse ( macroPlan, Product_MP, pmp, pmp.IsLeaf() ) { - flag := true; - traverse ( macroPlan, Routing.RoutingStep.Operation.OperationInput, oi, flag ) { - if ( pmp = oi.ProductInStockingPoint_MP().Product_MP() ) { - flag := false; - } - } - if ( flag ) { - finaleProducts.Add( pmp ); - } - } + finaleProductInStockingPoint_MPs := selectset( macroPlan, Product_MP.ProductInStockingPoint_MP, tempPISPMP, + exists( globalOTDTable, CapacityAllocationResultsRuleConfiguration, tempCARRC, tempCARRC.ModuleMaterialCode() = tempPISPMP.ProductID() and tempCARRC.StockingPointID() = tempPISPMP.StockingPointID() ) + ); - return &finaleProducts; + return &finaleProductInStockingPoint_MPs; *] } diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_Division.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_Division.qbl new file mode 100644 index 0000000..2b0b5c3 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_Division.qbl @@ -0,0 +1,8 @@ +Quintiq file version 2.0 +#parent: #root +Attribute Division +{ + #keys: '3[414702.0.374991447][414702.0.374991446][414702.0.374991448]' + Description: '浜嬩笟閮�' + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_ModuleMaterialCode.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_ModuleMaterialCode.qbl new file mode 100644 index 0000000..ca60799 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_ModuleMaterialCode.qbl @@ -0,0 +1,9 @@ +Quintiq file version 2.0 +#parent: #root +Attribute ModuleMaterialCode +{ + #keys: '3[414702.0.374991437][414702.0.374991436][414702.0.374991438]' + Description: '妯$粍鐗╂枡缂栫爜' + IsReadOnly: true + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_PanelMaterialCode.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_PanelMaterialCode.qbl new file mode 100644 index 0000000..02037a2 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_PanelMaterialCode.qbl @@ -0,0 +1,9 @@ +Quintiq file version 2.0 +#parent: #root +Attribute PanelMaterialCode +{ + #keys: '3[414702.0.374991427][414702.0.374991426][414702.0.374991428]' + Description: '闈㈡澘鐗╂枡缂栫爜' + IsReadOnly: true + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_StockingPointID.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_StockingPointID.qbl new file mode 100644 index 0000000..fb82a94 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/Attribute_StockingPointID.qbl @@ -0,0 +1,9 @@ +Quintiq file version 2.0 +#parent: #root +Attribute StockingPointID +{ + #keys: '3[414702.0.375010145][414702.0.375010144][414702.0.375010146]' + Description: '妯$粍浜ф垚鍝佸簱瀛樼偣ID' + IsReadOnly: true + ValueType: String +} diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl new file mode 100644 index 0000000..4397413 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Export.qbl @@ -0,0 +1,14 @@ +Quintiq file version 2.0 +#parent: #root +StaticMethod Export ( + GlobalOTDTable globalOTDTable +) as BinaryValue +{ + TextBody: + [* + // hongjli Sep-25-2023 (created) + binaryValue := globalOTDTable.GlobalOTDTable_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 new file mode 100644 index 0000000..a4eddc6 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_Import.qbl @@ -0,0 +1,14 @@ +Quintiq file version 2.0 +#parent: #root +StaticMethod Import ( + GlobalOTDTable globalOTDTable, + String base64String +) +{ + TextBody: + [* + binaryData := BinaryData::FromBase64EncodedString( base64String ); + + globalOTDTable.GlobalOTDTable_CARRC_Import().ExecuteFromXLS( &binaryData, true ); + *] +} diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/TypeIndex_CapacityAllocationResultsRuleConfigurationTypeIndex.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/TypeIndex_CapacityAllocationResultsRuleConfigurationTypeIndex.qbl new file mode 100644 index 0000000..ea74562 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/TypeIndex_CapacityAllocationResultsRuleConfigurationTypeIndex.qbl @@ -0,0 +1,20 @@ +Quintiq file version 2.0 +#parent: #root +TypeIndex CapacityAllocationResultsRuleConfigurationTypeIndex +{ + Attributes: + [ + TypeIndexAttribute + { + ModelElement: ModuleMaterialCode + } + TypeIndexAttribute + { + ModelElement: PanelMaterialCode + } + TypeIndexAttribute + { + ModelElement: StockingPointID + } + ] +} diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/_ROOT_Type_CapacityAllocationResultsRuleConfiguration.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/_ROOT_Type_CapacityAllocationResultsRuleConfiguration.qbl new file mode 100644 index 0000000..7e012c9 --- /dev/null +++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/_ROOT_Type_CapacityAllocationResultsRuleConfiguration.qbl @@ -0,0 +1,10 @@ +Quintiq file version 2.0 +#root +#parent: #DomainModel +Type CapacityAllocationResultsRuleConfiguration +{ + #keys: '5[414702.0.374991403][414702.0.374991401][0.0.0][414702.0.374991402][414702.0.374991404]' + BaseType: Object + Description: '浜ц兘鍒嗛厤缁撴灉锛岃鍒欓厤缃�' + StructuredName: 'CapacityAllocationResultsRuleConfigurations' +} diff --git a/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/Response_Button398_OnClick.def b/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/Response_Button398_OnClick.def index 7b1da32..e164af9 100644 --- a/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/Response_Button398_OnClick.def +++ b/_Main/UI/MacroPlanner/Component_FormTestButtonCollection/Response_Button398_OnClick.def @@ -5,7 +5,7 @@ #keys: '[414702.0.340554926]' Body: [* - CapacityAllocationResults::CreateDate( GlobalOTDTable, MacroPlan ); + CapacityAllocationResults::CreateDate( GlobalOTDTable, MacroPlan, SelectionScenario.Data() ); *] CanBindMultiple: false DefinitionID: 'Responsedef_GUIButtonBase_OnClick' diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgTest.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgTest.def new file mode 100644 index 0000000..e7f2aa2 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgTest.def @@ -0,0 +1,25 @@ +Quintiq file version 2.0 +Component abgTest +{ + #keys: '[414702.0.358311816]' + BaseType: 'WebActionBarGroup' + Children: + [ + Component btnTest + { + #keys: '[414702.0.358311907]' + BaseType: 'WebButton' + Properties: + [ + Image: 'WATER_FISH' + Label: '娴嬭瘯瑙嗗浘' + Taborder: 0 + ] + } + ] + Properties: + [ + Taborder: 4 + Title: 'TestView' + ] +} diff --git "a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_applicationDevelopmentActionBarPageDef\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_applicationDevelopmentActionBarPageDef\0431.def" new file mode 100644 index 0000000..42787dc --- /dev/null +++ "b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_applicationDevelopmentActionBarPageDef\0431.def" @@ -0,0 +1,8 @@ +Quintiq file version 2.0 +Component applicationDevelopmentActionBarPageDef id:applicationDevelopmentActionBarPageDef_1 #extension +{ + Children: + [ + #child: abgTest + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_abgTest_btnTest_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_abgTest_btnTest_OnClick.def new file mode 100644 index 0000000..8b67882 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_abgTest_btnTest_OnClick.def @@ -0,0 +1,16 @@ +Quintiq file version 2.0 +#parent: abgTest/btnTest +Response OnClick () id:Response_TIANMA_JITUAN_abgTest_btnTest_OnClick +{ + #keys: '[414702.0.358346189]' + CanBindMultiple: false + DefinitionID: 'Responsedef_WebButton_OnClick' + GroupServerCalls: true + QuillAction + { + Body: + [* + ApplicationScope.ViewManager().ResetUserViewById( "Test", true ); + *] + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def index 2ee31ab..b0bcb6e 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def +++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def @@ -11,6 +11,7 @@ [ #child: ActionBarPageData #child: ActionBarPageSales + #child: applicationDevelopmentActionBarPageDef_1 ] } Component DataHolderCapacityAndSaleBudgeFilterItem diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlActions.def new file mode 100644 index 0000000..0e13477 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlActions.def @@ -0,0 +1,40 @@ +Quintiq file version 2.0 +Component pnlActions +{ + #keys: '[414702.0.373821470]' + BaseType: 'WebPanel' + Children: + [ + Component btnOk + { + #keys: '[414702.0.373821474]' + BaseType: 'WebButton' + Properties: + [ + Label: 'OK' + Taborder: 0 + ] + } + Component btnCancel + { + #keys: '[414702.0.373821476]' + BaseType: 'WebButton' + Properties: + [ + Label: 'Cancel' + Taborder: 1 + ] + } + ] + Properties: + [ + Alignment: 'trailing' + Border: true + ExcludeFromActiveComponent: true + FixedSize: true + Orientation: 'horizontal' + Padding: 'true' + Style: 'footer' + Taborder: 1 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def new file mode 100644 index 0000000..f885a86 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def @@ -0,0 +1,58 @@ +Quintiq file version 2.0 +Component pnlContent +{ + #keys: '[414702.0.373821468]' + BaseType: 'WebPanel' + Children: + [ + Component efPanelMaterialCode + { + #keys: '[414702.0.375722232]' + BaseType: 'WebEditField' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.PanelMaterialCode' + Label: '闈㈡澘鐗╂枡缂栫爜' + Taborder: 0 + ] + } + Component efModuleMaterialCode + { + #keys: '[414702.0.375722245]' + BaseType: 'WebEditField' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.ModuleMaterialCode' + Label: '妯℃澘浜ф垚鍝両D' + Taborder: 1 + ] + } + Component efDivision + { + #keys: '[414702.0.375722257]' + BaseType: 'WebEditField' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.Division' + Label: '浜嬩笟閮�' + Taborder: 2 + ] + } + Component efStockingPointID + { + #keys: '[414702.0.375874061]' + BaseType: 'WebEditField' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.StockingPointID' + Label: '妯$粍浜ф垚鍝佸簱瀛樼偣ID' + Taborder: 3 + ] + } + ] + Properties: + [ + Padding: 'true' + Taborder: 0 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_Edit.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_Edit.def new file mode 100644 index 0000000..77662e1 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_Edit.def @@ -0,0 +1,17 @@ +Quintiq file version 2.0 +#parent: #root +Method Edit ( + CapacityAllocationResultsRuleConfiguration selection +) id:Method_DialogCreateEditCapacityAllocationResultsRuleConfiguration_Edit +{ + #keys: '[414702.0.375759040]' + Body: + [* + // Edits assumption + data := shadow( selection ); + + DataHolderDialogData.Data( &data ); + + ApplicationMacroPlanner.ShowFormModal( this ); + *] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def new file mode 100644 index 0000000..fa8fb18 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def @@ -0,0 +1,14 @@ +Quintiq file version 2.0 +#parent: #root +Method New () id:Method_DialogCreateEditCapacityAllocationResultsRuleConfiguration_New +{ + #keys: '[414702.0.375317354]' + Body: + [* + capacityAllocationResultsRuleConfiguration := GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relshadow ); + + DataHolderDialogData.Data( &capacityAllocationResultsRuleConfiguration ); + + ApplicationMacroPlanner.ShowFormModal( this ); + *] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnCancel_OnClick.def new file mode 100644 index 0000000..057d12d --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnCancel_OnClick.def @@ -0,0 +1,15 @@ +Quintiq file version 2.0 +#parent: pnlActions/btnCancel +Response OnClick () id:Response_pnlActions_btnCancel_OnClick +{ + #keys: '[414702.0.373821480]' + DefinitionID: 'Responsedef_WebButton_OnClick' + GroupServerCalls: true + QuillAction + { + Body: + [* + Form.Close(); + *] + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def new file mode 100644 index 0000000..336e9a8 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Response_pnlActions_btnOk_OnClick.def @@ -0,0 +1,34 @@ +Quintiq file version 2.0 +#parent: pnlActions/btnOk +Response OnClick () id:Response_pnlActions_btnOk_OnClick +{ + #keys: '[414702.0.373821479]' + DefinitionID: 'Responsedef_WebButton_OnClick' + QuillAction + { + Body: + [* + Form.ApplyChanges(); + + data := DataHolderDialogData.Data().WrappedInstance(); + if ( isnull( data ) ) { + GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relnew, + PanelMaterialCode := efPanelMaterialCode.Text(), + ModuleMaterialCode := efModuleMaterialCode.Text(), + Division := efDivision.Text(), + StockingPointID := efStockingPointID.Text() + ); + } else { + DataHolderDialogData.Data().PanelMaterialCode( efPanelMaterialCode.Text() ); + DataHolderDialogData.Data().ModuleMaterialCode( efModuleMaterialCode.Text() ); + DataHolderDialogData.Data().Division( efDivision.Text() ); + DataHolderDialogData.Data().StockingPointID( efStockingPointID.Text() ); + DataHolderDialogData.Data().Commit(); + } + + + Form.Close(); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/_ROOT_Component_DialogCreateEditCapacityAllocationResultsRuleConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/_ROOT_Component_DialogCreateEditCapacityAllocationResultsRuleConfiguration.def new file mode 100644 index 0000000..76da375 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/_ROOT_Component_DialogCreateEditCapacityAllocationResultsRuleConfiguration.def @@ -0,0 +1,32 @@ +Quintiq file version 2.0 +#root +#parent: MacroPlannerWebApp +OrphanComponent DialogCreateEditCapacityAllocationResultsRuleConfiguration +{ + #keys: '[414702.0.373821466]' + BaseType: 'WebForm' + Children: + [ + #child: pnlContent + #child: pnlActions + Component DataHolderDialogData + { + #keys: '[414702.0.375413793]' + BaseType: 'WebDataHolder' + Databinding: 'shadow[CapacityAllocationResultsRuleConfiguration]*' + Properties: + [ + Taborder: 2 + ] + } + ] + Properties: + [ + Alignment: 'trailing' + EnterButton: 'btnOk' + EscapeButton: 'btnCancel' + ExcludeFromActiveComponent: true + Image: 'BEAR' + Padding: 'false' + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_ListCapacityAllocationResults.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_ListCapacityAllocationResults.def index c07b922..27d0374 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_ListCapacityAllocationResults.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_ListCapacityAllocationResults.def @@ -1,26 +1,26 @@ Quintiq file version 2.0 Component ListCapacityAllocationResults { - #keys: '[414702.0.338762075]' + #keys: '[414702.0.390053833]' BaseType: 'WebList' Children: [ Component DataExtractorCapacityAllocationResults { - #keys: '[414702.0.338762076]' + #keys: '[414702.0.390053834]' BaseType: 'WebDataExtractor' Properties: [ - DataType: 'GlobalOTDTable' - Source: 'GlobalOTDTable' + DataType: 'structured[CapacityAllocationResultsRuleConfiguration]' + Source: 'FormCapacityAllocationResultsRuleConfiguration.DataHolderSelectCapacityAllocationResultsRuleConfiguration' Taborder: 0 - Transformation: 'CapacityAllocationResults' + Transformation: 'Elements.CapacityAllocationResults' ] } #child: listActionBarPageCapacityAllocationResults Component DataSetLevelCapacityAllocationResults { - #keys: '[414702.0.338762081]' + #keys: '[414702.0.390053839]' BaseType: 'WebDataSetLevel' Children: [ @@ -28,7 +28,7 @@ ] Properties: [ - Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"VersionNumber","title":"VersionNumber","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"VersionNumber"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PanelMeasurementUnit","title":"PanelMeasurementUnit","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PanelMeasurementUnit"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PanelMaterialCode","title":"PanelMaterialCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PanelMaterialCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"NumberOfPanels","title":"NumberOfPanels","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"NumberOfPanels"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PanelMeasurementUnit","title":"PanelMeasurementUnit","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PanelMeasurementUnit"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ModuleMaterialCode","title":"ModuleMaterialCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ModuleMaterialCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"NumberOfModules","title":"NumberOfModules","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"NumberOfModules"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ModuleMeasurementUnit","title":"ModuleMeasurementUnit","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ModuleMeasurementUnit"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ModuleMeasurementUnit","title":"ModuleMeasurementUnit","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ModuleMeasurementUnit"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Division","title":"Division","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Division"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"RequirementDate","title":"RequirementDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"RequirementDate"}}]' + Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Date","title":"Date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Date"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Description","title":"Description","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Description"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ID","title":"ID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"StockingPointID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UserQuantity","title":"UserQuantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UserQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ManufacturedDate","title":"ManufacturedDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ManufacturedDate"}}]' ContextMenu: 'listContextMenuCapacityAllocationResults' Taborder: 2 ] diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_PanelCapacityAllocationResults.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_PanelCapacityAllocationResults.def new file mode 100644 index 0000000..a916ec0 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_PanelCapacityAllocationResults.def @@ -0,0 +1,37 @@ +Quintiq file version 2.0 +Component PanelCapacityAllocationResults +{ + #keys: '[414702.0.391687385]' + BaseType: 'WebPanel' + Children: + [ + Component ButtonGenerateCapacityAllocationResults id:ButtonGenerateCapacityAllocationResults_570 + { + #keys: '[414702.0.391717497]' + BaseType: 'WebButton' + Properties: + [ + Image: 'PROCESS' + Label: '鐢熸垚鏁版嵁' + Taborder: 0 + ] + } + Component Export id:Export_398 + { + #keys: '[414702.0.392048461]' + BaseType: 'WebButton' + Properties: + [ + Image: 'EXPORT1' + Label: '瀵煎嚭' + Taborder: 1 + ] + } + ] + Properties: + [ + FixedSize: true + Orientation: 'horizontal' + Taborder: 0 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listActionBarPageCapacityAllocationResults.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listActionBarPageCapacityAllocationResults.def index 5384f4a..81f7ddb 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listActionBarPageCapacityAllocationResults.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listActionBarPageCapacityAllocationResults.def @@ -1,7 +1,7 @@ Quintiq file version 2.0 Component listActionBarPageCapacityAllocationResults { - #keys: '[414702.0.338762078]' + #keys: '[414702.0.390053836]' BaseType: 'listActionBarPage' Properties: [ diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listContextMenuCapacityAllocationResults.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listContextMenuCapacityAllocationResults.def index 62d4067..b7e995a 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listContextMenuCapacityAllocationResults.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listContextMenuCapacityAllocationResults.def @@ -1,7 +1,7 @@ Quintiq file version 2.0 Component listContextMenuCapacityAllocationResults { - #keys: '[414702.0.338762083]' + #keys: '[414702.0.390053841]' BaseType: 'listContextMenu' Properties: [ diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_ButtonGenerateCapacityAllocationResults_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_ButtonGenerateCapacityAllocationResults_OnClick.def deleted file mode 100644 index 2d97d02..0000000 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_ButtonGenerateCapacityAllocationResults_OnClick.def +++ /dev/null @@ -1,16 +0,0 @@ -Quintiq file version 2.0 -#parent: ButtonGenerateCapacityAllocationResults -Response OnClick () id:Response_FormCapacityAllocationResults_ButtonGenerateCapacityAllocationResults_OnClick -{ - #keys: '[414702.0.340111671]' - CanBindMultiple: false - DefinitionID: 'Responsedef_WebButton_OnClick' - QuillAction - { - Body: - [* - CapacityAllocationResults::CreateDate( GlobalOTDTable, MacroPlan ); - *] - GroupServerCalls: false - } -} diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR\04339.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR\04339.def" new file mode 100644 index 0000000..6a4fd16 --- /dev/null +++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_ButtonGenerateCapacityAllocationR\04339.def" @@ -0,0 +1,16 @@ +Quintiq file version 2.0 +#parent: PanelCapacityAllocationResults/ButtonGenerateCapacityAllocationResults_570 +Response OnClick () id:Response_FormCapacityAllocationResults_ButtonGenerateCapacityAllocationResults_OnClick_39 +{ + #keys: '[414702.0.391717496]' + CanBindMultiple: false + DefinitionID: 'Responsedef_WebButton_OnClick' + QuillAction + { + Body: + [* + CapacityAllocationResults::CreateDate( GlobalOTDTable, MacroPlan, DataHolderActiveScenario.Data() ); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_Export_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_Export_OnClick.def new file mode 100644 index 0000000..4428575 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Response_PanelCapacityAllocationResults_Export_OnClick.def @@ -0,0 +1,16 @@ +Quintiq file version 2.0 +#parent: PanelCapacityAllocationResults/Export_398 +Response OnClick () id:Response_PanelCapacityAllocationResults_Export_OnClick +{ + #keys: '[414702.0.391791234]' + CanBindMultiple: false + DefinitionID: 'Responsedef_WebButton_OnClick' + QuillAction + { + Body: + [* + Application.Download( "浜ц兘鍒嗛厤缁撴灉.xlsx", CapacityAllocationResults::Export( GlobalOTDTable ).AsBinaryData() ); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/_ROOT_Component_FormCapacityAllocationResults.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/_ROOT_Component_FormCapacityAllocationResults.def index 432fdfa..983e0ed 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/_ROOT_Component_FormCapacityAllocationResults.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/_ROOT_Component_FormCapacityAllocationResults.def @@ -8,17 +8,7 @@ Children: [ #child: ListCapacityAllocationResults - Component ButtonGenerateCapacityAllocationResults - { - #keys: '[414702.0.340677556]' - BaseType: 'WebButton' - Properties: - [ - Image: 'PROCESS' - Label: '鐢熸垚鏁版嵁' - Taborder: 0 - ] - } + #child: PanelCapacityAllocationResults ] Properties: [ diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def new file mode 100644 index 0000000..add7c86 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_ListCapacityAllocationResultsRuleConfiguration.def @@ -0,0 +1,59 @@ +Quintiq file version 2.0 +Component ListCapacityAllocationResultsRuleConfiguration +{ + #keys: '[414702.0.375255758]' + BaseType: 'WebList' + Children: + [ + Component DataExtractorCapacityAllocationResultsRuleConfiguration + { + #keys: '[414702.0.375255759]' + BaseType: 'WebDataExtractor' + Properties: + [ + DataType: 'GlobalOTDTable' + Source: 'GlobalOTDTable' + Taborder: 0 + Transformation: 'CapacityAllocationResultsRuleConfiguration' + ] + } + #child: listActionBarPageCapacityAllocationResultsRuleConfiguration + Component DataSetLevelCapacityAllocationResultsRuleConfiguration + { + #keys: '[414702.0.375255764]' + BaseType: 'WebDataSetLevel' + Children: + [ + #child: listContextMenuCapacityAllocationResultsRuleConfiguration + ] + Properties: + [ + Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PanelMaterialCode","title":"PanelMaterialCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PanelMaterialCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ModuleMaterialCode","title":"ModuleMaterialCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ModuleMaterialCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Division","title":"Division","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Division"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"StockingPointID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}}]' + ContextMenu: 'listContextMenuCapacityAllocationResultsRuleConfiguration' + Taborder: 2 + ] + } + ] + Properties: + [ + Taborder: 1 + ] + ResponseDefinitions: + [ + DelegatedResponseDefinition OnClick id:Responsedef_ListCapacityAllocationResultsRuleConfiguration_WebMenu_OnClick + { + #keys: '[414702.0.373845107]' + Initiator: 'WebMenu' + IsInherited: false + ResponseType: 'OnClick' + Arguments: + [ + ResponseDefinitionArgument selection + { + #keys: '[811.0.13515064]' + Binding: 'this.Selection()' + } + ] + } + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def new file mode 100644 index 0000000..367ca52 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def @@ -0,0 +1,37 @@ +Quintiq file version 2.0 +Component PanelImportAndExport +{ + #keys: '[414702.0.391512140]' + BaseType: 'WebPanel' + Children: + [ + Component Import + { + #keys: '[414702.0.390081531]' + BaseType: 'WebButton' + Properties: + [ + Image: 'IMPORT1' + Label: '瀵煎叆' + Taborder: 0 + ] + } + Component Export + { + #keys: '[414702.0.391512453]' + BaseType: 'WebButton' + Properties: + [ + Image: 'EXPORT1' + Label: '瀵煎嚭' + Taborder: 1 + ] + } + ] + Properties: + [ + FixedSize: true + Orientation: 'horizontal' + Taborder: 0 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listActionBarPageCapacityAllocationResultsRuleConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listActionBarPageCapacityAllocationResultsRuleConfiguration.def new file mode 100644 index 0000000..cc72a32 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listActionBarPageCapacityAllocationResultsRuleConfiguration.def @@ -0,0 +1,10 @@ +Quintiq file version 2.0 +Component listActionBarPageCapacityAllocationResultsRuleConfiguration +{ + #keys: '[414702.0.375255761]' + BaseType: 'listActionBarPage' + Properties: + [ + Taborder: 1 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listContextMenuCapacityAllocationResultsRuleConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listContextMenuCapacityAllocationResultsRuleConfiguration.def new file mode 100644 index 0000000..597ad1b --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listContextMenuCapacityAllocationResultsRuleConfiguration.def @@ -0,0 +1,59 @@ +Quintiq file version 2.0 +Component listContextMenuCapacityAllocationResultsRuleConfiguration +{ + #keys: '[414702.0.375255766]' + BaseType: 'listContextMenu' + Children: + [ + Component MenuNew + { + #keys: '[414702.0.373851234]' + BaseType: 'WebMenu' + Properties: + [ + Image: 'BEAR' + Taborder: 3 + Title: '鍒涘缓瑙勫垯' + ] + } + Component MenuEdit + { + #keys: '[414702.0.376312130]' + BaseType: 'WebMenu' + Properties: + [ + BindOnDoubleClick: true + Image: 'MESSAGE_EDIT' + Taborder: 4 + Title: '缂栬緫' + ] + } + Component MenuDelete + { + #keys: '[414702.0.382537902]' + BaseType: 'WebMenu' + Properties: + [ + Image: 'DELETE' + Taborder: 5 + Title: '鍒犻櫎' + ] + } + Component MenuSelectAll + { + #keys: '[414702.0.382602953]' + BaseType: 'WebMenu' + Properties: + [ + Image: 'DOCUMENT_SELECTION' + Shortcut: 'Ctrl+A' + Taborder: 6 + Title: '鍏ㄩ��' + ] + } + ] + Properties: + [ + Taborder: 0 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_DataHolderSelectCapacityAllocationResultsRuleConfiguration_OnDataCh.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_DataHolderSelectCapacityAllocationResultsRuleConfiguration_OnDataCh.def new file mode 100644 index 0000000..1c99357 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_DataHolderSelectCapacityAllocationResultsRuleConfiguration_OnDataCh.def @@ -0,0 +1,18 @@ +Quintiq file version 2.0 +#parent: DataHolderSelectCapacityAllocationResultsRuleConfiguration +Response OnDataChanged () id:Response_FormCapacityAllocationResultsRuleConfiguration_DataHolderSelectCapacityAllocationResultsRuleConfiguration_OnDataChanged +{ + #keys: '[414702.0.391379706]' + CanBindMultiple: false + DefinitionID: 'Responsedef_WebComponent_OnDataChanged' + QuillAction + { + Body: + [* + traverse ( this.Data(), Elements, e ) { + info( "闈㈡澘鐗╂枡ID锛�", e.PanelMaterialCode() ); + } + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuDelete_OnClick.def new file mode 100644 index 0000000..ecf8b8c --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuDelete_OnClick.def @@ -0,0 +1,18 @@ +Quintiq file version 2.0 +#parent: ListCapacityAllocationResultsRuleConfiguration +Response OnClick ( + CapacityAllocationResultsRuleConfiguration selection +) id:Response_ListCapacityAllocationResultsRuleConfiguration_MenuDelete_OnClick +{ + #keys: '[414702.0.381071285]' + DefinitionID => /ListCapacityAllocationResultsRuleConfiguration/Responsedef_ListCapacityAllocationResultsRuleConfiguration_WebMenu_OnClick + Initiator: 'MenuDelete' + QuillAction + { + Body: + [* + selection.Delete(); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuEdit_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuEdit_OnClick.def new file mode 100644 index 0000000..01a7ffa --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuEdit_OnClick.def @@ -0,0 +1,21 @@ +Quintiq file version 2.0 +#parent: ListCapacityAllocationResultsRuleConfiguration +Response OnClick ( + CapacityAllocationResultsRuleConfiguration selection +) id:Response_ListCapacityAllocationResultsRuleConfiguration_MenuEdit_OnClick +{ + #keys: '[414702.0.376349145]' + CanBindMultiple: false + DefinitionID => /ListCapacityAllocationResultsRuleConfiguration/Responsedef_ListCapacityAllocationResultsRuleConfiguration_WebMenu_OnClick + Initiator: 'MenuEdit' + QuillAction + { + Body: + [* + dlg := construct( DialogCreateEditCapacityAllocationResultsRuleConfiguration ); + + dlg.Edit( selection ); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuNew_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuNew_OnClick.def new file mode 100644 index 0000000..76e0cd1 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuNew_OnClick.def @@ -0,0 +1,19 @@ +Quintiq file version 2.0 +#parent: ListCapacityAllocationResultsRuleConfiguration +Response OnClick () id:Response_ListCapacityAllocationResultsRuleConfiguration_MenuNew_OnClick +{ + #keys: '[414702.0.375256192]' + CanBindMultiple: false + DefinitionID => /ListCapacityAllocationResultsRuleConfiguration/Responsedef_ListCapacityAllocationResultsRuleConfiguration_WebMenu_OnClick + Initiator: 'MenuNew' + QuillAction + { + Body: + [* + dlg := construct( DialogCreateEditCapacityAllocationResultsRuleConfiguration ); + + dlg.New(); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuSelectAll_OnClic.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuSelectAll_OnClic.def new file mode 100644 index 0000000..720300e --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuSelectAll_OnClic.def @@ -0,0 +1,17 @@ +Quintiq file version 2.0 +#parent: ListCapacityAllocationResultsRuleConfiguration +Response OnClick () id:Response_ListCapacityAllocationResultsRuleConfiguration_MenuSelectAll_OnClick +{ + #keys: '[414702.0.381011855]' + CanBindMultiple: false + DefinitionID => /ListCapacityAllocationResultsRuleConfiguration/Responsedef_ListCapacityAllocationResultsRuleConfiguration_WebMenu_OnClick + Initiator: 'MenuSelectAll' + QuillAction + { + Body: + [* + this.SelectAll(); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def new file mode 100644 index 0000000..602baba --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Export_OnClick.def @@ -0,0 +1,16 @@ +Quintiq file version 2.0 +#parent: PanelImportAndExport/Export +Response OnClick () id:Response_PanelImportAndExport_Export_OnClick +{ + #keys: '[414702.0.391658465]' + CanBindMultiple: false + DefinitionID: 'Responsedef_WebButton_OnClick' + QuillAction + { + Body: + [* + Application.Download( "浜ц兘鍒嗛厤缁撴灉瑙勫垯.xlsx", CapacityAllocationResultsRuleConfiguration::Export( GlobalOTDTable ).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 new file mode 100644 index 0000000..3e90d91 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def @@ -0,0 +1,29 @@ +Quintiq file version 2.0 +#parent: PanelImportAndExport/Import +Response OnClick () id:Response_PanelImportAndExport_Import_OnClick +{ + #keys: '[414702.0.391899822]' + CanBindMultiple: false + DefinitionID: 'Responsedef_WebButton_OnClick' + QuillAction + { + Body: + [* + try { + uploadJsonString := Application.GetFile(); + if ( uploadJsonString <> "" ) { + uploadJson := JSON::Parse( uploadJsonString ); + + fileName := uploadJson.Get( "name" ).GetString(); + base64String := uploadJson.Get( "data" ).GetString(); + CapacityAllocationResultsRuleConfiguration::Import( GlobalOTDTable, base64String ); + + WebMessageBox::Success( "涓婁紶鎴愬姛", true ); + } + } onerror { + WebMessageBox::Error( e.GeneralInformation(), true ); + } + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/_ROOT_Component_FormCapacityAllocationResultsRuleConfiguration.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/_ROOT_Component_FormCapacityAllocationResultsRuleConfiguration.def new file mode 100644 index 0000000..436ef69 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/_ROOT_Component_FormCapacityAllocationResultsRuleConfiguration.def @@ -0,0 +1,43 @@ +Quintiq file version 2.0 +#root +#parent: MacroPlannerWebApp +OrphanComponent FormCapacityAllocationResultsRuleConfiguration +{ + #keys: '[414702.0.373844315]' + BaseType: 'WebForm' + Children: + [ + #child: ListCapacityAllocationResultsRuleConfiguration + Component DataHolderSelectCapacityAllocationResultsRuleConfiguration + { + #keys: '[414702.0.390054479]' + BaseType: 'WebDataHolder' + Databinding: 'structured[CapacityAllocationResultsRuleConfiguration]*' + Children: + [ + Component DataExtractorSelectCapacityAllocationResultsRuleConfiguration + { + #keys: '[414702.0.391186862]' + BaseType: 'WebDataExtractor' + Properties: + [ + DataType: 'CapacityAllocationResultsRuleConfiguration' + ExtractionMode: 'Selected' + Source: 'ListCapacityAllocationResultsRuleConfiguration' + Taborder: 0 + ] + } + ] + Properties: + [ + Taborder: 2 + ] + } + #child: PanelImportAndExport + ] + Properties: + [ + Image: 'DOCUMENT_CHECKS' + Title: '浜ц兘鍒嗛厤缁撴灉鎶ヨ〃-瑙勫垯缁存姢' + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def index 31b93b5..08db4f3 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def @@ -32,8 +32,8 @@ ] Properties: [ - Description: '澶╄姳' + Description: '澶╁崕' Image: 'CANDLE' - Title: '澶╄姳' + Title: '澶╁崕' ] } diff --git a/_Main/UI/MacroPlannerWebApp/Views/Test.vw b/_Main/UI/MacroPlannerWebApp/Views/Test.vw new file mode 100644 index 0000000..c66c058 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Views/Test.vw @@ -0,0 +1,177 @@ +Quintiq file version 2.0 +{ + viewcontents + { + forms + { + form_FormCapacityAllocationResultsRuleConfiguration + { + title: 'QTIANMA_JITUAN::FormCapacityAllocationResultsRuleConfiguration' + shown: true + componentID: 'QTIANMA_JITUAN::FormCapacityAllocationResultsRuleConfiguration' + layout + { + mode: 'open' + rowPosition: 1 + rowSpan: 15 + columnPosition: 1 + columnSpan: 4 + } + components + { + FormCapacityAllocationResultsRuleConfiguration_PanelImportAndExport + { + sizeRatio: 1 + } + FormCapacityAllocationResultsRuleConfiguration_ListCapacityAllocationResultsRuleConfiguration + { + } + FormCapacityAllocationResultsRuleConfiguration_DataSetLevelCapacityAllocationResultsRuleConfiguration + { + groupDepth: -1 + column_PanelMaterialCode + { + columnId: 'PanelMaterialCode' + dataPath: 'PanelMaterialCode' + dataType: 'string' + index: 0 + subtotals: '' + width: 150 + } + column_ModuleMaterialCode + { + columnId: 'ModuleMaterialCode' + dataPath: 'ModuleMaterialCode' + dataType: 'string' + index: 1 + subtotals: '' + width: 150 + } + column_Division + { + columnId: 'Division' + dataPath: 'Division' + dataType: 'string' + index: 2 + subtotals: '' + width: 150 + } + column_StockingPointID + { + columnId: 'StockingPointID' + dataPath: 'StockingPointID' + dataType: 'string' + index: 3 + subtotals: '' + width: 150 + } + } + } + } + form_FormCapacityAllocationResults + { + title: 'QTIANMA_JITUAN::FormCapacityAllocationResults' + shown: true + componentID: 'QTIANMA_JITUAN::FormCapacityAllocationResults' + layout + { + mode: 'open' + rowPosition: 1 + rowSpan: 15 + columnPosition: 5 + columnSpan: 8 + } + components + { + FormCapacityAllocationResults_PanelCapacityAllocationResults + { + sizeRatio: 1 + } + FormCapacityAllocationResults_ListCapacityAllocationResults + { + } + FormCapacityAllocationResults_DataSetLevelCapacityAllocationResults + { + groupDepth: -1 + column_Date + { + columnId: 'Date' + dataPath: 'Date' + dataType: 'date' + index: 0 + subtotals: '' + width: 150 + } + column_Description + { + columnId: 'Description' + dataPath: 'Description' + dataType: 'string' + index: 1 + subtotals: '' + width: 150 + } + column_ID + { + columnId: 'ID' + dataPath: 'ID' + dataType: 'string' + index: 2 + subtotals: '' + width: 150 + } + column_ProductID + { + columnId: 'ProductID' + dataPath: 'ProductID' + dataType: 'string' + index: 3 + subtotals: '' + width: 150 + } + column_StockingPointID + { + columnId: 'StockingPointID' + dataPath: 'StockingPointID' + dataType: 'string' + index: 4 + subtotals: '' + width: 150 + } + column_UserQuantity + { + columnId: 'UserQuantity' + dataPath: 'UserQuantity' + dataType: 'real' + index: 5 + subtotals: '' + width: 150 + } + column_ManufacturedDate + { + columnId: 'ManufacturedDate' + dataPath: 'ManufacturedDate' + dataType: 'date' + index: 6 + subtotals: '' + width: 150 + } + } + } + } + } + userconfigurableinformation + { + } + image: 'BEAR' + page: '' + group: '' + index: 0 + description: '' + } + formatversion: 2 + id: 'Test' + name: 'Test' + isglobal: false + isroot: true +} diff --git a/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/Test.vw b/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/Test.vw new file mode 100644 index 0000000..1571655 --- /dev/null +++ b/_var/_Main/ProjSettings/MacroPlannerWebApp/Views/Test.vw @@ -0,0 +1,42 @@ +Quintiq file version 2.0 +{ + viewcontents + { + forms + { + form_FormCapacityAllocationResults + { + layout + { + rowSpan: 15 + columnPosition: 5 + columnSpan: 8 + } + } + form_FormCapacityAllocationResultsRuleConfiguration + { + title: 'QTIANMA_JITUAN::FormCapacityAllocationResultsRuleConfiguration' + shown: true + componentID: 'QTIANMA_JITUAN::FormCapacityAllocationResultsRuleConfiguration' + layout + { + mode: 'open' + rowPosition: 1 + rowSpan: 15 + columnPosition: 1 + columnSpan: 4 + } + components: null + } + form_FormPanelPullPlanReport + { + _removed: true + } + } + } + formatversion: 2 + id: 'Test' + name: 'Test' + isglobal: false + isroot: false +} -- Gitblit v1.9.3