From ab5176a7074144e411c00a409010422a3ee5c98a Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 15 十一月 2024 16:50:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit#424.def | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelUnit#925.def | 7
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnSelectionChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelTimeUnit.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelHeader#952.def | 9
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnSelectionChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnCreated.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelProduct.def | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnCreated.def | 6
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl | 49 +-
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelOperation.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProduct.def | 5
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorStart_OnChanged.def | 2
_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl | 40 +-
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorEnd_OnChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit#720.def | 8
_Main/BL/Type_CustomerDemandIDS/Method_Clear.qbl | 16 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelRowSearch.def | 18 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct#780.def | 7
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_679_ButtonSearch_OnClick.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnSelectionChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelHeader#503.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnCreated.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnCreated.def | 6
_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl | 36 ++
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod#71.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def | 2
_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl | 49 +-
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorStart_OnChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def | 1
_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost0.qbl | 35 ++
_Main/BL/Type_CustomerDemandIDS/StaticMethod_InitiateSearch.qbl | 28 +
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelPeriod#384.def | 10
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnCreated.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnSelectionChanged.def | 2
_Main/BL/Type_CustomerDemandIDS/Method_GetRowByUnit.qbl | 4
_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcTransCost#652.qbl | 36 ++
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine#623.def | 7
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelTimeUnit.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorStart_OnChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnCreated.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnSelectionChanged.def | 6
_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl | 24 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelColumnSaerch.def | 16 +
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnSelectionChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnSelectionChanged.def | 2
_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl | 136 +++----
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelColumnSearch.def | 16 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorEnd_OnChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def | 9
_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductSearch.def | 18 +
_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost#911.qbl | 35 ++
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation#679.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelOperation.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelOperation_ButtonSearch_OnClick.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelColumnSearch.def | 16 +
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelRowSearch.def | 17 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnChanged.def | 6
/dev/null | 23 -
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorEnd_OnChanged.def | 6
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def | 8
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def | 2
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit.def | 5
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnCreated.def | 6
_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl | 2
_Main/BL/Type_CustomerDemandIDS/Attribute_IsShow.qbl | 8
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnCreated.def | 2
74 files changed, 587 insertions(+), 321 deletions(-)
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
index c4eac3f..607b785 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
@@ -17,7 +17,7 @@
table := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name );
}
showtable := selectobject( interface, AssemblyOnlinePlanVersion, version, version.IsShow() );
- if( isnull( table ) ){
+ if( isnull( showtable ) ){
showtable := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name, IsShow := true );
}
aopcolumns := selectuniquevalues( macroPlan, NewAssemblyOnlinePlanColumn, aopcolumn, not exists( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcolumn.StartDate() ), aopcolumn.StartDate() );
diff --git "a/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost\043911.qbl" "b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost\043911.qbl"
new file mode 100644
index 0000000..ffa3b9e
--- /dev/null
+++ "b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost\043911.qbl"
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+#parent: #root
+Method CalcEngineCost (
+ BaseSalesDemandInPeriods psdips,
+ LogisticsCostEngines enginecosts
+) as Real
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Nov-14-2024 (created)
+ outcost := 0.0;
+ enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= this.StartDate() and engine.EndDate() >= this.EndDate() );
+ if( isnull( enginecost ) ){
+ fenginecost := selectobject( enginecosts, Elements, engine, engine.EndDate() > this.StartDate() and engine.EndDate() <= this.EndDate() and engine.StartDate() < this.StartDate() );
+ if( not isnull( fenginecost ) ){
+ quantity := sum( psdips, Elements, psdip, psdip.StartDate() >= fenginecost.StartDate() and psdip.StartDate() <= fenginecost.EndDate(), psdip.Quantity() );
+ outcost := outcost + ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
+ }
+ menginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.EndDate() < this.EndDate() );
+ if( not isnull( menginecost ) ){
+ quantity := sum( psdips, Elements, psdip, psdip.StartDate() >= menginecost.StartDate() and psdip.StartDate() <= menginecost.EndDate(), psdip.Quantity() );
+ outcost := outcost + ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
+ }
+ benginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.StartDate() <= this.EndDate() and engine.EndDate() > this.EndDate() );
+ if( not isnull( benginecost ) ){
+ quantity := sum( psdips, Elements, psdip, psdip.StartDate() >= benginecost.StartDate() and psdip.StartDate() <= benginecost.EndDate(), psdip.Quantity() )
+ outcost := outcost + ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
+ }
+ }else{
+ quantity := sum( psdips, Elements, psdip, psdip.Quantity() );
+ outcost := outcost + ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
+ }
+ return outcost;
+ *]
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl
index c7d248a..2b9fa79 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost.qbl
@@ -20,90 +20,90 @@
fenginecost := selectobject( enginecosts, Elements, engine, engine.EndDate() > this.StartDate() and engine.EndDate() <= this.EndDate() and engine.StartDate() < this.StartDate() and engine.Factory() = factory );
if( not isnull( fenginecost ) ){
fpispips := selectset( pispips, Elements, pispip, pispip.Start().Date() >= fenginecost.StartDate() and pispip.Start().Date() <= fenginecost.EndDate() );
- if( entercost.IsMaxInfinity() ){
+ if( not entercost.IsMaxInfinity() ){
newsqty := sum( fpispips, Elements, e, e.NewSupplyQuantity() );
entercost := entercost + ceil( newsqty / fenginecost.PackagingCapacity() ) * fenginecost.WarehousingPrice();
}
- if( othercost.IsMaxInfinity() ){
+ if( not othercost.IsMaxInfinity() ){
newsqty := sum( fpispips, Elements, e, e.NewSupplyQuantity() );
othercost := othercost + ceil( newsqty / fenginecost.PackagingCapacity() ) * fenginecost.OtherPrice();
}
- if( outcost.IsMaxInfinity() ){
+ if( not outcost.IsMaxInfinity() ){
newsqty := sum( fpispips, Elements, e, e.NewSupplyQuantity() );
outcost := outcost + ceil( newsqty / fenginecost.PackagingCapacity() ) * fenginecost.OutboundPrice();
}
- if( storecost.IsMaxInfinity() ){
+ if( not storecost.IsMaxInfinity() ){
pinvqty := sum( fpispips, Elements, e, e.PlannedInventoryLevelEnd() );
storecost := storecost + ceil( pinvqty / fenginecost.PackagingCapacity() ) * fenginecost.StoragePrice();//鍥涜垗浜斿叆
}
- if( transcost.IsMaxInfinity() ){
+ if( not transcost.IsMaxInfinity() ){
this.CalcTransCost( fpispips, transcosts, fenginecost, transcost );
}
}
menginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.EndDate() < this.EndDate() and engine.Factory() = factory );
if( not isnull( menginecost ) ){
mpispips := selectset( pispips, Elements, pispip, pispip.Start().Date() >= menginecost.StartDate() and pispip.Start().Date() <= menginecost.EndDate() );
- if( entercost.IsMaxInfinity() ){
+ if( not entercost.IsMaxInfinity() ){
newsqty := sum( mpispips, Elements, e, e.NewSupplyQuantity() );
entercost := entercost + ceil( newsqty / menginecost.PackagingCapacity() ) * menginecost.WarehousingPrice();
}
- if( othercost.IsMaxInfinity() ){
+ if( not othercost.IsMaxInfinity() ){
newsqty := sum( mpispips, Elements, e, e.NewSupplyQuantity() );
othercost := othercost + ceil( newsqty / menginecost.PackagingCapacity() ) * menginecost.OtherPrice();
}
- if( outcost.IsMaxInfinity() ){
+ if( not outcost.IsMaxInfinity() ){
newsqty := sum( mpispips, Elements, e, e.NewSupplyQuantity() );
outcost := outcost + ceil( newsqty / menginecost.PackagingCapacity() ) * menginecost.OutboundPrice();
}
- if( storecost.IsMaxInfinity() ){
+ if( not storecost.IsMaxInfinity() ){
pinvqty := sum( mpispips, Elements, e, e.PlannedInventoryLevelEnd() );
storecost := storecost + ceil( pinvqty / menginecost.PackagingCapacity() ) * menginecost.StoragePrice();//鍥涜垗浜斿叆
}
- if( transcost.IsMaxInfinity() ){
+ if( not transcost.IsMaxInfinity() ){
this.CalcTransCost( mpispips, transcosts, menginecost, transcost );
}
}
benginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.StartDate() <= this.EndDate() and engine.EndDate() > this.EndDate() and engine.Factory() = factory );
if( not isnull( benginecost ) ){
bpispips := selectset( pispips, Elements, pispip, pispip.Start().Date() >= benginecost.StartDate() and pispip.Start().Date() <= benginecost.EndDate() )
- if( entercost.IsMaxInfinity() ){
+ if( not entercost.IsMaxInfinity() ){
newsqty := sum( bpispips, Elements, e, e.NewSupplyQuantity() );
entercost := entercost + ceil( newsqty / benginecost.PackagingCapacity() ) * benginecost.WarehousingPrice();
}
- if( othercost.IsMaxInfinity() ){
+ if( not othercost.IsMaxInfinity() ){
newsqty := sum( bpispips, Elements, e, e.NewSupplyQuantity() );
othercost := othercost + ceil( newsqty / benginecost.PackagingCapacity() ) * benginecost.OtherPrice();
}
- if( outcost.IsMaxInfinity() ){
+ if( not outcost.IsMaxInfinity() ){
newsqty := sum( bpispips, Elements, e, e.NewSupplyQuantity() );
outcost := outcost + ceil( newsqty / benginecost.PackagingCapacity() ) * benginecost.OutboundPrice();
}
- if( storecost.IsMaxInfinity() ){
+ if( not storecost.IsMaxInfinity() ){
pinvqty := sum( bpispips, Elements, e, e.PlannedInventoryLevelEnd() );
storecost := storecost + ceil( pinvqty / benginecost.PackagingCapacity() ) * benginecost.StoragePrice();//鍥涜垗浜斿叆
}
- if( transcost.IsMaxInfinity() ){
+ if( not transcost.IsMaxInfinity() ){
this.CalcTransCost( bpispips, transcosts, benginecost, transcost );
}
}
}else{
- if( entercost.IsMaxInfinity() ){
+ if( not entercost.IsMaxInfinity() ){
newsqty := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
entercost := entercost + ceil( newsqty / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
}
- if( othercost.IsMaxInfinity() ){
+ if( not othercost.IsMaxInfinity() ){
newsqty := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
othercost := othercost + ceil( newsqty / enginecost.PackagingCapacity() ) * enginecost.OtherPrice();
}
- if( outcost.IsMaxInfinity() ){
+ if( not outcost.IsMaxInfinity() ){
newsqty := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
outcost := outcost + ceil( newsqty / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
}
- if( storecost.IsMaxInfinity() ){
+ if( not storecost.IsMaxInfinity() ){
pinvqty := sum( pispips, Elements, pispip, pispip.PlannedInventoryLevelEnd() );
storecost := storecost + ceil( pinvqty / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
}
- if( transcost.IsMaxInfinity() ){
+ if( not transcost.IsMaxInfinity() ){
this.CalcTransCost( pispips, transcosts, enginecost, transcost );
}
}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost0.qbl b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost0.qbl
new file mode 100644
index 0000000..6665b5c
--- /dev/null
+++ b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcEngineCost0.qbl
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+#parent: #root
+Method CalcEngineCost (
+ ProductInTrips pits,
+ LogisticsCostEngines enginecosts,
+ LogisticsCostTransports transcosts
+) as Real
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Nov-14-2024 (created)
+ transcost := 0.0;
+ enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= this.StartDate() and engine.EndDate() >= this.EndDate() );
+ if( isnull( enginecost ) ){
+ fenginecost := selectobject( enginecosts, Elements, engine, engine.EndDate() > this.StartDate() and engine.EndDate() <= this.EndDate() and engine.StartDate() < this.StartDate() );
+ if( not isnull( fenginecost ) ){
+ fpits := selectset( pits, Elements, pit, pit.Trip().Arrival().Date() >= fenginecost.StartDate() and pit.Trip().Arrival().Date() <= fenginecost.EndDate() );
+ transcost := transcost + this.CalcTransCost( fpits, transcosts, fenginecost );
+ }
+ menginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.EndDate() < this.EndDate() );
+ if( not isnull( menginecost ) ){
+ mpits := selectset( pits, Elements, pit, pit.Trip().Arrival().Date() >= menginecost.StartDate() and pit.Trip().Arrival().Date() <= menginecost.EndDate() );
+ transcost := transcost + this.CalcTransCost( mpits, transcosts, menginecost );
+ }
+ benginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() > this.StartDate() and engine.StartDate() <= this.EndDate() and engine.EndDate() > this.EndDate() );
+ if( not isnull( benginecost ) ){
+ bpits := selectset( pits, Elements, pit, pit.Trip().Arrival().Date() >= benginecost.StartDate() and pit.Trip().Arrival().Date() <= benginecost.EndDate() )
+ transcost := transcost + this.CalcTransCost( bpits, transcosts, benginecost );
+ }
+ }else{
+ transcost := transcost + this.CalcTransCost( pits, transcosts, enginecost );
+ }
+ return transcost;
+ *]
+}
diff --git "a/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcTransCost\043652.qbl" "b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcTransCost\043652.qbl"
new file mode 100644
index 0000000..b61ad56
--- /dev/null
+++ "b/_Main/BL/Type_CCEngineLogisticsCostColumn0/Method_CalcTransCost\043652.qbl"
@@ -0,0 +1,36 @@
+Quintiq file version 2.0
+#parent: #root
+Method CalcTransCost (
+ ProductInTrips pits,
+ LogisticsCostTransports transcosts,
+ LogisticsCostEngine enginecost
+) as Real
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Nov-14-2024 (created)
+ transcost := 0.0
+ tran := selectobject( transcosts, Elements, trans, trans.StartDate() <= this.StartDate() and trans.EndDate() >= this.StartDate() );
+ if( isnull( tran ) ){
+ ftranscost := selectobject( transcosts, Elements, trans, trans.EndDate() > this.StartDate() and this.EndDate() <= this.EndDate() and trans.StartDate() < this.StartDate() );
+ if( not isnull( ftranscost ) ){
+ newsqty := sum( pits, Elements, pit, pit.Trip().Arrival().Date() >= ftranscost.StartDate() and pit.Trip().Arrival().Date() <= ftranscost.EndDate(), pit.Quantity() );
+ transcost := transcost + ceil( ceil( newsqty / enginecost.PackagingCapacity() ) / ftranscost.LoadingCapacity() ) * ftranscost.TransportPrice();
+ }
+ mtranscost := selectobject( transcosts, Elements, trans, trans.StartDate() > this.StartDate() and trans.EndDate() < this.EndDate() );
+ if( not isnull( mtranscost ) ){
+ newsqty := sum( pits, Elements, pit, pit.Trip().Arrival().Date() >= mtranscost.StartDate() and pit.Trip().Arrival().Date() <= mtranscost.EndDate(), pit.Quantity() );
+ transcost := transcost + ceil( ceil( newsqty / enginecost.PackagingCapacity() ) / mtranscost.LoadingCapacity() ) * mtranscost.TransportPrice();
+ }
+ btranscost := selectobject( transcosts, Elements, trans, trans.StartDate() > this.StartDate() and trans.StartDate() <= this.EndDate() and trans.EndDate() > this.EndDate() );
+ if( not isnull( btranscost ) ){
+ newsqty := sum( pits, Elements, pit, pit.Trip().Arrival().Date() >= btranscost.StartDate() and pit.Trip().Arrival().Date() <= btranscost.EndDate(), pit.Quantity() );
+ transcost := transcost + ceil( ceil( newsqty / enginecost.PackagingCapacity() ) / btranscost.LoadingCapacity() ) * btranscost.TransportPrice();
+ }
+ }else{
+ newsqty := sum( pits, Elements, pit, pit.Quantity() );
+ transcost := transcost + ceil( ceil( newsqty / enginecost.PackagingCapacity() ) / tran.LoadingCapacity() ) * tran.TransportPrice();
+ }
+ return transcost;
+ *]
+}
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
index 493fd05..7abb0da 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/StaticMethod_Initialize.qbl
@@ -22,10 +22,12 @@
table := selectobject(owner, CCEngineLogisticsCostReport, report, report.ID() = name );
if( isnull( table ) ){
- owner.CCEngineLogisticsCostReport( relnew, ID := name, Name := name );
+ table := owner.CCEngineLogisticsCostReport( relnew, ID := name, Name := name );
}
+ table.Column( relflush );
+ table.Row( relflush );
showname := name + 'Show';
- if( exists( owner, CCEngineLogisticsCostReport, report, report.ID() = showname and report.IsShow() ) ){
+ if( not exists( owner, CCEngineLogisticsCostReport, report, report.ID() = showname and report.IsShow() ) ){
owner.CCEngineLogisticsCostReport( relnew, ID := showname, Name := name, IsShow := true );
}
if( isnull( owner.CCEngineLogisticsCostSearch() ) ){
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
index c8d0617..08be1c4 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_Initialize.qbl
@@ -7,6 +7,7 @@
TextBody:
[*
// 鐢勫叞楦� Aug-12-2024 (created)
+ // 鐢勫叞楦� Aug-12-2024 (created)
owner.DLEngineLogisticsCostReport( relflush );
produtparent := DLEngineLogisticsCostReport::GetDefaultProductParent();
name := DLEngineLogisticsCostReport::GetDefaultName();
@@ -45,28 +46,40 @@
and pispip.Start().Date() < column.StartDate().StartOfNextMonth()
and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ) );
cell := selectobject( row, Cell, cell, cell.Column() = column );
- entercost := 0.0;
- othercost := 0.0;
- outcost := 0.0;
- storecost := 0.0;
- transcost := 0.0;
+ newsupplyqty := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
+ plannedinvqty := sum( pispips, Elements, pispip, pispip.PlannedInventoryLevelEnd() );
if( isdltoccrent){
- othercost := Real::MaxReal();
- transset := selectset( transcosts, Elements, trans, trans.Origin() = '闀挎槬澶栫搴�' and trans.Destination() = '瀹㈡埛搴�' );
- column.CalcEngineCost( pispips, enginecosts, transset, ccfactory, entercost, othercost, outcost, storecost, transcost );
- cell.CCRentQty( cell.CCRentQty() + sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() ) );
+ //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
+ enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate()
+ and engine.Factory() = ccfactory );
+ cell.CCRentQty( cell.CCRentQty() + newsupplyqty );
+ //闀挎槬澶栫搴撳叆搴撹垂鐢細鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环
+ entercost := ceil( newsupplyqty / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
+ //闀挎槬澶栫搴撳嚭搴撹垂鐢�: 鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环
+ outcost := ceil( newsupplyqty / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
cell.CCRentInCost( cell.CCRentInCost() + entercost );
cell.CCRentOutOfCost( cell.CCRentOutOfCost() + outcost );
- cell.CCRentStorCost( cell.CCRentStorCost() + storecost );//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
- cell.CCShorTransCost( cell.CCShorTransCost() + transcost );//闀挎槬鐭�旇繍杈撹垂鐢�
+ cost := ceil( plannedinvqty / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
+ cell.CCRentStorCost( cell.CCRentStorCost() + cost );//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
+ transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() and trans.Origin() = '闀挎槬澶栫搴�' and trans.Destination() = '瀹㈡埛搴�' );
+ if( not isnull( transcost ) ){
+ cost := ceil( ceil( newsupplyqty / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
+ cell.CCShorTransCost( cell.CCShorTransCost() + cost );//闀挎槬鐭�旇繍杈撹垂鐢�
+ }
} else {
- outcost := Real::MaxReal();
- transset := selectset( transcosts, Elements, trans, trans.Origin() = '澶ц繛鍘傚唴搴�' and trans.Destination() = '澶ц繛澶栫搴�' );
- column.CalcEngineCost( pispips, enginecosts, transset, dlfactory, entercost, othercost, outcost, storecost, transcost );
- cell.DLRentStorCost( cell.DLRentStorCost() + storecost );//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
- cell.DLRentOtherCost( cell.DLRentOtherCost() + othercost );//澶ц繛澶栫搴撳叾浠栬垂鐢�
- cell.DLRentInCost( cell.DLRentInCost() + entercost );//澶ц繛澶栫搴撳叆搴撹垂鐢�
- cell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + transcost );//鍘傚唴鍒板ぇ杩炲绉熷簱杩愯緭璐圭敤
+ //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
+ enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate()
+ and engine.Factory() = dlfactory );
+ if( not isnull( enginecost ) ){
+ cost := ceil( plannedinvqty / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
+ cell.DLRentStorCost( cell.DLRentStorCost() + cost );//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
+ row.SetDLRentEnterCost( column, enginecost, newsupplyqty );//澶ц繛澶栫搴撳叆搴撹垂鐢�
+ transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() and trans.Origin() = '澶ц繛鍘傚唴搴�' and trans.Destination() = '澶ц繛澶栫搴�' );
+ if( not isnull( transcost ) ){
+ cost := ceil( ceil( newsupplyqty / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
+ row.SetFactoryToRentTransCost( column, cost );
+ }
+ }
}
}
products.Add( pisp.Product_MP() );
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
index 6bc14fb..c6f6787 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/StaticMethod_InitializeNew.qbl
@@ -6,8 +6,7 @@
{
TextBody:
[*
- // 鐢勫叞楦� Aug-12-2024 (created)
- owner.DLEngineLogisticsCostReport( relflush );
+ //owner.DLEngineLogisticsCostReport( relflush );
produtparent := DLEngineLogisticsCostReport::GetDefaultProductParent();
name := DLEngineLogisticsCostReport::GetDefaultName();
allunit := DLEngineLogisticsCostReport::GetDefaultAllUnit();
@@ -17,9 +16,19 @@
startofplanning := owner.StartOfPlanning().Date();
startofnextyear := startofplanning.StartOfNextYear();
- table := owner.DLEngineLogisticsCostReport( relnew, ID := name, Name := name );
- owner.DLEngineLogisticsCostReport( relnew, ID := name + 'Show', Name := name, IsShow := true );
- owner.DLEngineLogisticsCostSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit );
+ table := selectobject(owner, DLEngineLogisticsCostReport, report, report.ID() = name );
+ if( isnull( table ) ){
+ table := owner.DLEngineLogisticsCostReport( relnew, ID := name, Name := name );
+ }
+ table.Column( relflush );
+ table.Row( relflush );
+ showname := name + 'Show';
+ if( not exists( owner, DLEngineLogisticsCostReport, report, report.ID() = showname and report.IsShow() ) ){
+ owner.DLEngineLogisticsCostReport( relnew, ID := name + 'Show', Name := name, IsShow := true );
+ }
+ if( isnull( owner.DLEngineLogisticsCostSearch() ) ){
+ owner.DLEngineLogisticsCostSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit );
+ }
products := construct( Product_MPs );
@@ -45,40 +54,28 @@
and pispip.Start().Date() < column.StartDate().StartOfNextMonth()
and ( pispip.NewSupplyQuantity() <> 0 or pispip.PlannedInventoryLevelEnd() <> 0 ) );
cell := selectobject( row, Cell, cell, cell.Column() = column );
- newsupplyqty := sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() );
- plannedinvqty := sum( pispips, Elements, pispip, pispip.PlannedInventoryLevelEnd() );
+ entercost := 0.0;
+ othercost := 0.0;
+ outcost := 0.0;
+ storecost := 0.0;
+ transcost := 0.0;
if( isdltoccrent){
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate()
- and engine.Factory() = ccfactory );
- cell.CCRentQty( cell.CCRentQty() + newsupplyqty );
- //闀挎槬澶栫搴撳叆搴撹垂鐢細鍏ュ簱閲�/鍖呰瀹归噺*鍏ュ簱鍗曚环
- entercost := ceil( newsupplyqty / enginecost.PackagingCapacity() ) * enginecost.WarehousingPrice();
- //闀挎槬澶栫搴撳嚭搴撹垂鐢�: 鍑哄簱閲�/鍖呰瀹归噺*鍑哄簱鍗曚环
- outcost := ceil( newsupplyqty / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
+ othercost := Real::MaxReal();
+ transset := selectset( transcosts, Elements, trans, trans.Origin() = '闀挎槬澶栫搴�' and trans.Destination() = '瀹㈡埛搴�' );
+ column.CalcEngineCost( pispips, enginecosts, transset, ccfactory, entercost, othercost, outcost, storecost, transcost );
+ cell.CCRentQty( cell.CCRentQty() + sum( pispips, Elements, pispip, pispip.NewSupplyQuantity() ) );
cell.CCRentInCost( cell.CCRentInCost() + entercost );
cell.CCRentOutOfCost( cell.CCRentOutOfCost() + outcost );
- cost := ceil( plannedinvqty / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- cell.CCRentStorCost( cell.CCRentStorCost() + cost );//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
- transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() and trans.Origin() = '闀挎槬澶栫搴�' and trans.Destination() = '瀹㈡埛搴�' );
- if( not isnull( transcost ) ){
- cost := ceil( ceil( newsupplyqty / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();
- cell.CCShorTransCost( cell.CCShorTransCost() + cost );//闀挎槬鐭�旇繍杈撹垂鐢�
- }
+ cell.CCRentStorCost( cell.CCRentStorCost() + storecost );//闀挎槬澶栫搴撲粨鍌ㄨ垂鐢�
+ cell.CCShorTransCost( cell.CCShorTransCost() + transcost );//闀挎槬鐭�旇繍杈撹垂鐢�
} else {
- //鍦ㄥ彂鍔ㄦ満鎴愭湰鍙傛暟琛ㄦ壘鍒板搴旂殑鍖呰瀹归噺
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate()
- and engine.Factory() = dlfactory );
- if( not isnull( enginecost ) ){
- cost := ceil( plannedinvqty / enginecost.PackagingCapacity() ) * enginecost.StoragePrice();//鍥涜垗浜斿叆
- cell.DLRentStorCost( cell.DLRentStorCost() + cost );//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
- row.SetDLRentEnterCost( column, enginecost, newsupplyqty );//澶ц繛澶栫搴撳叆搴撹垂鐢�
- transcost := selectobject( transcosts, Elements, trans, trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() and trans.Origin() = '澶ц繛鍘傚唴搴�' and trans.Destination() = '澶ц繛澶栫搴�' );
- if( not isnull( transcost ) ){
- cost := ceil( ceil( newsupplyqty / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- row.SetFactoryToRentTransCost( column, cost );
- }
- }
+ outcost := Real::MaxReal();
+ transset := selectset( transcosts, Elements, trans, trans.Origin() = '澶ц繛鍘傚唴搴�' and trans.Destination() = '澶ц繛澶栫搴�' );
+ column.CalcEngineCost( pispips, enginecosts, transset, dlfactory, entercost, othercost, outcost, storecost, transcost );
+ cell.DLRentStorCost( cell.DLRentStorCost() + storecost );//澶ц繛澶栫搴撲粨鍌ㄨ垂鐢�
+ cell.DLRentOtherCost( cell.DLRentOtherCost() + othercost );//澶ц繛澶栫搴撳叾浠栬垂鐢�
+ cell.DLRentInCost( cell.DLRentInCost() + entercost );//澶ц繛澶栫搴撳叆搴撹垂鐢�
+ cell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + transcost );//鍘傚唴鍒板ぇ杩炲绉熷簱杩愯緭璐圭敤
}
}
products.Add( pisp.Product_MP() );
@@ -94,32 +91,26 @@
isdl := laneleg.OriginStockingPointID().EndsWith( '鍘傚唴搴�' ) and ( laneleg.OriginStockingPointID().StartsWith( '澶ц繛' ) or laneleg.OriginStockingPointID().StartsWith( 'DL' ) );
//鐩殑鍦板簱瀛樼偣鏄惁鏄暱鏄ワ紙闀挎槬澶栫搴擄級
iscc := laneleg.DestinationStockingPointID() = '澶ц繛鍙戝姩鏈虹殑闀挎槬澶栫搴�';
- if( isdl and iscc ){
- traverse( table, Column, column){//, column.StartDate().Month() = 1
- alltrips := selectset( laneleg, Trip, trip, trip.Arrival().Date() < column.StartDate().StartOfNextMonth() and trip.Arrival().Date() >= column.StartDate() );
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate() );
- transcosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.StartDate() <= column.StartDate() and trans.EndDate() >= column.StartDate() );
- if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
- producttrips := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ), pit.ProductID() );
- traverse( producttrips, Elements, producttrip ){//, producttrip = '6912'
-
- row := table.GetRow( producttrip );
- product := selectobject( owner, Product_MP, product, product.ID() = producttrip );
- products.Add( product );
- quantity := sum( alltrips, Elements.ProductInTrip, pit, pit.Product_MP() = product, pit.Quantity() );
- enginecost := selectobject( enginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower()
- and engine.MLB_MQB() = product.MQBMLB()
- and engine.Factory() = ccfactory );
- //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
- transcost := selectobject( transcosts, Elements, trans, trans.Origin() = laneleg.OriginStockingPointID()
- and trans.Destination() = laneleg.DestinationStockingPointID()
- and exists( product.GetAllParent(), Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
-
- if( not isnull( enginecost ) and not isnull( transcost ) ){
- cost := ceil( ceil( quantity / enginecost.PackagingCapacity() ) / transcost.LoadingCapacity() ) * transcost.TransportPrice();//鍥涜垗浜斿叆
- cell := selectobject( row, Cell, cell, cell.Column() = column );
- cell.CCLongTransCost( cell.CCLongTransCost() + cost )
- }
+ if( isdl and iscc ){
+ allenginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Factory() = ccfactory );
+ alltranscosts := selectset( owner, LogisticsCostTransport, trans, trans.LoadingCapacity() <> 0 and trans.Origin() = laneleg.OriginStockingPointID() and trans.Destination() = laneleg.DestinationStockingPointID() );
+ if( allenginecosts.Size() > 0 and alltranscosts.Size() > 0 ){
+ alltrips := selectset( laneleg, Trip, trip, exists( trip, ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ) ) );
+ productids := selectuniquevalues( alltrips, Elements.ProductInTrip, pit, pit.Quantity() <> 0 and exists( pit.Product_MP().GetAllParent(), Elements, e, e.ID() = produtparent ), pit.ProductID() );
+ traverse( productids, Elements, productid ){
+ product := selectobject( owner, Product_MP, product, product.ID() = productid );
+ row := table.GetRow( productid );
+ products.Add( product );
+ producttrips := selectset( alltrips, Elements.ProductInTrip, pit, pit.Quantity() > 0 and pit.ProductID() = productid );
+ enginecosts := selectset( allenginecosts, Elements, engine, engine.Generation().ToLower() = product.Generation().ToLower() and engine.MLB_MQB() = product.MQBMLB() );
+ //鍦ㄨ繍杈撴垚鏈弬鏁拌〃閲屾壘鍒板彂鍔ㄦ満瀵瑰簲杩愯緭鍗曚环鍜岃杞藉閲�
+ transcosts := selectset( alltranscosts, Elements, trans, exists( product.GetAllParent(), Elements, e, ifexpr( trans.Product().FindString( '鍙戝姩鏈�', 0 ) >= 0, e.ID() = produtparent, e.ID() = trans.Product() ) ) );
+ if( not isnull( enginecosts ) and enginecosts.Size() > 0 and not isnull( transcosts ) and transcosts.Size() > 0 ){
+ traverse( table, Column, column){//, column.StartDate().Month() = 1
+ columntrips := selectset( producttrips, Elements, pit, pit.Trip().Arrival().Date() < column.StartDate().StartOfNextMonth() and pit.Trip().Arrival().Date() >= column.StartDate() );
+ cell := selectobject( row, Cell, cell, cell.Column() = column );
+ cell.CCLongTransCost( column.CalcEngineCost( columntrips, enginecosts, transcosts ) );
+ }
}
}
}
@@ -198,24 +189,19 @@
// }
// }
//}
- traverse( dlproducts, Elements, ccproduct){
+ traverse( dlproducts, Elements, productid){
- row := table.GetRow( ccproduct )
- product := selectobject( owner, Product_MP, product, product.ID() = ccproduct );
- //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
- enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
+ row := table.GetRow( productid )
+ product := selectobject( owner, Product_MP, product, product.ID() = productid );
+ //鏌ヨ瀵瑰簲鐨勫彂鍔ㄦ満鎴愭湰
+ enginecosts := selectset( owner, LogisticsCostEngine, engine, engine.PackagingCapacity() <> 0 and engine.Generation().ToLower() = product.Generation().ToLower()
and engine.MLB_MQB() = product.MQBMLB()and engine.Factory() = dlfactory );
if( not isnull( enginecosts ) and enginecosts.Size() > 0 ){
+ products.Add( product );
+ allpsdips := selectset( dlforecasts, Elements.PlanningSalesDemandInPeriod, psdip, psdip.ProductID() = productid and psdip.Quantity() > 0 );
traverse( table, Column, column ){
- allpsdips := selectset( dlforecasts, Elements.PlanningSalesDemandInPeriod, psdip, psdip.ProductID() = ccproduct and psdip.Quantity() > 0 and psdip.StartDate() < column.StartDate().StartOfNextMonth() and psdip.StartDate() >= column.StartDate() );
- enginecost := selectobject( enginecosts, Elements, engine, engine.StartDate() <= column.StartDate() and engine.EndDate() >= column.StartDate() );
- if( not isnull( enginecost ) ){
- products.Add( product );
- quantity := sum( allpsdips, Elements, psdip, psdip.Quantity() );// + psdip.FulfilledQuantity()
-
- cost := ceil( quantity / enginecost.PackagingCapacity() ) * enginecost.OutboundPrice();
- row.SetDLRentOutCost( column, cost );
- }
+ psdips := selectset( allpsdips, Elements, psdip, psdip.StartDate() <= column.EndDate() and psdip.StartDate() >= column.StartDate() );
+ row.SetDLRentOutCost( column, column.CalcEngineCost( psdips, enginecosts ) );
}
}
}
diff --git a/_Main/BL/Type_CustomerDemandIDS/Attribute_IsShow.qbl b/_Main/BL/Type_CustomerDemandIDS/Attribute_IsShow.qbl
new file mode 100644
index 0000000..bcc4341
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandIDS/Attribute_IsShow.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsShow
+{
+ #keys: '3[415136.0.1306254772][415136.0.1306254771][415136.0.1306254773]'
+ Description: '鏄惁鏄剧ず'
+ ValueType: Boolean
+}
diff --git a/_Main/BL/Type_CustomerDemandIDS/Method_Clear.qbl b/_Main/BL/Type_CustomerDemandIDS/Method_Clear.qbl
new file mode 100644
index 0000000..6da9602
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandIDS/Method_Clear.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+Method Clear (
+ Dates periods
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-25-2024 (created)
+ this.Column( relflush );
+ this.Row( relflush );
+ if( periods.Size() > 0 ){
+ this.GenerateColumn( periods, true );
+ }
+ *]
+}
diff --git a/_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl b/_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl
new file mode 100644
index 0000000..80c7eae
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl
@@ -0,0 +1,36 @@
+Quintiq file version 2.0
+#parent: #root
+Method Generate (
+ CustomerDemandIDSSearch search
+)
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Jun-25-2024 (created)
+ info( '-----------Search start-------' );
+ table := selectobject( this,InterfaceDataset.CustomerDemandIDS, report, not report.IsShow() );
+ //娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
+ idscolumns := selectuniquevalues( table, Column, idscolumn, idscolumn.TimeUnit() = search.TimeUnit() and idscolumn.StartDate() >= search.StartDate() and idscolumn.StartDate() <= search.EndDate(), idscolumn.StartDate() );
+ this.Clear( idscolumns );
+ traverse( table, Row, row, ( search.Unit() = FinancialProductionReport::GetDefaultAllUnit() or row.Factory() = search.Unit() )
+ and ( search.Product() = FinancialProductionReport::GetDefaultAllUnit() or search.Product() = row.Name() ) ){
+
+ showrow := selectobject( this, Row, showrow, showrow.Name() = row.Name() and showrow.Factory() = search.Unit() );
+ if( isnull( showrow ) ){
+ showrow := this.Row( relnew, Name := row.Name(), Factory := search.Unit() );
+ }
+ traverse( row, Cell, cell, cell.Column().TimeUnit() = search.TimeUnit() ){
+ column := selectobject( this, Column, column, column.Name() = cell.Column().Name() );
+ if( not isnull( column ) ){
+ showcell := selectobject( showrow, Cell, showcell, showcell.Column() = column );
+ if( isnull( showcell ) ){
+ showcell := column.Cell( relnew, Value := '' );
+ showrow.Cell( relinsert, showcell );
+ }
+ showcell.Value( [String]( [Number]cell.Value() + [Number]showcell.Value() ) );
+ }
+ }
+ }
+ info( '-----------Search end-------' );
+ *]
+}
diff --git a/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl b/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl
index f97e7fb..b9691a7 100644
--- a/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl
@@ -1,40 +1,47 @@
Quintiq file version 2.0
#parent: #root
Method GenerateColumn (
- Dates periods
+ Dates periods,
+ Boolean isshow
)
{
TextBody:
[*
// 鐢勫叞楦� Jun-25-2024 (created)
+ timeunit := guard( this.InterfaceDataset().CustomerDemandIDSSearch().TimeUnit(), Translations::MP_GlobalParameters_Day() ) ;
weekstart := periods.Element( 0 );
monthstart := periods.Element( 0 );
traverse( periods, Elements, periodtime ){
- periodname := periodtime.Format( "M2/D2/Y" );
-
- this.Column( relnew, Name := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
-
- weekend := ( weekstart + Duration::Days( 6 ) ).Date();
- if( ( weekend.Year() <> periodtime.Year() and weekend.Month() > 1 ) or ( abs( weekstart.Week() - periodtime.Week() ) > 1 and weekend.Year() = periodtime.Year() ) ){
- weekstart := periodtime;
- }
- if( periodtime = weekstart ){
- weekperiodname := weekstart.Format( "M2/D2/Y" );
- this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart.StartOfNextWeek() - Duration::Days( 1 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
+ if( not isshow or timeunit = Translations::MP_GlobalParameters_Day() ){
+ periodname := periodtime.Format( "M2/D2/Y" );
+ this.Column( relnew, Name := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
}
- if( ( monthstart.Year() <> periodtime.Year() and abs( monthstart.Month() - periodtime.Month() ) <> 11 ) or ( abs( monthstart.Month() - periodtime.Month() ) > 1 and monthstart.Year() = periodtime.Year() ) ){
- monthstart := periodtime;
+ if( not isshow or timeunit = Translations::MP_GlobalParameters_Week() ){
+ weekend := ( weekstart + Duration::Days( 6 ) ).Date();
+ if( ( weekend.Year() <> periodtime.Year() and weekend.Month() > 1 ) or ( abs( weekstart.Week() - periodtime.Week() ) > 1 and weekend.Year() = periodtime.Year() ) ){
+ weekstart := periodtime;
+ }
+ if( periodtime = weekstart ){
+ weekperiodname := weekstart.Format( "M2/D2/Y" );
+ this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart.StartOfNextWeek() - Duration::Days( 1 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
+
+ }
+ weekstart := periodtime.StartOfNextWeek();
}
- if( periodtime = monthstart ){
- monthperiodname := monthstart.Format( "M2/D2/Y" );
- enddate := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
- this.Column( relnew, Name := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() );
-
+ if( not isshow or timeunit = Translations::MP_GlobalParameters_Month() ){
+ if( ( monthstart.Year() <> periodtime.Year() and abs( monthstart.Month() - periodtime.Month() ) <> 11 ) or ( abs( monthstart.Month() - periodtime.Month() ) > 1 and monthstart.Year() = periodtime.Year() ) ){
+ monthstart := periodtime;
+ }
+ if( periodtime = monthstart ){
+ monthperiodname := monthstart.Format( "M2/D2/Y" );
+ enddate := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
+ this.Column( relnew, Name := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() );
+
+ }
+ monthstart := periodtime.StartOfNextMonth();
}
- weekstart := periodtime.StartOfNextWeek();
- monthstart := periodtime.StartOfNextMonth();
}
*]
}
diff --git a/_Main/BL/Type_CustomerDemandIDS/Method_GetRowByUnit.qbl b/_Main/BL/Type_CustomerDemandIDS/Method_GetRowByUnit.qbl
index ede4c8e..5634928 100644
--- a/_Main/BL/Type_CustomerDemandIDS/Method_GetRowByUnit.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/Method_GetRowByUnit.qbl
@@ -8,10 +8,10 @@
TextBody:
[*
// 鐢勫叞楦� Sep-6-2024 (created)
- row := selectobject( this, Row, row, row.Name() = product and row.Factory() = unit );
+ row := selectobject( this, Row, row, row.Name() = product and row.Factory() = unit );
if( isnull( row ) ){
//鍒濆鍖栧崟鍏冩牸
- row := this.Row( relnew, Name := product, Factory := unit );
+ row := this.Row( relnew, Name := product, Factory := unit );
traverse( this, Column, column ){
row.Initialize( column );
}
diff --git a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
index db43831..546ae21 100644
--- a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl
@@ -2,7 +2,7 @@
#parent: #root
StaticMethod GenerateData (
InterfaceDataset interface,
- const MacroPlan macroplan,
+ MacroPlan macroplan,
RecycleBin recycle,
const Archive archive
)
@@ -15,12 +15,15 @@
//interface.CustomerDemandIDSSearch( relflush );
info( '-------------------------Start---------------------');
allunit := CustomerDemandIDS::GetDefaultAllUnit();
- if( isnull( interface.CustomerDemandIDSSearch() ) ){
- interface.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
- }
- idstable := selectobject( interface, CustomerDemandIDS, idstable, idstable.ID() = '瀹㈡埛闇�姹�' );
+ search := interface.CustomerDemandIDSSearch( relnew, Product := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate(), TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
+ name := '瀹㈡埛闇�姹�';
+ idstable := selectobject( interface, CustomerDemandIDS, idstable, idstable.ID() = name );
if( isnull( idstable ) ){
- idstable := interface.CustomerDemandIDS( relnew, ID := '瀹㈡埛闇�姹�', Name := '瀹㈡埛闇�姹�' );
+ idstable := interface.CustomerDemandIDS( relnew, ID := name, Name := name );
+ }
+ showtable := selectobject( interface, CustomerDemandIDS, version, version.IsShow() );
+ if( isnull( showtable ) ){
+ showtable := interface.CustomerDemandIDS( relnew, ID := name + 'Show', Name := name, IsShow := true );
}
binaryValue := TemplateManager::GetIDSFullTable( archive, Date::ActualDate().Year() );
source := GeneralExcelImportAndExportDataSource::Upload( recycle, binaryValue, OS::TempPath() + "template.xlsx" );
@@ -34,7 +37,7 @@
periods := idsdates.Union( ppadates );
periods := selectuniquevalues( periods, Elements, e, not exists( idstable, Column, column, column.StartDate() = e ), e );
if( periods.Size() > 0 ){
- idstable.GenerateColumn( periods.Sort() );
+ idstable.GenerateColumn( periods.Sort(), false );
}
traverse( recycle, GeneralExcelImportAndExportDataSource.GeneralExcelImportAndExportDataTable, table ){
traverse( table, GeneralExcelImportAndExportDataRow, row ){
@@ -54,8 +57,12 @@
}
}
traverse ( macroplan, SalesDemand.astype( Forecast ), forecast, not isnull( forecast.Product_MP() ) and forecast.Origin() = 'PPA' ){
+ unitname := ifexpr( forecast.SalesSegment_MP().Name().StartsWith( 'Changchun' )
+ or exists( forecast.SalesSegment_MP().GetAllParent(), Elements, psalessegment, psalessegment.Name().StartsWith( 'Changchun' ) )
+ , FinancialProductionReport::GetDefaultCCUnit()
+ , FinancialProductionReport::GetDefaultDLUnit() );
traverse( forecast, PlanningSalesDemandInPeriod, sdip ){
- idsrow := idstable.GetRowByUnit( forecast.ProductID(), forecast.SalesSegmentName() );
+ idsrow := idstable.GetRowByUnit( forecast.ProductID(), unitname );
daycolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), sdip.StartDate() );
weekcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), sdip.StartDate() );
monthcolumn := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), sdip.StartDate() );
@@ -68,5 +75,6 @@
source.Delete();
info( '-------------------------End---------------------');
+ showtable.Generate( search );
*]
}
diff --git a/_Main/BL/Type_CustomerDemandIDS/StaticMethod_InitiateSearch.qbl b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_InitiateSearch.qbl
new file mode 100644
index 0000000..838f7e1
--- /dev/null
+++ b/_Main/BL/Type_CustomerDemandIDS/StaticMethod_InitiateSearch.qbl
@@ -0,0 +1,28 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod InitiateSearch (
+ InterfaceDataset owner
+) as CustomerDemandIDS
+{
+ TextBody:
+ [*
+ // 鐢勫叞楦� Sep-29-2024 (created)
+ allunit := FinancialProductionReport::GetDefaultAllUnit();
+ search := owner.CustomerDemandIDSSearch();
+ if( isnull( search ) ){
+ search := owner.CustomerDemandIDSSearch( relnew, Product := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
+ }else{
+ search := owner.CustomerDemandIDSSearch();
+ search.Product( allunit );
+ search.TimeUnit( Translations::MP_GlobalParameters_Day() );
+ search.Unit( allunit );
+ search.StartDate( Date::MinDate() );
+ search.EndDate( Date::MaxDate() );
+ }
+ table := selectobject( owner, CustomerDemandIDS, table, table.IsShow() );
+ if( not isnull( table ) ){
+ table.Generate( search);
+ }
+ return table;
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelColumnSearch.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelColumnSearch.def
new file mode 100644
index 0000000..08be1a7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelColumnSearch.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelColumnSearch
+{
+ #keys: '[415136.0.1307730419]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelPeriod_384
+ #child: PanelTimeUnit
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelHeader\043952.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelHeader\043952.def"
index e886467..c6ed4e7 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelHeader\043952.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelHeader\043952.def"
@@ -5,17 +5,12 @@
BaseType: 'WebPanel'
Children:
[
- #child: PanelUnit
- #child: PanelProductLine
- #child: PanelOperation_283
- #child: PanelTimeUnit_234
- #child: PanelPeriod
- #child: PanelProduct_937
+ #child: PanelProductSearch
+ #child: PanelColumnSearch
]
Properties:
[
FixedSize: true
- Orientation: 'horizontal'
Taborder: 2
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelOperation\043283.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelOperation\043283.def"
deleted file mode 100644
index be5a969..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelOperation\043283.def"
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-Component PanelOperation id:PanelOperation_283
-{
- #keys: '[415136.0.1199302076]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ButtonSearch
- {
- #keys: '[415136.0.1199302077]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'VIEW'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- Taborder: 5
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelOperation.def
similarity index 75%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelOperation.def
index b681559..eaabdb8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelOperation.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelOperation
{
- #keys: '[415136.0.1252790299]'
+ #keys: '[415136.0.1307730510]'
BaseType: 'WebPanel'
Children:
[
Component ButtonSearch
{
- #keys: '[415136.0.1252790300]'
+ #keys: '[415136.0.1307730511]'
BaseType: 'WebButton'
Properties:
[
@@ -18,6 +18,6 @@
]
Properties:
[
- Taborder: 5
+ Taborder: 3
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelPeriod\043384.def"
similarity index 73%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
copy to "_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelPeriod\043384.def"
index 1afed44..abbcee2 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelPeriod\043384.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelPeriod id:PanelPeriod_858
+Component PanelPeriod id:PanelPeriod_384
{
- #keys: '[415136.0.1252790303]'
+ #keys: '[415136.0.1307730458]'
BaseType: 'WebPanel'
Children:
[
Component DateSelectorStart
{
- #keys: '[415136.0.1252790304]'
+ #keys: '[415136.0.1307730459]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -17,7 +17,7 @@
}
Component DateSelectorEnd
{
- #keys: '[415136.0.1252790305]'
+ #keys: '[415136.0.1307730460]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -30,6 +30,6 @@
Properties:
[
Orientation: 'horizontal'
- Taborder: 3
+ Taborder: 0
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProduct\043937.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProduct\043937.def"
deleted file mode 100644
index 3a0f44f..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProduct\043937.def"
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-Component PanelProduct id:PanelProduct_937
-{
- #keys: '[415136.0.1199302078]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ddslProduct
- {
- #keys: '[415136.0.1199302079]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- FixedSize: false
- Label: 'Product'
- Sorting: 'none'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Taborder: 2
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProduct.def
similarity index 78%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProduct.def
index 5c5c1e4..f95a591 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProduct.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelProduct
{
- #keys: '[415136.0.1252790306]'
+ #keys: '[415136.0.1307730409]'
BaseType: 'WebPanel'
Children:
[
Component ddslProduct
{
- #keys: '[415136.0.1252790307]'
+ #keys: '[415136.0.1307730410]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -20,7 +20,6 @@
]
Properties:
[
- FixedSize: true
Taborder: 2
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine\043623.def"
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine\043623.def"
index 33c12ae..e027346 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine\043623.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelProductLine
+Component PanelProductLine id:PanelProductLine_623
{
- #keys: '[415136.0.1199302072]'
+ #keys: '[415136.0.1307730382]'
BaseType: 'WebPanel'
Children:
[
Component ddslProductLine
{
- #keys: '[415136.0.1199302073]'
+ #keys: '[415136.0.1307730383]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -18,7 +18,6 @@
]
Properties:
[
- FixedSize: true
Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductSearch.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductSearch.def
new file mode 100644
index 0000000..242e37c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductSearch.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+Component PanelProductSearch
+{
+ #keys: '[415136.0.1307730296]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelOperation
+ #child: PanelUnit_424
+ #child: PanelProductLine_623
+ #child: PanelProduct
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelTimeUnit\043234.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelTimeUnit\043234.def"
deleted file mode 100644
index 4fcaa20..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelTimeUnit\043234.def"
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-Component PanelTimeUnit id:PanelTimeUnit_234
-{
- #keys: '[415136.0.1199302074]'
- BaseType: 'WebPanel'
- Children:
- [
- Component RadioButtonGroupUseForTimeUnit
- {
- #keys: '[415136.0.1199302075]'
- BaseType: 'WebRadioButtonGroup'
- Properties:
- [
- ButtonLabels: 'Day;Week;Month'
- ButtonValues: 'Day;Week;Month'
- Orientation: 'horizontal'
- Taborder: 0
- Title: 'Periods'
- ]
- }
- ]
- Properties:
- [
- Taborder: 4
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelTimeUnit.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelTimeUnit.def
index ab3b485..06beac3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelTimeUnit.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelTimeUnit
{
- #keys: '[415136.0.1252790301]'
+ #keys: '[415136.0.1307730486]'
BaseType: 'WebPanel'
Children:
[
Component RadioButtonGroupUseForTimeUnit
{
- #keys: '[415136.0.1252790302]'
+ #keys: '[415136.0.1307730487]'
BaseType: 'WebRadioButtonGroup'
Properties:
[
@@ -21,6 +21,6 @@
]
Properties:
[
- Taborder: 4
+ Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit\043424.def"
similarity index 70%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit.def
copy to "_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit\043424.def"
index b1aa566..a4a9b96 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit\043424.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelUnit
+Component PanelUnit id:PanelUnit_424
{
- #keys: '[415136.0.1199302066]'
+ #keys: '[415136.0.1307730355]'
BaseType: 'WebPanel'
Children:
[
Component ddslUnit
{
- #keys: '[415136.0.1199302067]'
+ #keys: '[415136.0.1307730356]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -18,7 +18,6 @@
]
Properties:
[
- FixedSize: true
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelOperation_283_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelOperation_283_ButtonSearch_OnClick.def
deleted file mode 100644
index 0fab123..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelOperation_283_ButtonSearch_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelOperation_283/ButtonSearch
-Response OnClick () id:Response_PanelOperation_283_ButtonSearch_OnClick
-{
- #keys: '[415136.0.1283312413]'
- 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_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelOperation_ButtonSearch_OnClick.def
similarity index 92%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelOperation_ButtonSearch_OnClick.def
index 9a2f3b3..32087c6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelOperation_ButtonSearch_OnClick.def
@@ -2,7 +2,7 @@
#parent: PanelOperation/ButtonSearch
Response OnClick () id:Response_PanelOperation_ButtonSearch_OnClick
{
- #keys: '[415136.0.1294002009]'
+ #keys: '[415136.0.1307730509]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorEnd_OnChanged.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorEnd_OnChanged.def
index daae334..38ad752 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorEnd_OnChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelPeriod_858/DateSelectorEnd
-Response OnChanged () id:Response_PanelPeriod_858_DateSelectorEnd_OnChanged
+#parent: PanelPeriod_384/DateSelectorEnd
+Response OnChanged () id:Response_PanelPeriod_384_DateSelectorEnd_OnChanged
{
- #keys: '[415136.0.1252790286]'
+ #keys: '[415136.0.1307730456]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorStart_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorStart_OnChanged.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorStart_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorStart_OnChanged.def
index 8343107..b41dc9b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorStart_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_384_DateSelectorStart_OnChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelPeriod_858/DateSelectorStart
-Response OnChanged () id:Response_PanelPeriod_858_DateSelectorStart_OnChanged
+#parent: PanelPeriod_384/DateSelectorStart
+Response OnChanged () id:Response_PanelPeriod_384_DateSelectorStart_OnChanged
{
- #keys: '[415136.0.1252790287]'
+ #keys: '[415136.0.1307730457]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnCreated.def
similarity index 79%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnCreated.def
index b7d7008..fb1dbd1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnCreated.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelProductLine/ddslProductLine
-Response OnCreated () id:Response_PanelProductLine_ddslProductLine_OnCreated
+#parent: PanelProductLine_623/ddslProductLine
+Response OnCreated () id:Response_PanelProductLine_623_ddslProductLine_OnCreated
{
- #keys: '[415136.0.1199302058]'
+ #keys: '[415136.0.1307730381]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnSelectionChanged.def
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnSelectionChanged.def
index 4fbe4cf..12abb67 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_623_ddslProductLine_OnSelectionChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelProductLine/ddslProductLine
-Response OnSelectionChanged () id:Response_PanelProductLine_ddslProductLine_OnSelectionChanged
+#parent: PanelProductLine_623/ddslProductLine
+Response OnSelectionChanged () id:Response_PanelProductLine_623_ddslProductLine_OnSelectionChanged
{
- #keys: '[415136.0.1199302057]'
+ #keys: '[415136.0.1307730380]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnCreated.def
deleted file mode 100644
index 4ca0680..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnCreated.def
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelProduct_937/ddslProduct
-Response OnCreated () id:Response_PanelProduct_937_ddslProduct_OnCreated
-{
- #keys: '[415136.0.1199302054]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.Name());
-
- valueString := values.Concatenate( ";" );
- valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
-
- valueString := "<All>" + ifexpr( valueString = "", "", ";" ) + valueString;
-
- this.Strings( valueString );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def
deleted file mode 100644
index 59ad2ac..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_937_ddslProduct_OnSelectionChanged.def
+++ /dev/null
@@ -1,19 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelProduct_937/ddslProduct
-Response OnSelectionChanged () id:Response_PanelProduct_937_ddslProduct_OnSelectionChanged
-{
- #keys: '[415136.0.1199302053]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
- QuillAction
- {
- Body:
- [*
- if( not isnull( dhSearch.Data() ) and dhSearch.Data().Product() <> selection ){
- dhSearch.Data().Product( selection );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnCreated.def
similarity index 88%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnCreated.def
index f417c53..b45a912 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnCreated.def
@@ -2,14 +2,14 @@
#parent: PanelProduct/ddslProduct
Response OnCreated () id:Response_PanelProduct_ddslProduct_OnCreated
{
- #keys: '[415136.0.1252790285]'
+ #keys: '[415136.0.1307730408]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
{
Body:
[*
- values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.Name() );
+ values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.Name());
valueString := values.Concatenate( ";" );
valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
similarity index 94%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
index 95d20d3..afa901b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
@@ -2,7 +2,7 @@
#parent: PanelProduct/ddslProduct
Response OnSelectionChanged () id:Response_PanelProduct_ddslProduct_OnSelectionChanged
{
- #keys: '[415136.0.1252790284]'
+ #keys: '[415136.0.1307730407]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnChanged.def
deleted file mode 100644
index 1c80e7f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnChanged.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelTimeUnit_234/RadioButtonGroupUseForTimeUnit
-Response OnChanged () id:Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnChanged
-{
- #keys: '[415136.0.1199302056]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebRadioButtonGroup_OnChanged'
- QuillAction
- {
- Body:
- [*
- //鍖洪棿鏀瑰彉鍚庡埛鏂版樉绀�
- if( dhSearch.Data().TimeUnit() <> this.BoundValue() ){
- dhSearch.Data().TimeUnit( this.BoundValue() );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
similarity index 94%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
index 533f7a1..f1bdaeb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
@@ -2,7 +2,7 @@
#parent: PanelTimeUnit/RadioButtonGroupUseForTimeUnit
Response OnChanged () id:Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged
{
- #keys: '[415136.0.1252790289]'
+ #keys: '[415136.0.1307730485]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebRadioButtonGroup_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
similarity index 93%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
index c047bee..157a002 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
@@ -2,7 +2,7 @@
#parent: PanelTimeUnit/RadioButtonGroupUseForTimeUnit
Response OnCreated () id:Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated
{
- #keys: '[415136.0.1252790288]'
+ #keys: '[415136.0.1307730484]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnCreated.def
similarity index 74%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnCreated.def
index 039803f..6eaca21 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnCreated.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelUnit/ddslUnit
-Response OnCreated () id:Response_PanelUnit_ddslUnit_OnCreated
+#parent: PanelUnit_424/ddslUnit
+Response OnCreated () id:Response_PanelUnit_424_ddslUnit_OnCreated
{
- #keys: '[415136.0.1199302062]'
+ #keys: '[415136.0.1307730354]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnSelectionChanged.def
similarity index 77%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnSelectionChanged.def
index 4757452..f3d5613 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_424_ddslUnit_OnSelectionChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelUnit_844/ddslUnit
-Response OnSelectionChanged () id:Response_PanelUnit_844_ddslUnit_OnSelectionChanged
+#parent: PanelUnit_424/ddslUnit
+Response OnSelectionChanged () id:Response_PanelUnit_424_ddslUnit_OnSelectionChanged
{
- #keys: '[415136.0.1252790292]'
+ #keys: '[415136.0.1307730353]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
deleted file mode 100644
index 4b71402..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
+++ /dev/null
@@ -1,19 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelUnit/ddslUnit
-Response OnSelectionChanged () id:Response_PanelUnit_ddslUnit_OnSelectionChanged
-{
- #keys: '[415136.0.1199302061]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
- QuillAction
- {
- Body:
- [*
- if( not isnull( dhSearch.Data() ) and dhSearch.Data().Unit() <> selection ){
- dhSearch.Data().Unit( selection );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def
index a8679fc..0d843ab 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Component_PanelProduct.def
@@ -20,7 +20,6 @@
]
Properties:
[
- FixedSize: true
Taborder: 3
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelColumnSearch.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelColumnSearch.def
new file mode 100644
index 0000000..5e19d64
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelColumnSearch.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelColumnSearch
+{
+ #keys: '[415136.0.1307935295]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelPeriod_71
+ #child: PanelTimeUnit
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 1
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelHeader\043503.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelHeader\043503.def"
index ca35885..3966817 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelHeader\043503.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelHeader\043503.def"
@@ -5,16 +5,12 @@
BaseType: 'WebPanel'
Children:
[
- #child: PanelUnit
- #child: PanelOperation_414
- #child: PanelTimeUnit_805
- #child: PanelPeriod
- #child: PanelProduct_133
+ #child: PanelColumnSearch
+ #child: PanelRowSearch
]
Properties:
[
FixedSize: true
- Orientation: 'horizontal'
Taborder: 2
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelOperation\043414.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelOperation\043414.def"
deleted file mode 100644
index a48a72b..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelOperation\043414.def"
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-Component PanelOperation id:PanelOperation_414
-{
- #keys: '[415136.0.1277502018]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ButtonSearch
- {
- #keys: '[415136.0.1277502019]'
- BaseType: 'WebButton'
- Properties:
- [
- Image: 'VIEW'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- Taborder: 4
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelOperation.def
similarity index 75%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelOperation.def
index b681559..fe79643 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelOperation.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelOperation
{
- #keys: '[415136.0.1252790299]'
+ #keys: '[415136.0.1307935388]'
BaseType: 'WebPanel'
Children:
[
Component ButtonSearch
{
- #keys: '[415136.0.1252790300]'
+ #keys: '[415136.0.1307935389]'
BaseType: 'WebButton'
Properties:
[
@@ -18,6 +18,6 @@
]
Properties:
[
- Taborder: 5
+ Taborder: 2
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod\04371.def"
similarity index 73%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod\04371.def"
index 1afed44..f1e7c43 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod\04371.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelPeriod id:PanelPeriod_858
+Component PanelPeriod id:PanelPeriod_71
{
- #keys: '[415136.0.1252790303]'
+ #keys: '[415136.0.1307935336]'
BaseType: 'WebPanel'
Children:
[
Component DateSelectorStart
{
- #keys: '[415136.0.1252790304]'
+ #keys: '[415136.0.1307935337]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -17,7 +17,7 @@
}
Component DateSelectorEnd
{
- #keys: '[415136.0.1252790305]'
+ #keys: '[415136.0.1307935338]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -30,6 +30,6 @@
Properties:
[
Orientation: 'horizontal'
- Taborder: 3
+ Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod.def
deleted file mode 100644
index 5e11bd8..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod.def
+++ /dev/null
@@ -1,35 +0,0 @@
-Quintiq file version 2.0
-Component PanelPeriod
-{
- #keys: '[415136.0.1277502013]'
- BaseType: 'WebPanel'
- Children:
- [
- Component DateSelectorStart
- {
- #keys: '[415136.0.1277502014]'
- BaseType: 'WebDateSelector'
- Properties:
- [
- Label: 'Start date'
- Taborder: 0
- ]
- }
- Component DateSelectorEnd
- {
- #keys: '[415136.0.1277502015]'
- BaseType: 'WebDateSelector'
- Properties:
- [
- Date: 9999-12-31
- Label: 'End date'
- Taborder: 1
- ]
- }
- ]
- Properties:
- [
- Orientation: 'horizontal'
- Taborder: 2
- ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelProduct\043133.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelProduct\043133.def"
deleted file mode 100644
index 213e535..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelProduct\043133.def"
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-Component PanelProduct id:PanelProduct_133
-{
- #keys: '[415136.0.1277502011]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ddslProduct
- {
- #keys: '[415136.0.1277502012]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- FixedSize: false
- Label: 'Product'
- Sorting: 'none'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelProduct.def
similarity index 75%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelProduct.def
index 5c5c1e4..c8ea5a5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelProduct.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelProduct
{
- #keys: '[415136.0.1252790306]'
+ #keys: '[415136.0.1307935280]'
BaseType: 'WebPanel'
Children:
[
Component ddslProduct
{
- #keys: '[415136.0.1252790307]'
+ #keys: '[415136.0.1307935281]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -20,7 +20,6 @@
]
Properties:
[
- FixedSize: true
- Taborder: 2
+ Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelRowSearch.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelRowSearch.def
new file mode 100644
index 0000000..5a3d0e5
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelRowSearch.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component PanelRowSearch
+{
+ #keys: '[415136.0.1307935211]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelUnit_925
+ #child: PanelProduct
+ #child: PanelOperation
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelTimeUnit\043805.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelTimeUnit\043805.def"
deleted file mode 100644
index 2e212a8..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelTimeUnit\043805.def"
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-Component PanelTimeUnit id:PanelTimeUnit_805
-{
- #keys: '[415136.0.1277502016]'
- BaseType: 'WebPanel'
- Children:
- [
- Component RadioButtonGroupUseForTimeUnit
- {
- #keys: '[415136.0.1277502017]'
- BaseType: 'WebRadioButtonGroup'
- Properties:
- [
- ButtonLabels: 'Day;Week;Month'
- ButtonValues: 'Day;Week;Month'
- Orientation: 'horizontal'
- Taborder: 0
- Title: 'Periods'
- ]
- }
- ]
- Properties:
- [
- Taborder: 3
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelTimeUnit.def
similarity index 82%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelTimeUnit.def
index ab3b485..d15670d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelTimeUnit.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelTimeUnit
{
- #keys: '[415136.0.1252790301]'
+ #keys: '[415136.0.1307935364]'
BaseType: 'WebPanel'
Children:
[
Component RadioButtonGroupUseForTimeUnit
{
- #keys: '[415136.0.1252790302]'
+ #keys: '[415136.0.1307935365]'
BaseType: 'WebRadioButtonGroup'
Properties:
[
@@ -21,6 +21,6 @@
]
Properties:
[
- Taborder: 4
+ Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelUnit.def "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelUnit\043925.def"
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelUnit.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelUnit\043925.def"
index df6d463..3282220 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelUnit.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelUnit\043925.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelUnit
+Component PanelUnit id:PanelUnit_925
{
- #keys: '[415136.0.1277502022]'
+ #keys: '[415136.0.1307935253]'
BaseType: 'WebPanel'
Children:
[
Component ddslUnit
{
- #keys: '[415136.0.1277502023]'
+ #keys: '[415136.0.1307935254]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -18,7 +18,6 @@
]
Properties:
[
- FixedSize: true
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def
similarity index 92%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def
index 9a2f3b3..d613ac6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def
@@ -2,7 +2,7 @@
#parent: PanelOperation/ButtonSearch
Response OnClick () id:Response_PanelOperation_ButtonSearch_OnClick
{
- #keys: '[415136.0.1294002009]'
+ #keys: '[415136.0.1307935387]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorEnd_OnChanged.def
similarity index 79%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorEnd_OnChanged.def
index daae334..e68cf28 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_858_DateSelectorEnd_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorEnd_OnChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelPeriod_858/DateSelectorEnd
-Response OnChanged () id:Response_PanelPeriod_858_DateSelectorEnd_OnChanged
+#parent: PanelPeriod_71/DateSelectorEnd
+Response OnChanged () id:Response_PanelPeriod_71_DateSelectorEnd_OnChanged
{
- #keys: '[415136.0.1252790286]'
+ #keys: '[415136.0.1307935334]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorStart_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorStart_OnChanged.def
similarity index 79%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorStart_OnChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorStart_OnChanged.def
index 6344643..6adb711 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorStart_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_71_DateSelectorStart_OnChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelPeriod/DateSelectorStart
-Response OnChanged () id:Response_PanelPeriod_DateSelectorStart_OnChanged
+#parent: PanelPeriod_71/DateSelectorStart
+Response OnChanged () id:Response_PanelPeriod_71_DateSelectorStart_OnChanged
{
- #keys: '[415136.0.1199302052]'
+ #keys: '[415136.0.1307935335]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_DateSelectorEnd_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
deleted file mode 100644
index 6d722a4..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
+++ /dev/null
@@ -1,24 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelPeriod/DateSelectorEnd
-Response OnChanged () id:Response_PanelPeriod_DateSelectorEnd_OnChanged
-{
- #keys: '[415136.0.1277502006]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
- QuillAction
- {
- Body:
- [*
- //鏃ユ湡鏀瑰彉鍚庡埛鏂版樉绀�
- if( this.Date() < DateSelectorStart.Date() ){
- this.HintError( 'The end date cannot be less than the start date!' );
- }else{
- if( dhSearch.Data().EndDate() <> this.Date() ){
- dhSearch.Data().EndDate( this.Date() );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_DateSelectorStart_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_DateSelectorStart_OnChanged.def
deleted file mode 100644
index 2c1808f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelPeriod_DateSelectorStart_OnChanged.def
+++ /dev/null
@@ -1,24 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelPeriod/DateSelectorStart
-Response OnChanged () id:Response_PanelPeriod_DateSelectorStart_OnChanged
-{
- #keys: '[415136.0.1277502007]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
- QuillAction
- {
- Body:
- [*
- //鏃ユ湡鏀瑰彉鍚庡埛鏂版樉绀�
- if( this.Date() > DateSelectorEnd.Date() ){
- this.HintError( 'The start date cannot be later than the end date!' );
- }else{
- if( dhSearch.Data().StartDate() <> this.Date() ){
- dhSearch.Data().StartDate( this.Date() );
- // DataHolderTable.Data().Generate( dhSearch.Data(), DataHolderProduct.Data() );
- }
- }
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
similarity index 95%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
index f417c53..d7ea4ac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnCreated.def
@@ -2,7 +2,7 @@
#parent: PanelProduct/ddslProduct
Response OnCreated () id:Response_PanelProduct_ddslProduct_OnCreated
{
- #keys: '[415136.0.1252790285]'
+ #keys: '[415136.0.1307935279]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
similarity index 94%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
index 95d20d3..da565ee 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_ddslProduct_OnSelectionChanged.def
@@ -2,7 +2,7 @@
#parent: PanelProduct/ddslProduct
Response OnSelectionChanged () id:Response_PanelProduct_ddslProduct_OnSelectionChanged
{
- #keys: '[415136.0.1252790284]'
+ #keys: '[415136.0.1307935278]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnCreated.def
deleted file mode 100644
index 9e663e5..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelTimeUnit_805/RadioButtonGroupUseForTimeUnit
-Response OnCreated () id:Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnCreated
-{
- #keys: '[415136.0.1277502004]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- this.ButtonValues( Translations::MP_GlobalParameters_Day() + ';' + Translations::MP_GlobalParameters_Week() + ';' + Translations::MP_GlobalParameters_Month() );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
similarity index 94%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
index 533f7a1..90508a8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged.def
@@ -2,7 +2,7 @@
#parent: PanelTimeUnit/RadioButtonGroupUseForTimeUnit
Response OnChanged () id:Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnChanged
{
- #keys: '[415136.0.1252790289]'
+ #keys: '[415136.0.1307935363]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebRadioButtonGroup_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
similarity index 93%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
index c047bee..4dc7684 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated.def
@@ -2,7 +2,7 @@
#parent: PanelTimeUnit/RadioButtonGroupUseForTimeUnit
Response OnCreated () id:Response_PanelTimeUnit_RadioButtonGroupUseForTimeUnit_OnCreated
{
- #keys: '[415136.0.1252790288]'
+ #keys: '[415136.0.1307935362]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnCreated.def
similarity index 75%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnCreated.def
index 6f1016c..80dd725 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnCreated.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelUnit_844/ddslUnit
-Response OnCreated () id:Response_PanelUnit_844_ddslUnit_OnCreated
+#parent: PanelUnit_925/ddslUnit
+Response OnCreated () id:Response_PanelUnit_925_ddslUnit_OnCreated
{
- #keys: '[415136.0.1252790293]'
+ #keys: '[415136.0.1307935252]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnSelectionChanged.def
similarity index 77%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnSelectionChanged.def
index 4757452..a710562 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_925_ddslUnit_OnSelectionChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelUnit_844/ddslUnit
-Response OnSelectionChanged () id:Response_PanelUnit_844_ddslUnit_OnSelectionChanged
+#parent: PanelUnit_925/ddslUnit
+Response OnSelectionChanged () id:Response_PanelUnit_925_ddslUnit_OnSelectionChanged
{
- #keys: '[415136.0.1252790292]'
+ #keys: '[415136.0.1307935251]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_ddslUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_ddslUnit_OnCreated.def
deleted file mode 100644
index 7f50829..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_ddslUnit_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelUnit/ddslUnit
-Response OnCreated () id:Response_PanelUnit_ddslUnit_OnCreated
-{
- #keys: '[415136.0.1277502001]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- this.Strings( FinancialProductionReport::GetDefaultAllUnit().Concat( ";" ).Concat( FinancialProductionReport::GetDefaultCCUnit().Concat( ";" ) ).Concat( FinancialProductionReport::GetDefaultDLUnit() ) );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelColumnSaerch.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelColumnSaerch.def
new file mode 100644
index 0000000..838adc6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelColumnSaerch.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelColumnSaerch
+{
+ #keys: '[415136.0.1306620738]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelPeriod
+ #child: PanelTimeUnit_720
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def
index d89266b..a96cd6a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelHeader.def
@@ -5,17 +5,12 @@
BaseType: 'WebPanel'
Children:
[
- #child: PanelProduct
- #child: PanelPeriod_858
- #child: PanelTimeUnit
- #child: PanelOperation
- #child: PanelProductLine_603
- #child: PanelUnit_844
+ #child: PanelRowSearch
+ #child: PanelColumnSaerch
]
Properties:
[
FixedSize: true
- Orientation: 'horizontal'
Taborder: 2
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation\043679.def"
similarity index 63%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
copy to "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation\043679.def"
index b681559..e97022e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelOperation\043679.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelOperation
+Component PanelOperation id:PanelOperation_679
{
- #keys: '[415136.0.1252790299]'
+ #keys: '[415136.0.1306620726]'
BaseType: 'WebPanel'
Children:
[
Component ButtonSearch
{
- #keys: '[415136.0.1252790300]'
+ #keys: '[415136.0.1306620727]'
BaseType: 'WebButton'
Properties:
[
@@ -18,6 +18,6 @@
]
Properties:
[
- Taborder: 5
+ Taborder: 3
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelPeriod.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod.def
similarity index 79%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelPeriod.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod.def
index 346d79a..dda4554 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelPeriod.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelPeriod
{
- #keys: '[415136.0.1199302080]'
+ #keys: '[415136.0.1306620778]'
BaseType: 'WebPanel'
Children:
[
Component DateSelectorStart
{
- #keys: '[415136.0.1199302081]'
+ #keys: '[415136.0.1306620779]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -17,7 +17,7 @@
}
Component DateSelectorEnd
{
- #keys: '[415136.0.1199302082]'
+ #keys: '[415136.0.1306620780]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -30,6 +30,6 @@
Properties:
[
Orientation: 'horizontal'
- Taborder: 3
+ Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct\043780.def"
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
copy to "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct\043780.def"
index 5c5c1e4..02b7129 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct\043780.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelProduct
+Component PanelProduct id:PanelProduct_780
{
- #keys: '[415136.0.1252790306]'
+ #keys: '[415136.0.1306620702]'
BaseType: 'WebPanel'
Children:
[
Component ddslProduct
{
- #keys: '[415136.0.1252790307]'
+ #keys: '[415136.0.1306620703]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -20,7 +20,6 @@
]
Properties:
[
- FixedSize: true
Taborder: 2
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def"
deleted file mode 100644
index 952a262..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def"
+++ /dev/null
@@ -1,25 +0,0 @@
-Quintiq file version 2.0
-Component PanelProductLine id:PanelProductLine_603
-{
- #keys: '[415136.0.1252790297]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ddsProductLine
- {
- #keys: '[415136.0.1252790298]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- Label: 'Product line'
- Sorting: 'none'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Taborder: 1
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def
similarity index 68%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def
index 33c12ae..fb4edc1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def
@@ -1,24 +1,24 @@
Quintiq file version 2.0
Component PanelProductLine
{
- #keys: '[415136.0.1199302072]'
+ #keys: '[415136.0.1306620675]'
BaseType: 'WebPanel'
Children:
[
- Component ddslProductLine
+ Component ddsProductLine
{
- #keys: '[415136.0.1199302073]'
+ #keys: '[415136.0.1306620676]'
BaseType: 'WebDropDownStringList'
Properties:
[
Label: 'Product line'
+ Sorting: 'none'
Taborder: 0
]
}
]
Properties:
[
- FixedSize: true
Taborder: 1
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelRowSearch.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelRowSearch.def
new file mode 100644
index 0000000..5d7cd85
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelRowSearch.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+Component PanelRowSearch
+{
+ #keys: '[415136.0.1306620605]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelUnit
+ #child: PanelProductLine
+ #child: PanelProduct_780
+ #child: PanelOperation_679
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit\043720.def"
similarity index 74%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
copy to "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit\043720.def"
index ab3b485..b2391b0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelTimeUnit\043720.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelTimeUnit
+Component PanelTimeUnit id:PanelTimeUnit_720
{
- #keys: '[415136.0.1252790301]'
+ #keys: '[415136.0.1306620806]'
BaseType: 'WebPanel'
Children:
[
Component RadioButtonGroupUseForTimeUnit
{
- #keys: '[415136.0.1252790302]'
+ #keys: '[415136.0.1306620807]'
BaseType: 'WebRadioButtonGroup'
Properties:
[
@@ -21,6 +21,6 @@
]
Properties:
[
- Taborder: 4
+ Taborder: 1
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit\043844.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit\043844.def"
deleted file mode 100644
index 9539dc9..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit\043844.def"
+++ /dev/null
@@ -1,24 +0,0 @@
-Quintiq file version 2.0
-Component PanelUnit id:PanelUnit_844
-{
- #keys: '[415136.0.1252790295]'
- BaseType: 'WebPanel'
- Children:
- [
- Component ddslUnit
- {
- #keys: '[415136.0.1252790296]'
- BaseType: 'WebDropDownStringList'
- Properties:
- [
- Label: 'Unit'
- Taborder: 0
- ]
- }
- ]
- Properties:
- [
- FixedSize: true
- Taborder: 0
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit.def
similarity index 75%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit.def
index b1aa566..f7ae386 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelUnit.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelUnit.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component PanelUnit
{
- #keys: '[415136.0.1199302066]'
+ #keys: '[415136.0.1306620648]'
BaseType: 'WebPanel'
Children:
[
Component ddslUnit
{
- #keys: '[415136.0.1199302067]'
+ #keys: '[415136.0.1306620649]'
BaseType: 'WebDropDownStringList'
Properties:
[
@@ -18,7 +18,6 @@
]
Properties:
[
- FixedSize: true
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelOperation_414_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_679_ButtonSearch_OnClick.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelOperation_414_ButtonSearch_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_679_ButtonSearch_OnClick.def
index ff0e907..563457f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelOperation_414_ButtonSearch_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_679_ButtonSearch_OnClick.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelOperation_414/ButtonSearch
-Response OnClick () id:Response_PanelOperation_414_ButtonSearch_OnClick
+#parent: PanelOperation_679/ButtonSearch
+Response OnClick () id:Response_PanelOperation_679_ButtonSearch_OnClick
{
- #keys: '[415136.0.1285202243]'
+ #keys: '[415136.0.1306620725]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebButton_OnClick'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorEnd_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
similarity index 95%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
index 47cc9a6..195eb37 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorEnd_OnChanged.def
@@ -2,7 +2,7 @@
#parent: PanelPeriod/DateSelectorEnd
Response OnChanged () id:Response_PanelPeriod_DateSelectorEnd_OnChanged
{
- #keys: '[415136.0.1199302051]'
+ #keys: '[415136.0.1306620776]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorStart_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorStart_OnChanged.def
similarity index 95%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorStart_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorStart_OnChanged.def
index 6344643..aa01c40 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelPeriod_DateSelectorStart_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelPeriod_DateSelectorStart_OnChanged.def
@@ -2,7 +2,7 @@
#parent: PanelPeriod/DateSelectorStart
Response OnChanged () id:Response_PanelPeriod_DateSelectorStart_OnChanged
{
- #keys: '[415136.0.1199302052]'
+ #keys: '[415136.0.1306620777]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnCreated.def
deleted file mode 100644
index ad2a4c4..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnCreated.def
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelProductLine_603/ddsProductLine
-Response OnCreated () id:Response_PanelProductLine_603_ddsProductLine_OnCreated
-{
- #keys: '[415136.0.1252790291]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebComponent_OnCreated'
- QuillAction
- {
- Body:
- [*
- values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.ProductionLine() );
-
- valueString := values.Concatenate( ";" );
- valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
-
- valueString := "<All>" + ifexpr( valueString = "", "", ";" ) + valueString;
-
- this.Strings( valueString );
- *]
- GroupServerCalls: false
- }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnCreated.def
similarity index 79%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnCreated.def
index b7d7008..e2787a7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnCreated.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelProductLine/ddslProductLine
-Response OnCreated () id:Response_PanelProductLine_ddslProductLine_OnCreated
+#parent: PanelProductLine/ddsProductLine
+Response OnCreated () id:Response_PanelProductLine_ddsProductLine_OnCreated
{
- #keys: '[415136.0.1199302058]'
+ #keys: '[415136.0.1306620674]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnSelectionChanged.def
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnSelectionChanged.def
index 5630304..e59635c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_ddsProductLine_OnSelectionChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelProductLine_603/ddsProductLine
-Response OnSelectionChanged () id:Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged
+#parent: PanelProductLine/ddsProductLine
+Response OnSelectionChanged () id:Response_PanelProductLine_ddsProductLine_OnSelectionChanged
{
- #keys: '[415136.0.1252790290]'
+ #keys: '[415136.0.1306620673]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_133_ddslProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnCreated.def
similarity index 81%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_133_ddslProduct_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnCreated.def
index 13227ef..012c4c9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_133_ddslProduct_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnCreated.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelProduct_133/ddslProduct
-Response OnCreated () id:Response_PanelProduct_133_ddslProduct_OnCreated
+#parent: PanelProduct_780/ddslProduct
+Response OnCreated () id:Response_PanelProduct_780_ddslProduct_OnCreated
{
- #keys: '[415136.0.1277502009]'
+ #keys: '[415136.0.1306620701]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_133_ddslProduct_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnSelectionChanged.def
similarity index 76%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_133_ddslProduct_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnSelectionChanged.def
index dd4d1b6..e50636e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelProduct_133_ddslProduct_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProduct_780_ddslProduct_OnSelectionChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelProduct_133/ddslProduct
-Response OnSelectionChanged () id:Response_PanelProduct_133_ddslProduct_OnSelectionChanged
+#parent: PanelProduct_780/ddslProduct
+Response OnSelectionChanged () id:Response_PanelProduct_780_ddslProduct_OnSelectionChanged
{
- #keys: '[415136.0.1277502008]'
+ #keys: '[415136.0.1306620700]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnChanged.def
index ca64cd0..a053358 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnChanged.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelTimeUnit_805/RadioButtonGroupUseForTimeUnit
-Response OnChanged () id:Response_PanelTimeUnit_805_RadioButtonGroupUseForTimeUnit_OnChanged
+#parent: PanelTimeUnit_720/RadioButtonGroupUseForTimeUnit
+Response OnChanged () id:Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnChanged
{
- #keys: '[415136.0.1277502005]'
+ #keys: '[415136.0.1306620805]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebRadioButtonGroup_OnChanged'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnCreated.def
index 10cf9b7..77605e9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnCreated.def
@@ -1,8 +1,8 @@
Quintiq file version 2.0
-#parent: PanelTimeUnit_234/RadioButtonGroupUseForTimeUnit
-Response OnCreated () id:Response_PanelTimeUnit_234_RadioButtonGroupUseForTimeUnit_OnCreated
+#parent: PanelTimeUnit_720/RadioButtonGroupUseForTimeUnit
+Response OnCreated () id:Response_PanelTimeUnit_720_RadioButtonGroupUseForTimeUnit_OnCreated
{
- #keys: '[415136.0.1199302055]'
+ #keys: '[415136.0.1306620804]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnCreated.def
similarity index 93%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnCreated.def
index 039803f..9397c84 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnCreated.def
@@ -2,7 +2,7 @@
#parent: PanelUnit/ddslUnit
Response OnCreated () id:Response_PanelUnit_ddslUnit_OnCreated
{
- #keys: '[415136.0.1199302062]'
+ #keys: '[415136.0.1306620647]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebComponent_OnCreated'
QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_ddslUnit_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
similarity index 93%
rename from _Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
index d90934c..b29e3d6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_ddslUnit_OnSelectionChanged.def
@@ -2,7 +2,7 @@
#parent: PanelUnit/ddslUnit
Response OnSelectionChanged () id:Response_PanelUnit_ddslUnit_OnSelectionChanged
{
- #keys: '[415136.0.1277502000]'
+ #keys: '[415136.0.1306620646]'
CanBindMultiple: false
DefinitionID: 'Responsedef_WebDropDownStringList_OnSelectionChanged'
QuillAction
--
Gitblit v1.9.3