From 8dcecb62309701060564490cdee291849b9bfe90 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期二, 24 九月 2024 18:52:58 +0800
Subject: [PATCH] 优化
---
_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Component_MatrixEditor872.def | 2 ++
_Main/BL/Type_TransferPlanCell/StaticMethod_GenerateReport.qbl | 12 +++++++++++-
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def | 4 ++--
_Main/BL/Type_TransferPlanRow/Method_Filter.qbl | 13 +++++++++++++
4 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_TransferPlanCell/StaticMethod_GenerateReport.qbl b/_Main/BL/Type_TransferPlanCell/StaticMethod_GenerateReport.qbl
index 882d9cb..73cbf58 100644
--- a/_Main/BL/Type_TransferPlanCell/StaticMethod_GenerateReport.qbl
+++ b/_Main/BL/Type_TransferPlanCell/StaticMethod_GenerateReport.qbl
@@ -14,7 +14,7 @@
// 鐢熸垚璋冩嫧璁″垝
traverse ( macroPlan, Unit, u, u.HasCapacityTypeTransportQuantity() ) {
traverse ( u, Lane.LaneLeg.Trip, t ) {
- traverse ( t, ProductInTrip, pit, pit.Quantity() > 0.0 ) {
+ traverse ( t, ProductInTrip, pit, pit.Quantity() > 0.0 and exists( pit.Product_MP(), AllParent.AsParent, tempP, tempP.ID() = "鏈哄姞浠�" ) ) {
// 鎵捐
tpr := TransferPlanRow::FindTransferPlanRowTypeIndex( TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP() ),
TransferPlanRow::IdentifyTheFactory( t.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP() ),
@@ -57,6 +57,16 @@
indexDate := indexDate + 1;
}
+ // 琛ラ綈绌烘牸瀛�
+ traverse ( macroPlan, TransferPlanRow, tpr ) {
+ traverse ( macroPlan, TransferPlanColumn, tpc, tpc.ColumnDate() >= minselect( macroPlan, TransferPlanColumn, tempTPC, true, tempTPC.ColumnDate() ).ColumnDate() ) {
+ cell := select( tpr, TransferPlanCell, tempTPC, tempTPC.TransferPlanColumn() = tpc );
+ if ( isnull( cell ) ) {
+ cell := tpc.TransferPlanCell( relnew, Value := "" );
+ cell.TransferPlanRow( relset, tpr );
+ }
+ }
+ }
// 鐢熸垚浜у搧鍒�
minDateTPC := macroPlan.TransferPlanColumn( relnew,
diff --git a/_Main/BL/Type_TransferPlanRow/Method_Filter.qbl b/_Main/BL/Type_TransferPlanRow/Method_Filter.qbl
new file mode 100644
index 0000000..e0e3038
--- /dev/null
+++ b/_Main/BL/Type_TransferPlanRow/Method_Filter.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Method Filter (
+ Product_MPs products
+) declarative remote as Boolean
+{
+ TextBody:
+ [*
+ flag := exists( products, Elements, tempP, tempP.ID() = this.ProductID() );
+
+ return flag;
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
index a33bc23..36b4beb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
@@ -32,7 +32,7 @@
Properties:
[
Image: 'LIGHTBULB'
- Label: 'Offline plan'
+ Label: 'Output plan'
Taborder: 1
]
}
@@ -44,7 +44,7 @@
[
Description: 'AssemblyOnlinePlan'
Image: 'PALM_TREE'
- Label: 'Assembly online plan'
+ Label: 'Filing plan'
Taborder: 2
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Component_MatrixEditor872.def b/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Component_MatrixEditor872.def
index 7db9d74..241584d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Component_MatrixEditor872.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormTransferPlan/Component_MatrixEditor872.def
@@ -45,6 +45,8 @@
Properties:
[
DataType: 'MacroPlan'
+ FilterArguments: 'products:QLibMacroPlannerWebUI::ApplicationMacroPlanner.DataHolderCheckedProduct'
+ FixedFilter: 'object.Filter( products )'
Source: 'MacroPlan'
Taborder: 0
Transformation: 'TransferPlanRow'
--
Gitblit v1.9.3