From 70ab56d9d97cbfd48a5bb44f5dfff7af90bb7e21 Mon Sep 17 00:00:00 2001
From: GG Z <903524121@qq.com>
Date: Wed, 8 Dec 2021 18:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=B8=BB=E6=9D=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExecuteCmd/CreateMainMaterialsTable.cs    |   3 ++-
 RookieStation/RsApp.cs                        |   2 +-
 RookieStation/RsLibrary/Inventory.db          | Bin 3641344 -> 3641344 bytes
 .../ExecuteCmd/ExportBudgetInventory.cs       |   9 ++++++++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/RookieStation/Drawing/ExecuteCmd/CreateMainMaterialsTable.cs b/RookieStation/Drawing/ExecuteCmd/CreateMainMaterialsTable.cs
index 9d4a7b8..cf67239 100644
--- a/RookieStation/Drawing/ExecuteCmd/CreateMainMaterialsTable.cs
+++ b/RookieStation/Drawing/ExecuteCmd/CreateMainMaterialsTable.cs
@@ -31,7 +31,7 @@ namespace RookieStation.Drawing.ExecuteCmd
 
                     var sql = SQLiteUtil.GetInstance();
                     sql.CreateDb(UserConstant.DbFolder + "Inventory.db");
-                    List<string[]> tableRow = sql.QueryTable("DecorativeMaterials");
+                    List<string[]> tableRow = sql.QueryTable("DecorationMaterials");
                     sql.CloseConncetion();
                     //FilteredElementCollector collectorAll = new FilteredElementCollector(doc);
                     //collectorAll.WherePasses(new LogicalOrFilter(new ElementIsElementTypeFilter(false), new ElementIsElementTypeFilter(true)));
@@ -207,6 +207,7 @@ namespace RookieStation.Drawing.ExecuteCmd
                 catch (Exception ex)
                 {
                     Log.WriteLog(ex.Message);
+                    throw;
                 }
             }
             else
diff --git a/RookieStation/RsApp.cs b/RookieStation/RsApp.cs
index 173d168..5839fb2 100644
--- a/RookieStation/RsApp.cs
+++ b/RookieStation/RsApp.cs
@@ -139,7 +139,7 @@ namespace RookieStation.RibbonMenu
                 //出图面板
                 RibbonPanel drawingPanel = application.CreateRibbonPanel(TabName, DrawingPanelName);
 
-                NewPushButtonData<CreateMainMaterialsTable>(drawingPanel, "主材表", Properties.Resources.MainMaterials, DrawingSheetCmdEnabled);
+                //NewPushButtonData<CreateMainMaterialsTable>(drawingPanel, "主材表", Properties.Resources.MainMaterials, DrawingSheetCmdEnabled);
                 NewPushButtonData<UpdateSheetContents>(drawingPanel, "更新图纸目录", Properties.Resources.UpdateSheetTable, null);
 
                 SplitButtonData legendSplitButtonData = new SplitButtonData("创建图例", "创建图例");
diff --git a/RookieStation/RsLibrary/Inventory.db b/RookieStation/RsLibrary/Inventory.db
index b88ceaf6cd8f7000c9f5535e784056d3c0f75a07..b199e1a0ebbafb237e066256029bbef5ce5c34cc 100644
GIT binary patch
delta 273
zcmXBKOD+R(0LSt9YxUth1~ppGQLlQ9*DPyVB!Yz-d>he3&<z{Aj^wvDtJ!jdF2o@u
zj^F?`u7Fs4cAxh1r)mFsDw<AQs+&%PFrrJOL|Sx<jL3?d$crA)EBZvg7!ZSENZ4Xn
zIATPMiZM|T<H8jaq9{sYQcQ_yF(YQhobbfFD2oNLD3-*sSP>PmD%Qlh*btk-7h7Um
z?1){l_e$_m&6p3%Gj5XI4-QhUX~xle{v^y<zE$z<<oqyjlCLoE3P+9GtDA@8*4=%h
eb#d9O{f+Xq^FJQL;52PnRy~fYZ+0#CKKlXp`&e24

delta 253
zcmWm2IW_|U0D$2ciEP%05E5&|7F!TgGC@b7(*Bw>a)`uxe@`_nH;BS>3rBDTS3vPK
zU;p(x?EiVLhQpWIWjGulp^QjM(lRO;$x2T0QjjqjmkF7aDVdg{%t%RQr7UwYFBMsk
zMX5?nmSkC0WL4H=UFxzS4cU|}*_IvIm8R^;z8uJ*97#)#<wQ=UEoUD@Z|9jH2<l-s
z$zDWPsjsm6KB$EGZYLMCg2rPhxx0=^$x|HN6yo^*nyq3vsmD<}egDwweHJ^>&+RYw
Cicl~B

diff --git a/RookieStation/Statistics/ExecuteCmd/ExportBudgetInventory.cs b/RookieStation/Statistics/ExecuteCmd/ExportBudgetInventory.cs
index 173b665..aa208ce 100644
--- a/RookieStation/Statistics/ExecuteCmd/ExportBudgetInventory.cs
+++ b/RookieStation/Statistics/ExecuteCmd/ExportBudgetInventory.cs
@@ -455,7 +455,7 @@ namespace RookieStation.Statistics.ExecuteCmd
                                     length += l;
                                     item.Remarks += familyName + "\r\n";
                                 }
-                                if (familyName.Contains("立体发光字"))
+                                if (familyName.Contains("精工发光字"))
                                 {
                                     double l = Convert.ToDouble((instance.Symbol.Name.Substring(0, instance.Symbol.Name.IndexOf('*')))) / 1000;
                                     length += l;
@@ -468,6 +468,13 @@ namespace RookieStation.Statistics.ExecuteCmd
                                 {
                                     var a = instance.Symbol.get_Parameter(BuiltInParameter.FAMILY_HEIGHT_PARAM).AsDouble() * instance.Symbol.get_Parameter(BuiltInParameter.FURNITURE_WIDTH).AsDouble();
 
+                                    area += RsRevitUtils.ConvertSquareFeetToSquareMetre(a);
+                                    item.Remarks += familyName + "\r\n";
+                                }
+                                if (familyName.Contains("校园文化墙"))
+                                {
+                                    var a = instance.Symbol.GetParameters("宽度").FirstOrDefault().AsDouble() * instance.Symbol.GetParameters("高度").FirstOrDefault().AsDouble();
+
                                     area += RsRevitUtils.ConvertSquareFeetToSquareMetre(a);
                                     item.Remarks += familyName + "\r\n";
                                 }