From d34af9674e5a3431fa9d498067657abd39c1f97a Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 04 十一月 2024 17:13:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Werk.qbl | 8 ++
_Main/BL/Type_OfflinePlanArchiveVersionRow/Attribute_Unit.qbl | 8 ++
_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_Publish.qbl | 18 ++++--
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnSelectionChanged.def | 4
_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Werk.qbl | 6 ++
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnCreated.def | 4
_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Werk.qbl | 8 ++
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def | 1
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def | 9 --
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def | 3
_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl | 8 ++
_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl | 5 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged.def | 4
_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl | 5 +
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine#603.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def | 9 --
_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl | 31 +++++-----
_Main/BL/Type_AssemblyOnlinePlanVersionRow/Attribute_Unit.qbl | 8 ++
_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl | 8 +-
21 files changed, 102 insertions(+), 57 deletions(-)
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
index cd645ae..e1a117f 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
@@ -40,7 +40,13 @@
, VersionTo := versionto, IsActive := versionflag );
loginfo.AOnlineAndMOfflinePlanMS64( relinsert, ms64 );
traverse( products, Elements, product, product.IsLeaf() ){
- ms64.MS64Data( relnew, Product := product.ID() );
+ if( werk = 'All' ){
+ ms64.MS64Data( relnew, Product := product.ID(), Werk := '8200' );
+ ms64.MS64Data( relnew, Product := product.ID(), Werk := '8201' );
+ }else{
+ ms64.MS64Data( relnew, Product := product.ID(), Werk := ms64.Werk() );
+ }
+
}
loginfo.TotalRow( ms64.MS64Data( relsize ) );
InterfaceLoginfo::CallInterfaceForSAPGet( owner, loginfo );
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Werk.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Werk.qbl
new file mode 100644
index 0000000..68d3067
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/Attribute_Werk.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Werk
+{
+ #keys: '3[415136.0.1273010070][415136.0.1273010069][415136.0.1273010071]'
+ Description: '宸ュ巶'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Werk.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Werk.qbl
new file mode 100644
index 0000000..b54c735
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64Data/DefaultValue_Werk.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#parent: #root
+DefaultValue
+{
+ TargetAttribute: Werk
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
index bad399c..f07250e 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -38,45 +38,44 @@
loginfo.AOnlineAndMOfflinePlanPIR( relinsert, pir );
traverse( owner, AssemblyOnlinePlanVersion, verison, not verison.IsShow() ){
traverse( verison, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() >= startdate and column.StartDate() <= enddate ){
- traverse( column, Cell, cell, ( werk = 'All' or cell.Row().ProductionLine().FindString( werk, 0 ) > -1 )
- and cell.Row().Type() = '1' ){
- quantityrow := cell.Row();
+ traverse( column, Cell, cell, ( werk = 'All' or cell.Row().Unit().FindString( werk, 0 ) > -1 ) ){
+ quantityrow := cell.Row();
+ rowwerk := ifexpr( quantityrow.ProductionLine().FindString( "CC", 0 ) > -1, AOnlineAndMOfflinePlanPIR::GetWerk( FinancialProductionReport::GetDefaultCCUnit() ), AOnlineAndMOfflinePlanPIR::GetWerk( FinancialProductionReport::GetDefaultDLUnit() ) );
if( not exists( productids, Elements, e, e = quantityrow.ProductID() ) ){
productids.Add( quantityrow.ProductID() );
}
- pir.PIRData( relnew, Product := quantityrow.ProductID()
- , PlanningDate := column.StartDate()
- , PlanningQty := [Number]cell.Value());
+ pir.PIRData( relnew, Product := quantityrow.ProductID(), PlanningDate := column.StartDate(), PlanningQty := [Number]cell.Value(), Werk := rowwerk );
}
}
}
traverse( owner, OfflinePlanArchiveVersion, table ){
traverse( table, Column, column, column.StartDate() >= startdate and column.StartDate() <= enddate ){
- traverse( column, Cell, cell, ( werk = 'All' or cell.Row().ProductionLine().FindString( werk, 0 ) > -1 )
- and ( cell.Row().ProductionLine() <> 'DL_MOMO' or cell.Row().ProductionLine() <> 'CC_MOMO' )
- and cell.Row().Type() = '1' ){
+ traverse( column, Cell, cell, ( werk = 'All' or cell.Row().Unit().FindString( werk, 0 ) > -1 )
+ and ( cell.Row().ProductionLine() <> 'DL_MOMO' or cell.Row().ProductionLine() <> 'CC_MOMO' ) ){
row := cell.Row();
+ rowwerk := ifexpr( row.ProductionLine().FindString( "CC", 0 ) > -1, AOnlineAndMOfflinePlanPIR::GetWerk( FinancialProductionReport::GetDefaultCCUnit() ), AOnlineAndMOfflinePlanPIR::GetWerk( FinancialProductionReport::GetDefaultDLUnit() ) );
if( not exists( productids, Elements, e, e = row.ProductID() ) ){
productids.Add( row.ProductID() );
}
pirdata := selectobject( pir, PIRData, pirdata, pirdata.Product() = row.ProductID() and pirdata.PlanningDate() = column.StartDate() );
if( isnull( pirdata ) ){
- pirdata := pir.PIRData( relnew, Product := row.ProductID()
- , PlanningDate := column.StartDate()
- , PlanningQty := 0 );
+ pirdata := pir.PIRData( relnew, Product := row.ProductID(), PlanningDate := column.StartDate(), PlanningQty := 0, Werk := rowwerk );
}
pirdata.PlanningQty( pirdata.PlanningQty() + [Number]cell.Value() );
}
}
}
traverse( productids, Elements, e ){
- for( date := startdate.StartOfWeek(); date <= enddate; date := ( date + Duration::Days( 1 ) ).Date() ){
+ for( date := startdate.StartOfWeek(); date <= enddate; date := ( date + Duration::Days( 1 ) ).Date() ){
if( not exists( pir, PIRData, pirdata, pirdata.Product() = e and pirdata.PlanningDate() = date ) ){
- pir.PIRData( relnew, Product := e
- , PlanningDate := date
- , PlanningQty := 0 );
+ if( werk = 'All' ){
+ pir.PIRData( relnew, Product := e, PlanningDate := date, PlanningQty := 0, Werk := '8200' );
+ pir.PIRData( relnew, Product := e, PlanningDate := date, PlanningQty := 0, Werk := '8201' );
+ }else{
+ pir.PIRData( relnew, Product := e, PlanningDate := date, PlanningQty := 0, Werk := pir.Werk() );
+ }
}
}
}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Werk.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Werk.qbl
new file mode 100644
index 0000000..fb0beeb
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIRData/Attribute_Werk.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Werk
+{
+ #keys: '3[415136.0.1273030043][415136.0.1273030042][415136.0.1273030044]'
+ Description: '宸ュ巶'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
index 8e5337b..46d2d9a 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/Method_GetRow.qbl
@@ -7,10 +7,11 @@
TextBody:
[*
// 鐢勫叞楦� Oct-11-2024 (created)
- row := selectobject( this, Row, row, row.ProductID() = aoprow.ProductID() and row.ProductionLine() = aoprow.ProductionLine() and row.Type() = aoprow.Type() );
+ row := selectobject( this, Row, row, row.ProductID() = aoprow.ProductID() and row.ProductionLine() = aoprow.ProductionLine() and row.Type() = aoprow.Type() );
if( isnull( row ) ){
- row := this.Row( relnew, ProductID := aoprow.ProductID(), ProductionLine := aoprow.ProductionLine(), Type := aoprow.Type() );
+ unit := ifexpr( aoprow.ProductionLine().FindString( "CC", 0 ) > -1, FinancialProductionReport::GetDefaultCCUnit(), FinancialProductionReport::GetDefaultDLUnit() );
+ row := this.Row( relnew, ProductID := aoprow.ProductID(), ProductionLine := aoprow.ProductionLine(), Type := aoprow.Type(), Unit := unit );
//鍒濆鍖栧崟鍏冩牸
row.InitializeCell();
}
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
index a22c383..559e5c3 100644
--- a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl
@@ -8,6 +8,7 @@
TextBody:
[*
//鏍规嵁褰撳墠鐗堟湰鐨勮閰嶄笂绾胯鍒�
+ //interface.AssemblyOnlinePlanVersion( relflush );
allunit := AssemblyOnlinePlanVersion::GetDefaultAllUnit();
name := AssemblyOnlinePlanVersion::GetDefaultName();
search := interface.AssemblyOnlinePlanVersionSearch( relnew, Product := allunit, ProductionLine := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
@@ -19,11 +20,12 @@
if( isnull( table ) ){
showtable := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name, IsShow := true );
}
- aopcolumns := selectuniquevalues( macroPlan, AssemblyOnlinePlanColumn, aopcolumn, not exists( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcolumn.ColumnDate() ), aopcolumn.ColumnDate() );
+ aopcolumns := selectuniquevalues( macroPlan, AssemblyOnlinePlanColumn, aopcolumn, aopcolumn.ColumnIndex() > 1 and not exists( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcolumn.ColumnDate() ), aopcolumn.ColumnDate() );
table.GenerateColumn( aopcolumns, search.TimeUnit(), search.StartDate(), search.EndDate() );
- traverse( macroPlan, AssemblyOnlinePlanRow, aoprow ){
+ traverse( macroPlan, AssemblyOnlinePlanRow, aoprow, aoprow.Type() = '1' ){
row := table.GetRow( aoprow );
- traverse( aoprow, AssemblyOnlinePlanCell, aopcell ){
+ info( '---------------------', row.Type() );
+ traverse( aoprow, AssemblyOnlinePlanCell, aopcell, aopcell.AssemblyOnlinePlanColumn().ColumnIndex() > 1 ){
column := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = aopcell.AssemblyOnlinePlanColumn().ColumnDate() );
cell := selectobject( row, Cell, cell, cell.Column() = column );
cell.InventoryWeight( aopcell.InventoryWeight() );
diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Attribute_Unit.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Attribute_Unit.qbl
new file mode 100644
index 0000000..db1dbe2
--- /dev/null
+++ b/_Main/BL/Type_AssemblyOnlinePlanVersionRow/Attribute_Unit.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Unit
+{
+ #keys: '3[415136.0.1273030019][415136.0.1273030018][415136.0.1273030020]'
+ Description: '宸ュ巶'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_Publish.qbl b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_Publish.qbl
index 244c723..15c3ce4 100644
--- a/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_Publish.qbl
+++ b/_Main/BL/Type_CustomerDemandPPAIDS/StaticMethod_Publish.qbl
@@ -8,12 +8,18 @@
TextBody:
[*
//// 鐢勫叞楦� Jul-17-2024 (created)
- jsonarray := JSON::Array().Add( JSON::Object().Add( "product", "DZ948293" )
- .Add( "demandDate", "2024-10-01" )
- .Add( "demandQty", 800 )
- .Add( "versionName", "V2410204" )
- .Add( "interfaceTime", "2024-10-01 12:00:00" ).Build() ).Build();
- requestbody := jsonarray.AsString();
+ jsonarray := JSON::Array();
+ traverse( owner, CustomerDemandPPAIDS, ids ){
+ idsjson := JSON::Object().Add( "product", ids.Product() ).Add( "demandDate", ids.DemandDate().Format( 'Y-M2-D2' ) )//"2024-10-01" )
+ .Add( "demandQty", ids.DemandQty() )
+ .Add( "versionName", ids.VersionName() )
+ .Add( "interfaceTime", ids.InterfaceTime().Format( 'Y-M2-D2 H:m:s' ) ).Build();/*"2024-10-01 12:00:00" )*/
+ jsonarray.Add( idsjson );
+ }
+ //jsonarray := JSON::Array().Add( JSON::Object().Add( "product", "DZ948293" )
+ // ).Build();
+ requestbody := jsonarray.Build().AsString();
+ info( requestbody );
loginfo := owner.InterfaceLoginfo( relnew, ExecuteUser := executor
, Name := Translations::InterfaceDataset_CustomerDemandPPAIDS_Name()
, InterfaceDateTime := DateTime::ActualTime()
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
index 6eeb85d..7e54b9d 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GetRow.qbl
@@ -7,10 +7,11 @@
TextBody:
[*
// 鐢勫叞楦� Oct-11-2024 (created)
- row := selectobject( this, Row, row, row.ProductID() = noprow.ProductID() and row.ProductionLine() = noprow.ProductionLine() and row.Type() = noprow.Type() );
+ row := selectobject( this, Row, row, row.ProductID() = noprow.ProductID() and row.ProductionLine() = noprow.ProductionLine() and row.Type() = noprow.Type() );
if( isnull( row ) ){
- row := this.Row( relnew, ProductID := noprow.ProductID(), ProductionLine := noprow.ProductionLine(), Type := noprow.Type() );
+ unit := ifexpr( noprow.ProductionLine().FindString( "CC", 0 ) > -1, FinancialProductionReport::GetDefaultCCUnit(), FinancialProductionReport::GetDefaultDLUnit() );
+ row := this.Row( relnew, ProductID := noprow.ProductID(), ProductionLine := noprow.ProductionLine(), Type := noprow.Type(), Unit := unit );
//鍒濆鍖栧崟鍏冩牸
row.InitializeCell();
}
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersionRow/Attribute_Unit.qbl b/_Main/BL/Type_OfflinePlanArchiveVersionRow/Attribute_Unit.qbl
new file mode 100644
index 0000000..f97d2f3
--- /dev/null
+++ b/_Main/BL/Type_OfflinePlanArchiveVersionRow/Attribute_Unit.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Unit
+{
+ #keys: '3[415136.0.1273030029][415136.0.1273030028][415136.0.1273030030]'
+ Description: '宸ュ巶'
+ ValueType: String
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
index c128e14..33c12ae 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
@@ -5,13 +5,13 @@
BaseType: 'WebPanel'
Children:
[
- Component ddslMQBMLB
+ Component ddslProductLine
{
#keys: '[415136.0.1199302073]'
BaseType: 'WebDropDownStringList'
Properties:
[
- Label: 'MQB/MLB'
+ Label: 'Product line'
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def
similarity index 84%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def
index 90dcebb..b7d7008 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnCreated.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
-#parent: PanelProductLine/ddslMQBMLB
-Response OnCreated () id:Response_PanelProductLine_ddslMQBMLB_OnCreated
+#parent: PanelProductLine/ddslProductLine
+Response OnCreated () id:Response_PanelProductLine_ddslProductLine_OnCreated
{
#keys: '[415136.0.1199302058]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnSelectionChanged.def
similarity index 87%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnSelectionChanged.def
index 8f8312f..4fbe4cf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelProductLine_ddslProductLine_OnSelectionChanged.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
-#parent: PanelProductLine/ddslMQBMLB
-Response OnSelectionChanged () id:Response_PanelProductLine_ddslMQBMLB_OnSelectionChanged
+#parent: PanelProductLine/ddslProductLine
+Response OnSelectionChanged () id:Response_PanelProductLine_ddslProductLine_OnSelectionChanged
{
#keys: '[415136.0.1199302057]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def
index 858c1ae..0655234 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Response_PanelUnit_ddslUnit_OnCreated.def
@@ -9,14 +9,9 @@
{
Body:
[*
- values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.Type() );
+ valueString := "All";
- valueString := values.Concatenate( ";" );
- valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
-
- valueString := "<All>" + ifexpr( valueString = "", "", ";" ) + valueString;
-
- this.Strings( valueString );
+ this.Strings( valueString.Concat( ";" ).Concat( FinancialProductionReport::GetDefaultCCUnit().Concat( ";" ) ).Concat( FinancialProductionReport::GetDefaultDLUnit() ) );
*]
GroupServerCalls: false
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
index b67b8eb..7849640 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_MatrixEditorTable.def
@@ -28,7 +28,7 @@
]
Properties:
[
- Attributes: 'Value'
+ Attributes: 'Quantity;ActualProductionQty'
Column: 'Column'
Row: 'Row'
Taborder: 0
@@ -96,6 +96,7 @@
]
Properties:
[
+ AllowMultipleAttributes: true
Columns: 'MatrixEditorColumnsTable'
ContextMenu: 'matrixeditorContextMenuTable'
Rows: 'MatrixEditorRowsTable'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
index 1e02c6b..5c5c1e4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProduct.def
@@ -13,6 +13,7 @@
[
FixedSize: false
Label: 'Product'
+ Sorting: 'none'
Taborder: 0
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def"
index 8ab29fe..5ee99ab 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine\043603.def"
@@ -5,13 +5,13 @@
BaseType: 'WebPanel'
Children:
[
- Component ddslMQBMLB
+ Component ddsProductLine
{
#keys: '[415136.0.1252790298]'
BaseType: 'WebDropDownStringList'
Properties:
[
- Label: 'MQB/MLB'
+ Label: 'Product line'
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnCreated.def
similarity index 83%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnCreated.def
index af3422d..ad2a4c4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnCreated.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
-#parent: PanelProductLine_603/ddslMQBMLB
-Response OnCreated () id:Response_PanelProductLine_603_ddslMQBMLB_OnCreated
+#parent: PanelProductLine_603/ddsProductLine
+Response OnCreated () id:Response_PanelProductLine_603_ddsProductLine_OnCreated
{
#keys: '[415136.0.1252790291]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged.def
similarity index 87%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged.def
index 3f7615c..5630304 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
-#parent: PanelProductLine_603/ddslMQBMLB
-Response OnSelectionChanged () id:Response_PanelProductLine_603_ddslMQBMLB_OnSelectionChanged
+#parent: PanelProductLine_603/ddsProductLine
+Response OnSelectionChanged () id:Response_PanelProductLine_603_ddsProductLine_OnSelectionChanged
{
#keys: '[415136.0.1252790290]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
index b3212b9..37b09ed 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelUnit_844_ddslUnit_OnCreated.def
@@ -9,14 +9,9 @@
{
Body:
[*
- values := selectuniquevalues( InterfaceDataset, AssemblyOnlinePlanVersion.Row, row, true, row.Type() );
+ valueString := "All";
- valueString := values.Concatenate( ";" );
- valueString := selectuniquevalues( valueString.Tokenize( ";" ), Elements, tempS, true, tempS ).Concatenate( ";" );
-
- valueString := "<All>" + ifexpr( valueString = "", "", ";" ) + valueString;
-
- this.Strings( valueString );
+ this.Strings( valueString.Concat( ";" ).Concat( FinancialProductionReport::GetDefaultCCUnit().Concat( ";" ) ).Concat( FinancialProductionReport::GetDefaultDLUnit() ) );
*]
GroupServerCalls: false
}
--
Gitblit v1.9.3