From 9fa1722ee249e570b82183107cdc643428fb067b Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 15 十一月 2024 17:39:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl | 42 +++++++++----
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelHeader.def | 10 +-
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit#720.def | 1
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelTable.def | 2
_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl | 5 +
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def | 25 ++++----
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bConfirm_OnClick.def | 6 +-
_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_MatrixEditor493_OnCheckEditability.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def | 7 +-
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bDeductChangeoverLoss_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRestore_OnClick#141.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelOperation.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bImport_OnClick#568.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def | 10 +++
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelOperation_ButtonSearch_OnClick.def | 18 ++++++
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bSaveAsDraft_OnClick#870.def | 2
17 files changed, 91 insertions(+), 49 deletions(-)
diff --git a/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl
index 1ce7d37..4c521e8 100644
--- a/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl
+++ b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl
@@ -2,12 +2,13 @@
#parent: #root
StaticMethod SynchronizeToNewSupply (
MacroPlan macroPlan,
- NewOfflinePlanTable nopt
+ NewOfflinePlanTable nopt,
+ NewOfflinePlanRows selectedRows
)
{
TextBody:
[*
- traverse ( nopt, NewOfflinePlanRow.NewOfflinePlanCell, cell,
+ traverse ( selectedRows, Elements.NewOfflinePlanCell, cell,
cell.NewOfflinePlanRow().Type() = "1" and cell.Quantity() > 0.0
// and cell.NewOfflinePlanRow().ProductionLine() = "eMotor Assy (France)" and cell.NewOfflinePlanColumn().StartDate() = Date::Construct( 2020, 4, 4 )
)
diff --git a/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl b/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl
index ef3037a..5de77d9 100644
--- a/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/Method_UpdateValue.qbl
@@ -15,22 +15,36 @@
this.Unpacking( value );
}
- if ( attrName = "Out" ) { // 璋冨嚭
- unitID := ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "DL to CC", "CC to DL" ) + " " + this.PackagingPlanRow().Category() + " Transport";
+ if ( this.PackagingPlanRow().Factory() = "闀挎槬宸ュ巶" and ( attrName = "Package" or attrName = "Unpacking" ) ) {
+ u := select( this.PackagingPlanRow().MacroPlan(), Unit, tempU, tempU.ID() = "CC " + this.PackagingPlanRow().Category() + " 绾胯竟鍜屽绉熷簱闂�" );
- pit := select( this.PackagingPlanRow().MacroPlan(), Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT,
- tempPIT.Trip().LaneLeg().Lane().UnitID() = unitID and
- tempPIT.Trip().Departure().Date() = this.PackagingPlanColumn().StartDate() and
- tempPIT.ProductID() = this.PackagingPlanRow().ProductID() );
-
+ t := select( u, Lane.LaneLeg.Trip, tempT, tempT.Departure().Date() = this.PackagingPlanColumn().StartDate() and
+ ifexpr( attrName = "Package",
+ tempT.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID().Regex( "绾胯竟搴�" ) and tempT.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID().Regex( "澶栫搴�" ),
+ tempT.LaneLeg().AsOriginStockingPointLeg().StockingPoint_MP().ID().Regex( "澶栫搴�" ) and tempT.LaneLeg().AsDestinationStockingPointLeg().StockingPoint_MP().ID().Regex( "绾胯竟搴�" ) )
+ );
+
+ pit := select( t, ProductInTrip, tempPIT, tempPIT.ProductID() = this.PackagingPlanRow().ProductID() );
+
pit.Update( value, true );
- this.Out( value );
-
- cell := select( this.PackagingPlanRow().MacroPlan(), PackagingPlanRow.PackagingPlanCell, tempPPCell,
- tempPPCell.PackagingPlanRow().Factory() = ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "闀挎槬宸ュ巶", "澶ц繛宸ュ巶" ) and
- tempPPCell.PackagingPlanRow().ProductID() = this.PackagingPlanRow().ProductID() and
- tempPPCell.PackagingPlanColumn().StartDate() = pit.Trip().Arrival().Date() );
- cell.TransferIn( value );
}
+
+ //if ( attrName = "Out" ) { // 璋冨嚭
+ // unitID := ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "DL to CC", "CC to DL" ) + " " + this.PackagingPlanRow().Category() + " Transport";
+ //
+ // pit := select( this.PackagingPlanRow().MacroPlan(), Unit.Lane.LaneLeg.Trip.ProductInTrip, tempPIT,
+ // tempPIT.Trip().LaneLeg().Lane().UnitID() = unitID and
+ // tempPIT.Trip().Departure().Date() = this.PackagingPlanColumn().StartDate() and
+ // tempPIT.ProductID() = this.PackagingPlanRow().ProductID() );
+ //
+ // pit.Update( value, true );
+ // this.Out( value );
+ //
+ // cell := select( this.PackagingPlanRow().MacroPlan(), PackagingPlanRow.PackagingPlanCell, tempPPCell,
+ // tempPPCell.PackagingPlanRow().Factory() = ifexpr( this.PackagingPlanRow().Factory() = "澶ц繛宸ュ巶", "闀挎槬宸ュ巶", "澶ц繛宸ュ巶" ) and
+ // tempPPCell.PackagingPlanRow().ProductID() = this.PackagingPlanRow().ProductID() and
+ // tempPPCell.PackagingPlanColumn().StartDate() = pit.Trip().Arrival().Date() );
+ // cell.TransferIn( value );
+ //}
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
index f23ea10..3c6db85 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_MatrixEditorTable.def
@@ -17,12 +17,12 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'InterfaceDataset'
+ DataType: 'CustomerDemandIDS'
+ Description: 'object.Column().TimeUnit() = search.TimeUnit() and object.Column().StartDate() >= search.StartDate() and object.Column().StartDate() <= search.EndDate()'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.Column().TimeUnit() = search.TimeUnit() and object.Column().StartDate() >= search.StartDate() and object.Column().StartDate() <= search.EndDate()'
- Source: 'InterfaceDataset'
+ Source: 'DataHolderTable'
Taborder: 0
- Transformation: 'CustomerDemandIDS.Row.Cell'
+ Transformation: 'Row.Cell'
]
}
]
@@ -46,13 +46,12 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'InterfaceDataset'
- Description: "( search.Generation() = '<All>' or object.Product_MP().Generation() = search.Generation() ) and ( search.MqbMlb() = '<All>' or object.Product_MP().MQBMLB() = search.MqbMlb() ) and ( search.Power() = '<All>' or object.Product_MP().Power() = search.Power() )"
+ DataType: 'CustomerDemandIDS'
+ Description: "search.Product() = '<All>' or object.Name() = search.Product() and ( search.Unit() = '<All>' or object.Factory() = search.Unit() )"
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: "search.Product() = '<All>' or object.Name() = search.Product() and ( search.Unit() = '<All>' or object.Factory() = search.Unit() )"
- Source: 'InterfaceDataset'
+ Source: 'DataHolderTable'
Taborder: 0
- Transformation: 'CustomerDemandIDS.Row'
+ Transformation: 'Row'
]
}
]
@@ -75,12 +74,12 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'InterfaceDataset'
+ DataType: 'CustomerDemandIDS'
+ Description: 'object.TimeUnit() = search.TimeUnit() and ( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
FilterArguments: 'search:QMacroPlanner::FormCustomerDemandPPAIDS.dhSearch'
- FixedFilter: 'object.TimeUnit() = search.TimeUnit() and ( search.StartDate().IsMinInfinity() or object.StartDate() >= search.StartDate() ) and ( search.EndDate().IsMaxInfinity() or object.StartDate() <= search.EndDate() )'
- Source: 'InterfaceDataset'
+ Source: 'DataHolderTable'
Taborder: 0
- Transformation: 'CustomerDemandIDS.Column'
+ Transformation: 'Column'
]
}
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelHeader.def
index 380c727..00e08ed 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelHeader.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelHeader.def
@@ -5,18 +5,18 @@
BaseType: 'WebPanel'
Children:
[
- #child: PanelGeneration
- #child: PanelPower
- #child: PanelMLBMQB
#child: PanelTimeUnit
#child: PanelOperation
- #child: PanelProduct
#child: PanelPeriod_549
+ #child: PanelProduct
+ #child: PanelMLBMQB
+ #child: PanelPower
+ #child: PanelGeneration
]
Properties:
[
FixedSize: true
Orientation: 'horizontal'
- Taborder: 1
+ Taborder: 2
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelOperation.def
index 1c0733f..d6e42b3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelOperation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelOperation.def
@@ -18,7 +18,7 @@
]
Properties:
[
+ FixedSize: true
Taborder: 6
- Visible: false
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelTable.def
index e5d9695..d6707d9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelTable.def
@@ -9,6 +9,6 @@
]
Properties:
[
- Taborder: 2
+ Taborder: 3
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def
index d90d27b..64dc42d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def
@@ -9,10 +9,9 @@
{
Body:
[*
- //鍒濆鍖�
- //CustomerDemandIDS::GenerateData( InterfaceDataset, RecycleBin, Archive );
-
- //dhSearch.Data( InterfaceDataset.CustomerDemandIDSSearch() );
+ //鍒濆鍖�
+ table := CustomerDemandIDS::InitiateSearch( InterfaceDataset );
+ DataHolderTable.Data( table );
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelOperation_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelOperation_ButtonSearch_OnClick.def
new file mode 100644
index 0000000..f33236e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_PanelOperation_ButtonSearch_OnClick.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: PanelOperation/ButtonSearch_612
+Response OnClick () id:Response_PanelOperation_ButtonSearch_OnClick
+{
+ #keys: '[415136.0.1307811172]'
+ CanBindMultiple: false
+ DefinitionID: 'Responsedef_WebButton_OnClick'
+ QuillAction
+ {
+ Body:
+ [*
+ if( not isnull( DataHolderTable.Data() ) ){
+ DataHolderTable.Data().Generate( dhSearch.Data() );
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def
index f8c1a45..f3a5739 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/_ROOT_Component_FormCustomerDemandPPAIDS.def
@@ -31,6 +31,16 @@
]
Properties:
[
+ Taborder: 1
+ ]
+ }
+ Component DataHolderTable
+ {
+ #keys: '[415136.0.1307973765]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'CustomerDemandIDS'
+ Properties:
+ [
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bConfirm_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bConfirm_OnClick.def
index e3789bd..b897cc2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bConfirm_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bConfirm_OnClick.def
@@ -7,17 +7,17 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not isnull( MacroPlan ) and not isnull( InterfaceDataset ) and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName()
+ return not isnull( MacroPlan ) and not isnull( InterfaceDataset )/* and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName()*/;
*]
QuillAction
{
Body:
[*
// 鍚屾鍒板懆鏈熶换鍔�
- NewOfflinePlanCell::SynchronizeToNewSupply( MacroPlan, dhNewOfflinePlanTable.Data() );
+ NewOfflinePlanCell::SynchronizeToNewSupply( MacroPlan, dhNewOfflinePlanTable.Data(), dhSelectedDetailNewOfflinePlanRow.Data() );
// 璁剧疆鎸夐挳锛堥櫎涓嬭浇锛変笉鍙敤
- MacroPlan.A_PreviousScenaioName( MacroPlan.ScenarioName() );
+ //MacroPlan.A_PreviousScenaioName( MacroPlan.ScenarioName() );
WebMessageBox::Success( Translations::A_VWED_Success() );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bDeductChangeoverLoss_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bDeductChangeoverLoss_OnClick.def
index 31f00c2..74ed9c2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bDeductChangeoverLoss_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bDeductChangeoverLoss_OnClick.def
@@ -7,7 +7,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not isnull( MacroPlan ) and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName();
+ return not isnull( MacroPlan )/* and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName()*/;
*]
QuillAction
{
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bImport_OnClick\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bImport_OnClick\043568.def"
index 12780f4..21f37c2 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bImport_OnClick\043568.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bImport_OnClick\043568.def"
@@ -7,7 +7,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not isnull( MacroPlan ) and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName();
+ return not isnull( MacroPlan )/* and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName()*/;
*]
QuillAction
{
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def
index 7ff95ea..de92b1d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRefresh_OnClick.def
@@ -7,7 +7,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not isnull( MacroPlan ) and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName();
+ return not isnull( MacroPlan )/* and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName()*/;
*]
QuillAction
{
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRestore_OnClick\043141.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRestore_OnClick\043141.def"
index 27481a8..f80f203 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRestore_OnClick\043141.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bRestore_OnClick\043141.def"
@@ -7,7 +7,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not isnull( MacroPlan ) and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName();
+ return not isnull( MacroPlan )/* and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName()*/;
*]
QuillAction
{
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bSaveAsDraft_OnClick\043870.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bSaveAsDraft_OnClick\043870.def"
index 6d4fc46..c7ae0a7 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bSaveAsDraft_OnClick\043870.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Response_pHeader_bSaveAsDraft_OnClick\043870.def"
@@ -7,7 +7,7 @@
DefinitionID: 'Responsedef_WebButton_OnClick'
Precondition:
[*
- return not isnull( MacroPlan ) and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName();
+ return not isnull( MacroPlan )/* and MacroPlan.A_PreviousScenaioName() <> MacroPlan.ScenarioName()*/;
*]
QuillAction
{
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit\043720.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit\043720.def"
index b2391b0..67dc762 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit\043720.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit\043720.def"
@@ -21,6 +21,7 @@
]
Properties:
[
+ Orientation: 'horizontal'
Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_MatrixEditor493_OnCheckEditability.def b/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_MatrixEditor493_OnCheckEditability.def
index 3d723b6..8be5f6a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_MatrixEditor493_OnCheckEditability.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Response_MatrixEditor493_OnCheckEditability.def
@@ -12,7 +12,7 @@
{
Body:
[*
- cond := focusedattribute = "Package" or focusedattribute = "Unpacking" or focusedattribute = "Out";
+ cond := focusedattribute = "Package" or focusedattribute = "Unpacking";
editinfo.CanEdit( cond );
editinfo.UserHint( ifexpr( cond, "", "涓嶈兘淇敼" ) );
--
Gitblit v1.9.3