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 tableRow = sql.QueryTable("DecorativeMaterials"); + List 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(drawingPanel, "主材表", Properties.Resources.MainMaterials, DrawingSheetCmdEnabled); + //NewPushButtonData(drawingPanel, "主材表", Properties.Resources.MainMaterials, DrawingSheetCmdEnabled); NewPushButtonData(drawingPanel, "更新图纸目录", Properties.Resources.UpdateSheetTable, null); SplitButtonData legendSplitButtonData = new SplitButtonData("创建图例", "创建图例"); diff --git a/RookieStation/RsLibrary/Inventory.db b/RookieStation/RsLibrary/Inventory.db index b88ceaf..b199e1a 100644 Binary files a/RookieStation/RsLibrary/Inventory.db and b/RookieStation/RsLibrary/Inventory.db differ 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"; }