From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def
index 85ae591..0bc35f6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def
@@ -11,10 +11,12 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'external[RecycleBin]'
+ DataType: 'RecycleBin'
+ FilterArguments: 'checkedUnits:QMacroPlanner::FormDispatchShiftSchedulingInformation.dhFinalUnits'
+ FixedFilter: 'exists( checkedUnits,Elements,unit,unit.DisplayName() = object.DispatchShiftSchedulingProduct().DispatchShiftSchedulingLine().LineName())'
Source: 'RecycleBin'
Taborder: 0
- Transformation: 'DispatchShiftSchedulingInformation'
+ Transformation: 'DispatchShiftSchedulingLine.DispatchShiftSchedulingProduct.DispatchShiftSchedulingDetail'
]
}
#child: listActionBarPageData
@@ -28,7 +30,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ID","title":"ID","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FactoryName","title":"FactoryName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"FactoryName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InterfaceTime","title":"InterfaceTime","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InterfaceTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product","title":"Product","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Product"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductLine","title":"ProductLine","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductLine"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftDate","title":"ShiftDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftEndDate","title":"ShiftEndDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftEndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"ShiftName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftStartDate","title":"ShiftStartDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftStartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftVolume","title":"ShiftVolume","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftVolume"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SingleShiftName","title":"SingleShiftName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SingleShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Tips","title":"Tips","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Tips"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"VersionFlag","title":"VersionFlag","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"VersionFlag"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"VersionName","title":"VersionName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"VersionName"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.ID","title":"ID","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.FactoryName","title":"FactoryName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.FactoryName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.InterfaceTime","title":"InterfaceTime","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.InterfaceTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.LineName","title":"LineName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.LineName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.LineQuantity","title":"LineQuantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.LineQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.ShiftDate","title":"ShiftDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.ShiftDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.ShiftName","title":"ShiftName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.Tips","title":"Tips","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.Tips"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.VersionFlag","title":"VersionFlag","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.VersionFlag"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.VersionName","title":"VersionName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.DispatchShiftSchedulingLine.VersionName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"DispatchShiftSchedulingProduct.ProductionQuantity","title":"ProductionQuantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"DispatchShiftSchedulingProduct.ProductionQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SingleShiftName","title":"SingleShiftName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SingleShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftVolume","title":"ShiftVolume","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftVolume"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftStartDate","title":"ShiftStartDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftStartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftEndDate","title":"ShiftEndDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ShiftEndDate"}}]'
ContextMenu: 'listContextMenuData'
Taborder: 2
]
--
Gitblit v1.9.3