From 8f6eecfd4ab8b0be0d2e16ad907abd230d2a65ae Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 28 十月 2024 12:09:30 +0800
Subject: [PATCH] 修复一些bug
---
_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_ButtonDispatch_OnClick#844.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def | 4 ++--
_Main/BL/Type_DispatchShiftSchedulingInformation/Attribute_LineName.qbl | 2 +-
_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def | 7 ++-----
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/Attribute_LineID.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/Attribute_LineName.qbl
similarity index 88%
rename from _Main/BL/Type_DispatchShiftSchedulingInformation/Attribute_LineID.qbl
rename to _Main/BL/Type_DispatchShiftSchedulingInformation/Attribute_LineName.qbl
index 0917dd7..f6146e2 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/Attribute_LineID.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/Attribute_LineName.qbl
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-Attribute LineID
+Attribute LineName
{
#keys: '3[414996.1.67010068][414996.1.67010067][414996.1.67010069]'
Description: '浜х嚎'
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl
index ff4dd5e..5de7a0d 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_Dispatch.qbl
@@ -58,7 +58,7 @@
lineHandle := lineIndexTree.GetHandle( row.ProductionLine() );
lineIndex := guard( lineIndexTree.Root().Child( lineHandle ),null( NamedValue ));
if( isnull( lineIndex )){
- line := owner.DispatchShiftSchedulingLine( relnew,ID := IDHolder::GetGUID(),LineID := row.ProductionLine() );
+ line := owner.DispatchShiftSchedulingLine( relnew,ID := IDHolder::GetGUID(),LineName := row.ProductionLine() );
line.FactoryName( factory.Name() );
line.InterfaceTime( now );
line.VersionName( macroPlan.MDSMacroPlan().Description() );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
index 4a9e2cb..153f57a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogUpperLimitOfTransferCapacity/Component_pnlContent.def
@@ -1,13 +1,10 @@
Quintiq file version 2.0
Component pnlContent
{
+ #error 102458: "Class Component with id 'pnlContent' cannot find its child with id 'pnlCCFactory'. The file / folder structure might be corrupted due to integration."
+ #error 102458: "Class Component with id 'pnlContent' cannot find its child with id 'pnlDLFactory'. The file / folder structure might be corrupted due to integration."
#keys: '[413988.0.1292313211]'
BaseType: 'WebPanel'
- Children:
- [
- #child: pnlDLFactory
- #child: pnlCCFactory
- ]
Properties:
[
Orientation: 'tab'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def
index c8afd0c..f865faa 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_ListData.def
@@ -13,10 +13,10 @@
[
DataType: 'RecycleBin'
FilterArguments: 'checkedUnits:QMacroPlanner::FormDispatchShiftSchedulingInformation.dhFinalUnits'
- FixedFilter: 'exists( checkedUnits,Elements,unit,unit.DisplayName() = object.ProductLine())'
+ FixedFilter: 'exists( checkedUnits,Elements,unit,unit.DisplayName() = object.DispatchShiftSchedulingProduct().DispatchShiftSchedulingLine().LineName())'
Source: 'RecycleBin'
Taborder: 0
- Transformation: 'DispatchShiftSchedulingInformation'
+ Transformation: 'DispatchShiftSchedulingLine.DispatchShiftSchedulingProduct.DispatchShiftSchedulingDetail'
]
}
#child: listActionBarPageData
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_ButtonDispatch_OnClick\043844.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_ButtonDispatch_OnClick\043844.def"
index 93cca0b..d550bc4 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_ButtonDispatch_OnClick\043844.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Response_PanelDispatchShiftSchedulingInformation_ButtonDispatch_OnClick\043844.def"
@@ -12,7 +12,7 @@
[*
offlineTable := select( MacroPlan,NewOfflinePlanTable,table,true );
- DispatchShiftSchedulingInformation::Dispatch( dsStartDate.Date(),dsEndDate.Date(),offlineTable,RecycleBin );
+ DispatchShiftSchedulingLine::Dispatch( dsStartDate.Date(),dsEndDate.Date(),offlineTable,RecycleBin );
*]
}
}
--
Gitblit v1.9.3