From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期五, 14 六月 2024 13:06:19 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg --- _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def | 52 +++++++++++++ _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlActions.def | 40 ++++++++++ _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Method_SetLockPeriod.def | 10 ++ _Main/BL/Type_LockPeriod/Attribute_LockDate.qbl | 7 + _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnCancel_OnClick.def | 15 +++ _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def | 11 ++ _Main/BL/Type_ProductInStockingPoint_MP/_ROOT_Type_ProductInStockingPoint_MP.qbl | 6 + _Main/BL/Relations/Relation_LockPeriod_ProductInStockingPoint_MP_ProductInStockingPoint_MP_Lock.qbl | 23 +++++ _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonLockPeriod_OnClick.def | 17 ++++ _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def | 16 ++++ _Main/BL/Type_LockPeriod/StaticMethod_Create.qbl | 13 +++ _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def | 21 +++++ _Main/BL/Type_LockPeriod/_ROOT_Type_LockPeriod.qbl | 9 ++ 13 files changed, 240 insertions(+), 0 deletions(-) diff --git a/_Main/BL/Relations/Relation_LockPeriod_ProductInStockingPoint_MP_ProductInStockingPoint_MP_Lock.qbl b/_Main/BL/Relations/Relation_LockPeriod_ProductInStockingPoint_MP_ProductInStockingPoint_MP_Lock.qbl new file mode 100644 index 0000000..eecf123 --- /dev/null +++ b/_Main/BL/Relations/Relation_LockPeriod_ProductInStockingPoint_MP_ProductInStockingPoint_MP_Lock.qbl @@ -0,0 +1,23 @@ +Quintiq file version 2.0 +#parent: #root +Relation LockPeriod_ProductInStockingPoint_MP_ProductInStockingPoint_MP_LockPeriod +{ + #keys: '1[412672.0.1036852419]' + DefaultRelationStrategy + { + } + RelationSide.LeftSide ProductInStockingPoint_MP + { + #keys: '3[412672.0.1036852421][412672.0.1036852420][412672.0.1036852422]' + Cardinality: '0to1' + ObjectDefinition: LockPeriod + OwningSide: 'Reference' + } + RelationSide.RightSide LockPeriod + { + #keys: '3[412672.0.1036852424][412672.0.1036852423][412672.0.1036852425]' + Cardinality: '0to1' + ObjectDefinition: ProductInStockingPoint_MP + OwningSide: 'Owned' + } +} diff --git a/_Main/BL/Type_LockPeriod/Attribute_LockDate.qbl b/_Main/BL/Type_LockPeriod/Attribute_LockDate.qbl new file mode 100644 index 0000000..d5954be --- /dev/null +++ b/_Main/BL/Type_LockPeriod/Attribute_LockDate.qbl @@ -0,0 +1,7 @@ +Quintiq file version 2.0 +#parent: #root +Attribute LockDate +{ + #keys: '3[412672.0.1036852403][412672.0.1036852402][412672.0.1036852404]' + ValueType: Date +} diff --git a/_Main/BL/Type_LockPeriod/StaticMethod_Create.qbl b/_Main/BL/Type_LockPeriod/StaticMethod_Create.qbl new file mode 100644 index 0000000..4aa7e39 --- /dev/null +++ b/_Main/BL/Type_LockPeriod/StaticMethod_Create.qbl @@ -0,0 +1,13 @@ +Quintiq file version 2.0 +#parent: #root +StaticMethod Create ( + ProductInStockingPoint_MP owner, + Date lockDate +) +{ + TextBody: + [* + // rislai Jun-13-2024 (created) + owner.LockPeriod( relnew, LockDate := lockDate ); + *] +} diff --git a/_Main/BL/Type_LockPeriod/_ROOT_Type_LockPeriod.qbl b/_Main/BL/Type_LockPeriod/_ROOT_Type_LockPeriod.qbl new file mode 100644 index 0000000..5e442ac --- /dev/null +++ b/_Main/BL/Type_LockPeriod/_ROOT_Type_LockPeriod.qbl @@ -0,0 +1,9 @@ +Quintiq file version 2.0 +#root +#parent: #DomainModel +Type LockPeriod +{ + #keys: '5[412672.0.1036852386][412672.0.1036852384][0.0.0][412672.0.1036852385][412672.0.1036852387]' + BaseType: Object + StructuredName: 'LockPeriods' +} diff --git a/_Main/BL/Type_ProductInStockingPoint_MP/_ROOT_Type_ProductInStockingPoint_MP.qbl b/_Main/BL/Type_ProductInStockingPoint_MP/_ROOT_Type_ProductInStockingPoint_MP.qbl new file mode 100644 index 0000000..f9eb53e --- /dev/null +++ b/_Main/BL/Type_ProductInStockingPoint_MP/_ROOT_Type_ProductInStockingPoint_MP.qbl @@ -0,0 +1,6 @@ +Quintiq file version 2.0 +#root +#parent: #DomainModel +Type ProductInStockingPoint_MP #extension +{ +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def index 77a368c..3fde688 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def +++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def @@ -16,6 +16,17 @@ Taborder: 0 ] } + Component ButtonLockPeriod + { + #keys: '[412672.0.1039433722]' + BaseType: 'WebButton' + Properties: + [ + Image: 'GEAR_LOCK' + Label: 'Lock period' + Taborder: 1 + ] + } ] Properties: [ diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonLockPeriod_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonLockPeriod_OnClick.def new file mode 100644 index 0000000..c15f2e5 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonLockPeriod_OnClick.def @@ -0,0 +1,17 @@ +Quintiq file version 2.0 +#parent: ActionBarGroupRestraint/ButtonLockPeriod +Response OnClick () id:Response_MacroPlanner_ActionBarGroupRestraint_ButtonLockPeriod_OnClick +{ + #keys: '[412672.0.1039465447]' + CanBindMultiple: false + DefinitionID: 'Responsedef_WebButton_OnClick' + QuillAction + { + Body: + [* + dlg := construct( DialogCreateLockPeriod ); + dlg.SetLockPeriod(); + *] + GroupServerCalls: false + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlActions.def new file mode 100644 index 0000000..e45d1f7 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlActions.def @@ -0,0 +1,40 @@ +Quintiq file version 2.0 +Component pnlActions +{ + #keys: '[412672.0.1039310286]' + BaseType: 'WebPanel' + Children: + [ + Component btnOk + { + #keys: '[412672.0.1039310290]' + BaseType: 'WebButton' + Properties: + [ + Label: 'OK' + Taborder: 0 + ] + } + Component btnCancel + { + #keys: '[412672.0.1039310292]' + 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_DialogCreateLockPeriod/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def new file mode 100644 index 0000000..33c5be9 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def @@ -0,0 +1,52 @@ +Quintiq file version 2.0 +Component pnlContent +{ + #keys: '[412672.0.1039310284]' + BaseType: 'WebPanel' + Children: + [ + Component ddlContent + { + #keys: '[412672.0.1039372244]' + BaseType: 'WebDropDownList' + Databinding: 'ProductInStockingPoint_MP' + Children: + [ + Component deContent + { + #keys: '[412672.0.1039372246]' + BaseType: 'WebDataExtractor' + Properties: + [ + DataType: 'MacroPlan' + Source: 'MacroPlan' + Taborder: 0 + Transformation: 'Product_MP.ProductInStockingPoint_MP' + ] + } + ] + Properties: + [ + DisplayField: 'Name' + Label: '浜у搧' + Taborder: 0 + ] + } + Component dsContent + { + #keys: '[412672.0.1039341942]' + BaseType: 'WebDateSelector' + Properties: + [ + DataBinding: 'ddlContent.Data.LockPeriod.LockDate' + Label: '閿佸畾鏈熻嚦锛�' + Taborder: 1 + ] + } + ] + Properties: + [ + Padding: 'true' + Taborder: 0 + ] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Method_SetLockPeriod.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Method_SetLockPeriod.def new file mode 100644 index 0000000..48fab63 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Method_SetLockPeriod.def @@ -0,0 +1,10 @@ +Quintiq file version 2.0 +#parent: #root +Method SetLockPeriod () id:Method_DialogCreateLockPeriod_SetLockPeriod +{ + #keys: '[412672.0.1039433775]' + Body: + [* + ApplicationMacroPlanner.ShowFormModal( this ); + *] +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnCancel_OnClick.def new file mode 100644 index 0000000..4d5cb33 --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/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: '[412672.0.1039310296]' + DefinitionID: 'Responsedef_WebButton_OnClick' + GroupServerCalls: true + QuillAction + { + Body: + [* + Form.Close(); + *] + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def new file mode 100644 index 0000000..6cc46ec --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnOk_OnClick.def @@ -0,0 +1,16 @@ +Quintiq file version 2.0 +#parent: pnlActions/btnOk +Response OnClick () id:Response_pnlActions_btnOk_OnClick +{ + #keys: '[412672.0.1039310295]' + DefinitionID: 'Responsedef_WebButton_OnClick' + GroupServerCalls: true + QuillAction + { + Body: + [* + LockPeriod::Create( ddlContent.Data(),dsContent.Date() ); + Form.Close(); + *] + } +} diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def new file mode 100644 index 0000000..ddaf02c --- /dev/null +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def @@ -0,0 +1,21 @@ +Quintiq file version 2.0 +#root +#parent: MacroPlannerWebApp +OrphanComponent DialogCreateLockPeriod +{ + #keys: '[412672.0.1039310282]' + BaseType: 'WebForm' + Children: + [ + #child: pnlContent + #child: pnlActions + ] + Properties: + [ + Alignment: 'trailing' + EnterButton: 'btnOk' + EscapeButton: 'btnCancel' + ExcludeFromActiveComponent: true + Padding: 'false' + ] +} -- Gitblit v1.9.3