From 981923c2a2cff6d61cd5a474d2ba398ba48f1fd5 Mon Sep 17 00:00:00 2001
From: chr <chr@chr.com>
Date: 星期一, 02 九月 2024 17:40:17 +0800
Subject: [PATCH] 更新代码；
---
PdmSwPlugin.DrawApprove/DrawApprove.xaml.cs | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/PdmSwPlugin.DrawApprove/DrawApprove.xaml.cs b/PdmSwPlugin.DrawApprove/DrawApprove.xaml.cs
index 1b6b817..551bee0 100644
--- a/PdmSwPlugin.DrawApprove/DrawApprove.xaml.cs
+++ b/PdmSwPlugin.DrawApprove/DrawApprove.xaml.cs
@@ -4,6 +4,7 @@
using PdmSwPlugin.Common;
using PdmSwPlugin.Common.Entity.DrawAudit;
using PdmSwPlugin.Common.Entity.Pdm;
+using PdmSwPlugin.Common.Entity.System;
using PdmSwPlugin.Common.Interface;
using PdmSwPlugin.Common.Setting;
using PdmSwPlugin.Common.Util;
@@ -170,8 +171,8 @@
}
catch (Exception ex)
{
- Logger.Error("UI update failed.", ex);
- this.Error($"UI鏇存柊鍒楄〃澶辫触锛佸紓甯�:{ex}");
+ Logger.Error($"V{PdmUser.LoginUser.pluginVersion}, UI update failed.", ex);
+ this.Error($"V{PdmUser.LoginUser.pluginVersion}锛孶I鏇存柊鍒楄〃澶辫触锛佸紓甯�:{ex}");
dataSource = new ObservableCollection<DrawAudit>();
}
finally
@@ -240,7 +241,7 @@
}
else if (err != 0)
{
- Logger.Error($"OpenDoc6 Failed,Error:{err}.See Solidworks Doc.");
+ Logger.Error($"V{PdmUser.LoginUser.pluginVersion}, OpenDoc6 Failed,Error:{err}.See Solidworks Doc.");
}
else if (warn == 128)
{
@@ -270,10 +271,11 @@
"");
}
- private string GetRealFilePath(string dbPath)
+ private string GetRealFilePath(string relativePath)
{
- string fileName = Path.GetFileName(dbPath);
- string filePath = Path.Combine(PluginSetting.Instance.SwFilePath, fileName);
+ // string fileName = Path.GetFileName(dbPath);
+ // string filePath = Path.Combine(PluginSetting.Instance.SwFilePath, dbPath);
+ string filePath = PluginSetting.Instance.SwFilePath + relativePath;
return filePath;
}
@@ -287,7 +289,8 @@
this.Error($"鏈嶅姟鍣ㄤ腑鏈壘鍒板浘绾告枃浠讹紝璺緞:{filePath}");
return;
}
- OpenDocMayError(filePath, (int)swDocumentTypes_e.swDocPART, (int)swOpenDocOptions_e.swOpenDocOptions_ReadOnly,
+
+ OpenDocMayError(filePath, (int)FileExtentionChecker.Check(filePath, out _), (int)swOpenDocOptions_e.swOpenDocOptions_ReadOnly,
"");
}
@@ -300,8 +303,8 @@
}
catch (Exception ex)
{
- Logger.Error("Get draw audit data list failed.", ex);
- this.Error($"鍒锋柊鍒楄〃澶辫触锛佸紓甯�:{ex.Message}");
+ Logger.Error($"V{PdmUser.LoginUser.pluginVersion}, Get draw audit data list failed.", ex);
+ this.Error($"V{PdmUser.LoginUser.pluginVersion}锛屽埛鏂板垪琛ㄥけ璐ワ紒寮傚父:{ex.Message}");
return new List<DrawAudit>();
}
}
@@ -310,14 +313,14 @@
{
try
{
- string modelPath = Path.Combine(PluginSetting.Instance.SwFilePath, Path.GetFileName(da.d3RelativePath));
- string drawingPath = Path.Combine(PluginSetting.Instance.SwFilePath, Path.GetFileName(da.d2RelativePath));
+ string modelPath = GetRealFilePath(da.d3RelativePath);
+ string drawingPath = GetRealFilePath(da.d2RelativePath);
SwApp.CloseDoc(modelPath);
SwApp.CloseDoc(drawingPath);
}
catch (Exception exx)
{
- Logger.Error("Auto close open doc failed.", exx);
+ Logger.Error($"V{PdmUser.LoginUser.pluginVersion}, Auto close open doc failed.", exx);
}
}
@@ -371,8 +374,8 @@
}
catch (Exception ex)
{
- Logger.Error("Draw complete failed.", ex);
- this.Error($"瀹℃牳澶辫触锛亄ex.Message}");
+ Logger.Error($"V{PdmUser.LoginUser.pluginVersion}, Draw complete failed.", ex);
+ this.Error($"V{PdmUser.LoginUser.pluginVersion}锛屽鏍稿け璐ワ紒{ex.Message}");
}
finally
{
@@ -441,8 +444,8 @@
}
catch (Exception ex)
{
- Logger.Error("Get draw audit history failed.", ex);
- this.Error($"鑾峰彇瀹℃牳鍘嗗彶澶辫触锛亄ex.Message}");
+ Logger.Error($"V{PdmUser.LoginUser.pluginVersion},Get draw audit history failed.", ex);
+ this.Error($"V{PdmUser.LoginUser.pluginVersion}锛岃幏鍙栧鏍稿巻鍙插け璐ワ紒{ex.Message}");
}
finally
{
--
Gitblit v1.9.1