From a5d4d31310d9792243db3ca06080a5f8b83b542c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 21 八月 2024 10:09:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl                                            |   26 ++++--
 _Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl                                             |    9 --
 _Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl                                                         |   57 ++++++++++++-
 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl                                                     |    4 
 _Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl                                               |   13 +++
 _Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl                                                     |    8 ++
 _Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def                 |    2 
 _Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw                                                             |    2 
 _Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl                                                      |    7 +
 _Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl                                                |   26 ++++++
 _Main/BL/Type_MP_Cell_AnnualPlanReport/_ROOT_Type_MP_Cell_AnnualPlanReport.qbl                                      |    1 
 _Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def |    2 
 _Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl                                               |   26 ++++++
 _Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl                                                  |    5 
 _Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl                                                             |    5 
 15 files changed, 160 insertions(+), 33 deletions(-)

diff --git a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl b/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
index 4f22293..a24173c 100644
--- a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
@@ -11,7 +11,7 @@
       f.Delete();
     }
     
-    traverse ( archiveExecutionStatus, TemporaryDemandData, tdd ) {
+    traverse ( archiveExecutionStatus, TemporaryDemandData, tdd ,tdd.StartDate() >= macroPlan.StartOfPlanning().Date()) {
       targetProduct_MP       := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = tdd.ProductID() );
       targetStockingPoint_MP := select( macroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = tdd.StockingPointID() );
       info( tdd.SalesSegmentName() );
@@ -29,8 +29,7 @@
                           tdd.UnitOfMeasureName(),
                           0.0,
                           false,
-                          false
-                         );
+                          false );
         forcest.Origin( tdd.Origin() );
       }
     }
diff --git a/_Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl b/_Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl
new file mode 100644
index 0000000..63b2f0e
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Attribute_PackagingCapacity.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PackagingCapacity
+{
+  #keys: '3[415754.0.111003142][415754.0.111003141][415754.0.111003143]'
+  Description: '鍖呰瀹归噺'
+  ValueType: Number
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl b/_Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl
new file mode 100644
index 0000000..07d9702
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Attribute_PlannedInventory.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute PlannedInventory
+{
+  #keys: '3[415754.0.111003178][415754.0.111003177][415754.0.111003179]'
+  ValueType: Real
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl b/_Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl
new file mode 100644
index 0000000..8970d55
--- /dev/null
+++ b/_Main/BL/Type_CC_EngineRackCell/Function_CalcNumberOfEmptyShelves.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcNumberOfEmptyShelves
+{
+  TextBody:
+  [*
+    // vwedadmin Aug-20-2024 (created)
+    
+    value := guard( [Number] ( this.TotalQuantityOfMaterialRacks() - ( this.PlannedInventory() / this.PackagingCapacity() ) ), 0 );
+    
+    this.NumberOfEmptyShelves( value );
+  *]
+}
diff --git a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
index 87bff90..63f3ec1 100644
--- a/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
+++ b/_Main/BL/Type_CC_EngineRackCell/StaticMethod_CreateData.qbl
@@ -9,11 +9,14 @@
     macroPlan.CC_EngineRackRow( relflush );
     macroPlan.CC_EngineRackColumn( relflush );
     
-    // 鍒涘缓琛孍VO5 MLB, EVO5 MQB, GEN3 MLB, GEN3 MQB
-    macroPlan.CC_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MLB" );
-    macroPlan.CC_EngineRackRow( relnew, Generation := "EVO5", MLB_MQB := "MQB" );
-    macroPlan.CC_EngineRackRow( relnew, Generation := "GEN3", MLB_MQB := "MLB" );
-    macroPlan.CC_EngineRackRow( relnew, Generation := "GEN3", MLB_MQB := "MQB" );
+    // 鍒涘缓琛�
+    genrations := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.Generation().TrimBoth() <> "", tempPMP.Generation() );
+    mqbmlbs    := selectuniquevalues( macroPlan, Product_MP, tempPMP, tempPMP.MQBMLB().TrimBoth() <> "", tempPMP.MQBMLB() );
+    traverse ( genrations, Elements, g, g.ToUpper() = "EVO5" or g.ToUpper() = "GEN3" ) {
+      traverse ( mqbmlbs, Elements, m, m.ToUpper() = "MLB" or m.ToUpper() = "MQB" ) {
+        macroPlan.CC_EngineRackRow( relnew, Generation := g, MLB_MQB := m );
+      }
+    }
     
     // 鍒涘缓鍒�
     indexDate := macroPlan.StartOfPlanning().Date().StartOfMonth();
@@ -24,12 +27,54 @@
     
     // 鍒涘缓鍗曞厓鏍�
     traverse ( macroPlan, CC_EngineRackRow, ccerr ) {
+      
+      // 鍙戝姩鏈烘垚鏈弬鏁�
+      lce  := select( macroPlan, LogisticsCostEngine, tempLCE, tempLCE.Generation() = ccerr.Generation() and tempLCE.MLB_MQB() = ccerr.MLB_MQB() and tempLCE.Factory() = "闀挎槬宸ュ巶" );
+      
+      // 鏂欐灦鎴愭湰鍙傛暟
+      lcmr := select( macroPlan, LogisticsCostMaterialRack, tempLCMR, tempLCMR.Factory() = "闀挎槬宸ュ巶" );
+      
       traverse ( macroPlan, CC_EngineRackColumn, ccerc ) {
         cell := ccerr.CC_EngineRackCell( relnew );
         
-        // 澶栫搴撳叆搴撹垂鐢紙鍙戝姩鏈洪攢閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍏ュ簱鍗曚环锛�
+        // 绌烘枡鏋舵暟閲忥紙闀挎槬鍘傝浜у搧鐨勬枡鏋舵�绘暟閲� - 鍙戝姩鏈哄簱瀛� / 鍖呰瀹归噺 锛�
+        lastDayOfThisMonth := ccerc.StartDate().StartOfNextMonth() - 1;
+        plannedInventory := sum( macroPlan, Product_MP.ProductInStockingPoint_MP.ProductInStockingPointInPeriod, tempPISPIP,
+                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().IsLeaf()                          and
+                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().ParentID()   = "浜ф垚鍝�"           and
+                                 tempPISPIP.ProductInStockingPoint_MP().StockingPointID()         = "闀挎槬澶栫搴�"       and
+                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().Generation() = ccerr.Generation() and
+                                 tempPISPIP.ProductInStockingPoint_MP().Product_MP().MQBMLB()     = ccerr.MLB_MQB()    and
+                                 tempPISPIP.Start().Date()                                                  = lastDayOfThisMonth,
+                                 tempPISPIP.PlannedInventoryLevelEnd() );
+        cell.PackagingCapacity( guard( lce.PackagingCapacity(), 0 ) );
+        cell.PlannedInventory( plannedInventory );
         
+        // 澶栫搴撳叆搴撹垂鐢紙鍙戝姩鏈洪攢閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍏ュ簱鍗曚环锛�
+        engineSales := sum( macroPlan, FSImportData, tempFSID, 
+                            tempFSID.Unit()              = "闀挎槬宸ュ巶"               and
+                            tempFSID.Generation()        = ccerr.Generation()       and
+                            tempFSID.MqbMlb()            = ccerr.MLB_MQB()          and
+                            tempFSID.StartDate().Year()  = ccerc.StartDate().Year() and
+                            tempFSID.StartDate().Month() = ccerc.StartDate().Month(),
+                            tempFSID.Quantity() );
+        cell.StorageFeesForRentedWarehouses( guard( [Number] ( engineSales / guard( lce.PackagingCapacity(), 0 ) ) * guard( lcmr.WarehousingPrice(), 0 ), 0 ) );
+             
         // 澶栫搴撳嚭搴撹垂鐢紙鍙戝姩鏈轰骇閲� / 鍖呰瀹归噺[鍚戜笂鍙栨暣] * 鏂欐灦鍑哄簱鍗曚环锛�
+        engineProductions := sum( macroPlan, FPImportData, tempFPID, 
+                                  tempFPID.Unit()              = "闀挎槬宸ュ巶"               and
+                                  tempFPID.Generation()        = ccerr.Generation()       and
+                                  tempFPID.MqbMlb()            = ccerr.MLB_MQB()          and
+                                  tempFPID.StartDate().Year()  = ccerc.StartDate().Year() and
+                                  tempFPID.StartDate().Month() = ccerc.StartDate().Month(),
+                                  tempFPID.Quantity() );
+        cell.OutboundExpensesForRentedWarehouses( guard( [Number] ( engineProductions / guard( lce.PackagingCapacity(), 0 ) ) * guard( lcmr.OutboundPrice(), 0 ), 0 ) );
+        
+        // 澶栫搴撹繍杈撹垂鐢細鍙戝姩鏈鸿繍杈撻噺/鍖呰瀹归噺/瑁呰浇瀹归噺锛堝悜涓婂彇鏁达級*鏂欐灦杩愯緭鍗曚环
+        // 澶栫搴撲粨鍌ㄨ垂鐢細鏂欐灦鎬绘暟閲�-鍙戝姩鏈哄簱瀛�/鍖呰瀹归噺锛堝悜涓婂彇鏁达級锛屽啀涔樹互绌烘枡鏋朵粨鍌ㄥ崟浠峰緱鍒扮┖鏂欐灦浠撳偍璐圭敤銆傚彂鍔ㄦ満搴撳瓨鍙朅ctual inventories閲屽彇鍒伴暱鏄ュ绉熷簱璇ュ彂鍔ㄦ満鐨勪粨鍌ㄩ噺锛屾枡鏋舵�绘暟閲忛渶瑕佹墜鍔ㄧ淮鎶ゃ��
+        // 娓呮礂璐圭敤锛氬彂鍔ㄦ満鍏ュ簱閲�/鍖呰瀹归噺*鏂欐灦娓呮礂鍗曚环銆傚彂鍔ㄦ満鍏ュ簱閲忓彇鍙戝姩鏈洪攢閲忥紝鍖呰瀹归噺鍙栬嚜鍙戝姩鏈烘垚鏈〃銆傛枡鏋舵竻娲楀崟浠峰彇鏂欐灦鎴愭湰琛ㄣ��
+        
+        cell.CC_EngineRackColumn( relset, ccerc );
       }
     }
   *]
diff --git a/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
index c29bb51..d9f9b75 100644
--- a/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
+++ b/_Main/BL/Type_LocalCell_DemandComparison/StaticMethod_Compared.qbl
@@ -88,8 +88,8 @@
               if( columnName = "鍙戝姩鏈洪浂浠跺彿" ){
                 row.ProductID( ifexpr( isnull( baseVersionCell ), ifexpr( isnull( compareVersionCell ),"绌�",compareVersionCell.Value()), baseVersionCell.Value()) );
               }
-              if( columnName = "浜у湴" ){
-                row.CustomName( row.ProductID() + " > " + ifexpr( isnull( baseVersionCell ), ifexpr( isnull( compareVersionCell ),"绌�",compareVersionCell.Value()), baseVersionCell.Value()) );
+              if( columnName = "杞﹀瀷" ){
+                row.CustomName( " > " + ifexpr( isnull( baseVersionCell ), ifexpr( isnull( compareVersionCell ),"绌�",compareVersionCell.Value()), baseVersionCell.Value()) );
               }
             }else{
               row.LocalCell( relnew,LocalCell_DemandComparison,LocalColumn := column,
@@ -97,6 +97,7 @@
                              CompareVersion := ifexpr( isnull( compareVersionCell ), 0 ,[Real]compareVersionCell.Value() ));
             }
           }
+          row.CustomName( row.ProductID() + row.CustomName() );
         }
       }
       // 鍚庣画鍒犻櫎
diff --git a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
index 480f365..bead82a 100644
--- a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
+++ b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
@@ -26,7 +26,7 @@
       columnIndexTree.Root().AddChild( columnHandle,columns.Size() - 1 );
     }
     
-    traverse( owner,Unit,unit,unit.HasCapacityTypeTime()){
+    traverse( owner,Unit,unit,unit.HasCapacityTypeTime() and not unit.HasChild()){
       // unit.AsEntity().DisplayNameForSelection()
       row := table.MP_Row( relnew,CustomName := unit.ID(),Index := table.GetRowIndexCache() ); 
       throughput := sum( unit,Operation,operation,operation.Throughput() ) / unit.Operation( relsize );
@@ -41,7 +41,7 @@
         if( not isnull( columnIndex )){
           // 褰揳rrowedAvailableCapacity涓嶄负0锛屽伐浣滄棩 + 1
           arrowedAvailableCapacity := unitPeriodTime.TotalAvailableCapacity();
-          zeroDuration := Duration::Construct( 0,0,0,0);
+          zeroDuration := Duration::Construct( 0,0,0,0 );
           
           column := columns.Element( columnIndex.GetValueAsNumber() );
           
diff --git a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl
index f3fb6c4..557d70d 100644
--- a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl
+++ b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl
@@ -3,20 +3,14 @@
 StaticMethod CreateFullTable (
   const MacroPlans owners,
   RecycleBin recycleBin,
-  const Archive archive
+  const Archive archive,
+  const MacroPlan owner
 ) as LocalTable
 {
   TextBody:
   [*
     // rislai Aug-7-2024 (created)
-    tables := construct( MP_Tables );
-    traverse( owners,Elements,owner ){
-      table := select( owner,MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() ); 
-      if( isnull( table )){
-        table :=  MP_Cell_ScheduleSummary::Create( owner );
-      }
-      tables.Add( table );
-    }
+    tables := MP_Table::GetMP_Tables_ScheduleSummary( owners );
     
     scheduleSummaryOutputDataIndexTree := NamedValueTree::Create();
     scheduleSummaryOutputDatas := selectset( archive,ScheduleSummaryOutputLine.ScheduleSummaryOutputData,data,
@@ -42,7 +36,7 @@
        localColumnIndexTree.Root().AddChild( localColumnHandle,localColumns.Size() - 1 );
     }
     traverse( tables,Elements.MP_Row,row ){
-    
+     
        localRow := localTable.LocalRow( relnew,CustomName := row.Name(),Index := localTable.GetRowIndexCache() );
     
        traverse( localColumns,Elements,localColumn ){
@@ -88,6 +82,18 @@
        }
     }
     
+    //startDate := owner.StartOfPlanning().Date() + 7;
+    //endDate := maxselect( owner,Unit.UnitPeriod.astype( UnitPeriodTime ).Period_MP,period,period.EndDate(),period.TimeUnit() = "Month" ).EndDate();
+    //columns := construct( MP_Columns );
+    //columnIndexTree := NamedValueTree::Create();
+    //for( i := startDate;i < endDate; i := i + 1){
+    //  column := table.MP_Column( relnew,CustomDate := i );
+    //  columnHandle := columnIndexTree.GetHandle( i.AsQUILL() );
+    //  columns.Add( column );
+    //  columnIndexTree.Root().AddChild( columnHandle,columns.Size() - 1 );
+    //}
+    
+    
     return localTable;
   *]
 }
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
index 3a8b313..562676c 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/StaticMethod_CreateFullTable.qbl
@@ -8,14 +8,7 @@
   TextBody:
   [*
     // rislai Aug-7-2024 (created)
-    tables := construct( MP_Tables );
-    traverse( owners,Elements,owner ){
-      table := select( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() ); 
-      if( isnull( table )){
-        table :=  MP_Cell_AnnualPlanReport::Create( owner );
-      }
-      tables.Add( table );
-    }
+    tables := MP_Table::GetMP_Tables_AnnualPlanReport( owners );
     
     localTable := recycleBin.LocalTable( relnew,Name := MP_Cell_AnnualPlanReport::GetTableName() );
     startDate := minselect( tables,Elements.MP_Column,column,column.CustomDate() ).CustomDate();
diff --git a/_Main/BL/Type_MP_Cell_AnnualPlanReport/_ROOT_Type_MP_Cell_AnnualPlanReport.qbl b/_Main/BL/Type_MP_Cell_AnnualPlanReport/_ROOT_Type_MP_Cell_AnnualPlanReport.qbl
index 8f10ada..d096ec9 100644
--- a/_Main/BL/Type_MP_Cell_AnnualPlanReport/_ROOT_Type_MP_Cell_AnnualPlanReport.qbl
+++ b/_Main/BL/Type_MP_Cell_AnnualPlanReport/_ROOT_Type_MP_Cell_AnnualPlanReport.qbl
@@ -4,6 +4,7 @@
 TypeSpecialization MP_Cell_AnnualPlanReport
 {
   #keys: '2[412672.1.107700065][412672.1.107700060]'
+  Description: '鍏ㄥ勾璁″垝鎶ヨ〃'
   Parent: MP_Cell
   StructuredName: 'MP_Cell_AnnualPlanReports'
 }
diff --git a/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl
new file mode 100644
index 0000000..c732421
--- /dev/null
+++ b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_AnnualPlanReport.qbl
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GetMP_Tables_AnnualPlanReport (
+  const MacroPlans owners
+) as owning MP_Tables
+{
+  TextBody:
+  [*
+    // Akari Aug-19-2024 (created)
+    tables := construct( MP_Tables );
+    traverse( owners,Elements,owner ){
+      table := select( owner,MP_Table,table,table.Name() = MP_Cell_AnnualPlanReport::GetTableName() );
+      if( isnull( table )){
+        table :=  MP_Cell_AnnualPlanReport::Create( owner );
+      }else{
+        startDate := minselect( table,MP_Column,column,column.CustomDate() ).CustomDate();
+        planStartDate := owner.StartOfPlanning().Date();
+        if( startDate <> planStartDate ){
+          table :=  MP_Cell_AnnualPlanReport::Create( owner );
+        }
+      }
+      tables.Add( table );
+    }
+    return &tables;
+  *]
+}
diff --git a/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl
new file mode 100644
index 0000000..d125d15
--- /dev/null
+++ b/_Main/BL/Type_MP_Table/StaticMethod_GetMP_Tables_ScheduleSummary.qbl
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GetMP_Tables_ScheduleSummary (
+  const MacroPlans owners
+) as owning MP_Tables
+{
+  TextBody:
+  [*
+    // Akari Aug-19-2024 (created)
+    tables := construct( MP_Tables );
+    traverse( owners,Elements,owner ){
+      table := select( owner,MP_Table,table,table.Name() = MP_Cell_ScheduleSummary::GetTableName() );
+      if( isnull( table )){
+        table :=  MP_Cell_ScheduleSummary::Create( owner );
+      }else{
+        startDate := minselect( table,MP_Column,column,column.CustomDate() ).CustomDate();
+        planStartDate := owner.StartOfPlanning().Date();
+        if( startDate <> planStartDate ){
+          table :=  MP_Cell_ScheduleSummary::Create( owner );
+        }
+      }
+      tables.Add( table );
+    }
+    return &tables;
+  *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def
index f544dae..ff3e0e4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCC_EngineRackReport/Response_pHeader_bRefresh_OnClick.def
@@ -14,6 +14,8 @@
     Body:
     [*
       CC_EngineRackCell::CreateData( MacroPlan );
+      
+      WebMessageBox::Success( Translations::A_VWED_Success() );
     *]
     GroupServerCalls: false
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def
index 7b630bf..9d82f9b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon504_ButtonRibbon820_OnClick.def
@@ -10,7 +10,7 @@
     Body:
     [*
       macroPlans := ApplicationMacroPlanner.GetMacroPlans();
-      table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive);
+      table := MP_Cell_ScheduleSummary::CreateFullTable( macroPlans,RecycleBin ,Archive, MacroPlan );
       
       dhComparisonData854.Data( table );
     *]
diff --git a/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw b/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw
index dbdb6c2..30d67af 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/CCEngineRackReport.vw
@@ -30,7 +30,7 @@
           FormCC_EngineRackReport_MatrixEditor531
           {
             gridColor: '#c4c4c4'
-            totalHeaderWidth: 200
+            totalHeaderWidth: 500
             attributeHeaderWidthRatio: 0.6
             nameHeaderWidthRatio: 0.4
             columnWidth: 100

--
Gitblit v1.9.3