From d6e278442ccf32b1ca1f58afc622d595842d21a3 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 30 十月 2024 11:50:03 +0800
Subject: [PATCH] 上线计划优化

---
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
index 7bbfc28..c93ea2a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
@@ -45,8 +45,8 @@
           Properties:
           [
             DataType: 'LocalTable'
-            FilterArguments: 'checkedProduct:QMacroPlanner::FormOfflinePlanChanges.dhFinelProduct'
-            FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.ProductID())'
+            FilterArguments: 'checkedProducts:QMacroPlanner::FormOfflinePlanChanges.dhFinelProducts;checkedUnits:QMacroPlanner::FormOfflinePlanChanges.dhFinalUnits'
+            FixedFilter: 'exists( checkedProducts,Elements,product,product.ID() = object.ProductID()) and exists( checkedUnits,Elements,unit,unit.DisplayName() = object.ProductionLine())'
             Source: 'dhTable'
             Taborder: 0
             Transformation: 'LocalRow'
@@ -73,8 +73,8 @@
           Properties:
           [
             DataType: 'LocalTable'
-            FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanChanges.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanChanges.dhEndDate'
-            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() '
+            FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanChanges.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanChanges.dhEndDate;timeUnit:QMacroPlanner::FormOfflinePlanChanges.dhTimeUnit'
+            FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() and object.TimeUnit() = timeUnit'
             Source: 'dhTable'
             Taborder: 0
             Transformation: 'LocalColumn'

--
Gitblit v1.9.3