From aaef34987e5814426a67985dab1da57880ba4b1f Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 27 十一月 2024 17:08:40 +0800
Subject: [PATCH] 发运数据可以修改数量
---
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/_ROOT_Component_DialogShippingActualData.def | 33 ++++++
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlActions.def | 40 ++++++++
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def | 24 ++++
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_ListInterfaceShippingData.def | 18 +++
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_OnOK.def | 28 +++++
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_listContextMenuInterfaceShippingData.def | 14 ++
_Main/BL/Type_ShippingActualData/Method_SyncTable.qbl | 14 ++
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Response_ListInterfaceShippingData_MenuInterfaceShippingData_OnClick.def | 20 ++++
_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl | 2
_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl | 2
_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def | 16 +++
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_Edit.def | 17 +++
_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnCancel_OnClick.def | 15 +++
14 files changed, 242 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
index d087705..ec10637 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanPush/StaticMethod_GenerateData.qbl
@@ -33,7 +33,7 @@
traverse( column, Cell, cell ){
row := cell.Row();
if( ( iscc and row.Unit() = FinancialProductionReport::GetDefaultCCUnit() ) or ( isdl and row.Unit() = FinancialProductionReport::GetDefaultDLUnit() ) ){
- cd :=interfaceDataset.AssemblyOnlinePlanPPPSPush( relnew, Product := row.ProductID()
+ cd :=interfaceDataset.AssemblyOnlinePlanPPPSPush( relnew, Product := row.Name()
, PlanningDate := column.StartDate()
, PlanningQty := [Number]cell.Quantity()
, Sequence := cell.Order()
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
index 78a0530..49dce27 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
@@ -7,7 +7,7 @@
TextBody:
[*
// 鐢勫叞楦� Oct-11-2024 (created)
- row := selectobject( this, Row, row, row.ProductID() = aoprow.ProductID() and row.ProductionLine() = aoprow.ProductionLine() and row.Type() = aoprow.Type() );
+ row := selectobject( this, Row, row, row.Name() = aoprow.ProductID() and row.ProductionLine() = aoprow.ProductionLine() and row.Type() = aoprow.Type() );
if( isnull( row ) ){
product := selectobject( aoprow.MacroPlan(), Product_MP, product, product.ID() = aoprow.ProductID() );
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
index 18d0349..4d0f7c9 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
@@ -7,7 +7,7 @@
TextBody:
[*
// 鐢勫叞楦� Oct-11-2024 (created)
- row := selectobject( this, Row, row, row.ProductID() = noprow.ProductID() and row.ProductionLine() = noprow.ProductionLine() and row.Type() = noprow.Type() and row.StockingPointID() = noprow.StockingPointID() );
+ row := selectobject( this, Row, row, row.Name() = noprow.ProductID() and row.ProductionLine() = noprow.ProductionLine() and row.Type() = noprow.Type() and row.StockingPointID() = noprow.StockingPointID() );
if( isnull( row ) ){
product := selectobject( noprow.NewOfflinePlanTable().MacroPlan(), Product_MP, product, product.ID() = noprow.ProductID() );
diff --git a/_Main/BL/Type_ShippingActualData/Method_SyncTable.qbl b/_Main/BL/Type_ShippingActualData/Method_SyncTable.qbl
new file mode 100644
index 0000000..9bd5dbd
--- /dev/null
+++ b/_Main/BL/Type_ShippingActualData/Method_SyncTable.qbl
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+Method SyncTable (
+ InterfaceDataset owner
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Nov-27-2024 (created)
+ column := selectobject( owner, ShippingActualColumn, column, column.StartDate() = this.DDay() );
+ cell := selectobject( column, ShippingActualCell, cell, cell.ShippingActualRow().Name() = this.FourCode() );
+ cell.Quantity( this.Quantity() );
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlActions.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlActions.def
new file mode 100644
index 0000000..9e5ddd9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlActions.def
@@ -0,0 +1,40 @@
+Quintiq file version 2.0
+Component pnlActions
+{
+ #keys: '[415136.0.1345221297]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component btnOk
+ {
+ #keys: '[415136.0.1345221301]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'OK'
+ Taborder: 0
+ ]
+ }
+ Component btnCancel
+ {
+ #keys: '[415136.0.1345221303]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: 'Cancel'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ Border: true
+ ExcludeFromActiveComponent: true
+ FixedSize: true
+ Orientation: 'horizontal'
+ Padding: 'true'
+ Style: 'footer'
+ Taborder: 2
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def
new file mode 100644
index 0000000..a6b3254
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Component_pnlContent.def
@@ -0,0 +1,24 @@
+Quintiq file version 2.0
+Component pnlContent
+{
+ #keys: '[415136.0.1345221295]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component efContent
+ {
+ #keys: '[415136.0.1345221341]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ Mask: 'REAL'
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Padding: 'true'
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_Edit.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_Edit.def
new file mode 100644
index 0000000..7046e73
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_Edit.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: #root
+Method Edit (
+ ShippingActualData selection
+) id:Method_DialogShippingActualData_Edit
+{
+ #keys: '[415136.0.1345221575]'
+ Body:
+ [*
+ // Edit Product(s)
+
+ data := shadow( selection );
+ dhDialogData.Data( &data );
+
+ ApplicationMacroPlanner.ShowFormModal( this );
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_OnOK.def
new file mode 100644
index 0000000..ea4081b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Method_OnOK.def
@@ -0,0 +1,28 @@
+Quintiq file version 2.0
+#parent: #root
+Method OnOK () id:Method_DialogShippingActualData_OnOK
+{
+ #keys: '[415136.0.1345221579]'
+ Body:
+ [*
+ // onOK for ProductDialog
+ // When the user clicks ok,
+ // we either create or edit the data
+ this.ApplyChanges();
+
+ data := dhDialogData.Data();
+
+ //if( isnull( data.WrappedInstance() ) ) // New
+ //{
+ // data.Commit();
+ // dhForm.Data().ListChangeLossSetting().SelectByKey( data.WrappedInstance().Key() );
+ //}
+ //else
+ //{
+ data.Commit();
+ data.WrappedInstance().SyncTable( InterfaceDataset );
+ //}
+
+ this.Close();
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnCancel_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnCancel_OnClick.def
new file mode 100644
index 0000000..dea0e14
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/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: '[415136.0.1345221307]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ Form.Close();
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/Response_pnlActions_btnOk_OnClick.def
new file mode 100644
index 0000000..05d32be
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/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: '[415136.0.1345221306]'
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ GroupServerCalls: true
+ QuillAction
+ {
+ Body:
+ [*
+ Form.ApplyChanges();
+ Form.Close();
+ *]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/_ROOT_Component_DialogShippingActualData.def b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/_ROOT_Component_DialogShippingActualData.def
new file mode 100644
index 0000000..404ad71
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogShippingActualData/_ROOT_Component_DialogShippingActualData.def
@@ -0,0 +1,33 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent DialogShippingActualData
+{
+ #keys: '[415136.0.1345221293]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: pnlContent
+ #child: pnlActions
+ Component dhDialogData
+ {
+ #keys: '[415136.0.1345221434]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'shadow[ShippingActualData]*'
+ Properties:
+ [
+ Taborder: 0
+ ]
+ }
+ ]
+ Properties:
+ [
+ Alignment: 'trailing'
+ EnterButton: 'btnOk'
+ EscapeButton: 'btnCancel'
+ ExcludeFromActiveComponent: true
+ Image: 'SHIPS_WHEEL'
+ Padding: 'false'
+ Title: 'Shipping actual data'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_ListInterfaceShippingData.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_ListInterfaceShippingData.def
index 3cabf5e..fb1c6b7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_ListInterfaceShippingData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_ListInterfaceShippingData.def
@@ -39,4 +39,22 @@
[
Taborder: 0
]
+ ResponseDefinitions:
+ [
+ DelegatedResponseDefinition OnClick id:Responsedef_ListInterfaceShippingData_WebMenu_OnClick
+ {
+ #keys: '[415136.0.1345221879]'
+ Initiator: 'WebMenu'
+ IsInherited: false
+ ResponseType: 'OnClick'
+ Arguments:
+ [
+ ResponseDefinitionArgument selection
+ {
+ #keys: '[2035.0.6361849]'
+ Binding: 'this.Selection()'
+ }
+ ]
+ }
+ ]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_listContextMenuInterfaceShippingData.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_listContextMenuInterfaceShippingData.def
index e96d713..eabc4e3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_listContextMenuInterfaceShippingData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Component_listContextMenuInterfaceShippingData.def
@@ -3,6 +3,20 @@
{
#keys: '[415136.0.1330021161]'
BaseType: 'listContextMenu'
+ Children:
+ [
+ Component MenuInterfaceShippingData
+ {
+ #keys: '[415136.0.1345221911]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'PENCIL'
+ Taborder: 3
+ Title: 'Edit Quantity'
+ ]
+ }
+ ]
Properties:
[
Taborder: 0
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Response_ListInterfaceShippingData_MenuInterfaceShippingData_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Response_ListInterfaceShippingData_MenuInterfaceShippingData_OnClick.def
new file mode 100644
index 0000000..daaf53c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceShippingData/Response_ListInterfaceShippingData_MenuInterfaceShippingData_OnClick.def
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: ListInterfaceShippingData
+Response OnClick (
+ ShippingActualData selection
+) id:Response_ListInterfaceShippingData_MenuInterfaceShippingData_OnClick
+{
+ #keys: '[415136.0.1345221962]'
+ CanBindMultiple: false
+ DefinitionID => /ListInterfaceShippingData/Responsedef_ListInterfaceShippingData_WebMenu_OnClick
+ Initiator: 'MenuInterfaceShippingData'
+ QuillAction
+ {
+ Body:
+ [*
+ dlg := construct( DialogShippingActualData );
+ dlg.Edit( selection );
+ *]
+ GroupServerCalls: false
+ }
+}
--
Gitblit v1.9.3