From 7a248f9e187aa8c6a872218e8c788ff3453efc22 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 27 十一月 2024 11:16:10 +0800
Subject: [PATCH] 装配上线计划存档加Order字段
---
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable#384.def | 3 ++-
_Main/BL/Type_AssemblyOnlinePlanCell0/Attribute_OrderNr.qbl | 8 ++++++++
_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl | 13 +++++++++----
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_AssemblyOnlinePlanCell0/Attribute_OrderNr.qbl b/_Main/BL/Type_AssemblyOnlinePlanCell0/Attribute_OrderNr.qbl
new file mode 100644
index 0000000..afc640a
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanCell0/Attribute_OrderNr.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute OrderNr
+{
+ #keys: '3[415136.0.1339530029][415136.0.1339530028][415136.0.1339530030]'
+ Description: '鐢熶骇椤哄簭锛圢umber锛�'
+ ValueType: Number
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
index fcc429a..b779133 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
@@ -26,16 +26,21 @@
}
traverse( macroPlan, NewAssemblyOnlinePlanRow, aoprow, aoprow.Type() = '1' ){
row := table.GetRow( aoprow );
- traverse( table, Column, column, exists( aopcolumns, Elements, e, e = column.StartDate() ) ){//, aopcolumns.Find( column.StartDate() ) > -1
- qty := sum( aoprow, NewAssemblyOnlinePlanCell, aopcell, column.StartDate() <= aopcell.NewAssemblyOnlinePlanColumn().StartDate()
- and column.EndDate() >= aopcell.NewAssemblyOnlinePlanColumn().StartDate(), aopcell.Quantity() );
+ traverse( aoprow, NewAssemblyOnlinePlanCell, aopcell ){
+ column := selectobject( table, Column, column, column.StartDate() = aopcell.NewAssemblyOnlinePlanColumn().StartDate() );
+
+ // traverse( table, Column, column, exists( aopcolumns, Elements, e, e = column.StartDate() ) ){//, aopcolumns.Find( column.StartDate() ) > -1
+ // qty := se( aoprow, NewAssemblyOnlinePlanCell, aopcell, column.StartDate() <= aopcell.NewAssemblyOnlinePlanColumn().StartDate()
+ // and column.EndDate() >= aopcell.NewAssemblyOnlinePlanColumn().StartDate(), aopcell.Quantity() );
cell := selectobject( row, Cell, cell, cell.Column() = column );
if( isnull( cell ) ){
cell := column.Cell( relnew, InventoryWeight := 0, ProductionSerialNumber := 0, Quantity := 0, Shift := '', Value := '' );
row.Cell( relinsert, cell );
}
- cell.Quantity( qty );
+ cell.Order( aopcell.Order() );
+ cell.OrderNr( aopcell.OrderNr() );
+ cell.Quantity( aopcell.Quantity() );
}
}
//productids := selectuniquevalues( table, Row, row, row.Name() );
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
index 3368909..37837b4 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_MatrixEditorTable\043384.def"
@@ -26,7 +26,7 @@
]
Properties:
[
- Attributes: 'Quantity'
+ Attributes: 'Order;Quantity'
Column: 'Column'
Row: 'Row'
Taborder: 0
@@ -94,6 +94,7 @@
]
Properties:
[
+ AllowMultipleAttributes: true
Columns: 'MatrixEditorColumnsTable'
ContextMenu: 'matrixeditorContextMenuTable'
Rows: 'MatrixEditorRowsTable'
--
Gitblit v1.9.3