From b99e22c06c023b82d5062fee06e2f8a29ce04977 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 24 十月 2024 17:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
index 130cb7e..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'
--
Gitblit v1.9.3