From 981923c2a2cff6d61cd5a474d2ba398ba48f1fd5 Mon Sep 17 00:00:00 2001
From: chr <chr@chr.com>
Date: 星期一, 02 九月 2024 17:40:17 +0800
Subject: [PATCH] 更新代码；
---
PdmSwPlugin.Common/Entity/Pdm/PdmBom.cs | 19 +++++-
PdmSwPlugin.Main/Constant/PluginConst.cs | 2
InnoSetupScript/PdmSwPlugin.iss | 2
PdmSwPlugin.DrawApprove/XamlWindow.xaml.cs | 4
PdmSwPlugin.DrawApprove/DrawApprove.xaml | 2
.vs/SwPlugin/v17/DocumentLayout.json | 103 +++++++++++++++++++++++++--------
PdmSwPlugin.Util/lib/HtmlToXamlConverter.dll | 0
7 files changed, 97 insertions(+), 35 deletions(-)
diff --git a/.vs/SwPlugin/v17/DocumentLayout.json b/.vs/SwPlugin/v17/DocumentLayout.json
index 874cf31..df16958 100644
--- a/.vs/SwPlugin/v17/DocumentLayout.json
+++ b/.vs/SwPlugin/v17/DocumentLayout.json
@@ -3,16 +3,28 @@
"WorkspaceRootPath": "C:\\Workspace\\PdmSwPlugin2\\",
"Documents": [
{
+ "AbsoluteMoniker": "D:0:0:{1033FBD8-8700-4CD0-808A-BB97DB057A6B}|PdmSwPlugin.PDM\\PdmSwPlugin.PDM.csproj|c:\\workspace\\pdmswplugin2\\pdmswplugin.pdm\\model\\pdmcontrolmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{1033FBD8-8700-4CD0-808A-BB97DB057A6B}|PdmSwPlugin.PDM\\PdmSwPlugin.PDM.csproj|solutionrelative:pdmswplugin.pdm\\model\\pdmcontrolmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{E17EF6B6-EE83-45AA-B0C0-E3A097089E97}|PdmSwPlugin.Common\\PdmSwPlugin.Common.csproj|c:\\workspace\\pdmswplugin2\\pdmswplugin.common\\util\\pdm\\bomtreereader.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{E17EF6B6-EE83-45AA-B0C0-E3A097089E97}|PdmSwPlugin.Common\\PdmSwPlugin.Common.csproj|solutionrelative:pdmswplugin.common\\util\\pdm\\bomtreereader.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7ACEDAA9-2DE8-4485-837A-E7D58812A6DC}|PdmSw\\PdmSw.csproj|c:\\workspace\\pdmswplugin2\\pdmsw\\prodsettings\\pluginsetting.xml||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
+ "RelativeMoniker": "D:0:0:{7ACEDAA9-2DE8-4485-837A-E7D58812A6DC}|PdmSw\\PdmSw.csproj|solutionrelative:pdmsw\\prodsettings\\pluginsetting.xml||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{6E609A8C-583B-4607-A510-FA84218C4A31}|PdmSwPlugin.Main\\PdmSwPlugin.Main.csproj|c:\\workspace\\pdmswplugin2\\pdmswplugin.main\\constant\\pluginconst.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{6E609A8C-583B-4607-A510-FA84218C4A31}|PdmSwPlugin.Main\\PdmSwPlugin.Main.csproj|solutionrelative:pdmswplugin.main\\constant\\pluginconst.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{BE239D32-7253-4D19-8793-159E98545B55}|PdmSwPlugin.DrawApprove\\PdmSwPlugin.DrawApprove.csproj|c:\\workspace\\pdmswplugin2\\pdmswplugin.drawapprove\\xamlwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{BE239D32-7253-4D19-8793-159E98545B55}|PdmSwPlugin.DrawApprove\\PdmSwPlugin.DrawApprove.csproj|solutionrelative:pdmswplugin.drawapprove\\xamlwindow.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{44BCE7B9-F984-426B-9997-FC1FB1A49CC0}|CustomRictBox\\PdmSwPlugin.UI.csproj|c:\\workspace\\pdmswplugin2\\customrictbox\\customrichbox.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{44BCE7B9-F984-426B-9997-FC1FB1A49CC0}|CustomRictBox\\PdmSwPlugin.UI.csproj|solutionrelative:customrictbox\\customrichbox.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{BE239D32-7253-4D19-8793-159E98545B55}|PdmSwPlugin.DrawApprove\\PdmSwPlugin.DrawApprove.csproj|c:\\workspace\\pdmswplugin2\\pdmswplugin.drawapprove\\xamlwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
- "RelativeMoniker": "D:0:0:{BE239D32-7253-4D19-8793-159E98545B55}|PdmSwPlugin.DrawApprove\\PdmSwPlugin.DrawApprove.csproj|solutionrelative:pdmswplugin.drawapprove\\xamlwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
+ "AbsoluteMoniker": "D:0:0:{BE239D32-7253-4D19-8793-159E98545B55}|PdmSwPlugin.DrawApprove\\PdmSwPlugin.DrawApprove.csproj|c:\\workspace\\pdmswplugin2\\pdmswplugin.drawapprove\\drawapprove.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}",
+ "RelativeMoniker": "D:0:0:{BE239D32-7253-4D19-8793-159E98545B55}|PdmSwPlugin.DrawApprove\\PdmSwPlugin.DrawApprove.csproj|solutionrelative:pdmswplugin.drawapprove\\drawapprove.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}"
}
],
"DocumentGroupContainers": [
@@ -27,39 +39,78 @@
{
"$type": "Document",
"DocumentIndex": 1,
- "Title": "CustomRichBox.xaml.cs",
- "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\CustomRictBox\\CustomRichBox.xaml.cs",
- "RelativeDocumentMoniker": "CustomRictBox\\CustomRichBox.xaml.cs",
- "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\CustomRictBox\\CustomRichBox.xaml.cs",
- "RelativeToolTip": "CustomRictBox\\CustomRichBox.xaml.cs",
- "ViewState": "AQIAAKYBAAAAAAAAAAAYwLQBAAAlAAAA",
+ "Title": "BomTreeReader.cs",
+ "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.Common\\Util\\Pdm\\BomTreeReader.cs",
+ "RelativeDocumentMoniker": "PdmSwPlugin.Common\\Util\\Pdm\\BomTreeReader.cs",
+ "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.Common\\Util\\Pdm\\BomTreeReader.cs",
+ "RelativeToolTip": "PdmSwPlugin.Common\\Util\\Pdm\\BomTreeReader.cs",
+ "ViewState": "AQIAAFQAAAAAAAAAAAAAAGAAAAAVAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-29T13:03:42.863Z",
+ "WhenOpened": "2024-08-31T08:48:11.288Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
- "Title": "XamlWindow.xaml.cs",
- "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
- "RelativeDocumentMoniker": "PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
- "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
- "RelativeToolTip": "PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
- "ViewState": "AQIAAFYAAAAAAAAAAAAlwGMAAAAcAAAA",
+ "Title": "PdmControlModel.cs",
+ "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.PDM\\Model\\PdmControlModel.cs",
+ "RelativeDocumentMoniker": "PdmSwPlugin.PDM\\Model\\PdmControlModel.cs",
+ "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.PDM\\Model\\PdmControlModel.cs",
+ "RelativeToolTip": "PdmSwPlugin.PDM\\Model\\PdmControlModel.cs",
+ "ViewState": "AQIAAHsAAAAAAAAAAAAAAIUAAAANAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-08-29T12:51:21.766Z",
+ "WhenOpened": "2024-08-31T08:21:35.898Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
- "Title": "XamlWindow.xaml",
- "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\XamlWindow.xaml",
- "RelativeDocumentMoniker": "PdmSwPlugin.DrawApprove\\XamlWindow.xaml",
- "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\XamlWindow.xaml",
- "RelativeToolTip": "PdmSwPlugin.DrawApprove\\XamlWindow.xaml",
+ "Title": "PluginSetting.xml",
+ "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSw\\ProdSettings\\PluginSetting.xml",
+ "RelativeDocumentMoniker": "PdmSw\\ProdSettings\\PluginSetting.xml",
+ "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSw\\ProdSettings\\PluginSetting.xml",
+ "RelativeToolTip": "PdmSw\\ProdSettings\\PluginSetting.xml",
+ "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAADAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003576|",
+ "WhenOpened": "2024-08-31T08:06:37.171Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "PluginConst.cs",
+ "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.Main\\Constant\\PluginConst.cs",
+ "RelativeDocumentMoniker": "PdmSwPlugin.Main\\Constant\\PluginConst.cs",
+ "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.Main\\Constant\\PluginConst.cs",
+ "RelativeToolTip": "PdmSwPlugin.Main\\Constant\\PluginConst.cs",
+ "ViewState": "AQIAAAAAAAAAAAAAAAAAAAgAAAAAAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-08-31T03:49:46.226Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "Title": "XamlWindow.xaml.cs",
+ "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
+ "RelativeDocumentMoniker": "PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
+ "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
+ "RelativeToolTip": "PdmSwPlugin.DrawApprove\\XamlWindow.xaml.cs",
+ "ViewState": "AQIAAAgAAAAAAAAAAAAAAGcAAAAsAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-08-31T03:44:47.078Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "DrawApprove.xaml",
+ "DocumentMoniker": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\DrawApprove.xaml",
+ "RelativeDocumentMoniker": "PdmSwPlugin.DrawApprove\\DrawApprove.xaml",
+ "ToolTip": "C:\\Workspace\\PdmSwPlugin2\\PdmSwPlugin.DrawApprove\\DrawApprove.xaml",
+ "RelativeToolTip": "PdmSwPlugin.DrawApprove\\DrawApprove.xaml",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
- "WhenOpened": "2024-08-29T12:51:16.825Z",
+ "WhenOpened": "2024-08-31T03:41:41.538Z",
"EditorCaption": ""
}
]
diff --git a/InnoSetupScript/PdmSwPlugin.iss b/InnoSetupScript/PdmSwPlugin.iss
index 79ff6a4..fce3816 100644
--- a/InnoSetupScript/PdmSwPlugin.iss
+++ b/InnoSetupScript/PdmSwPlugin.iss
@@ -7,7 +7,7 @@
; 自动更新程序路径
#define AutoUpdaterDir = "C:\Workspace\PdmSwPlugin2\PdmSw\bin\x64\Release\Release\AutoUpdater\"
; 版本
-#define Version = "_TEST"
+#define Version = "_0.0.0.40"
; 生成的Installer存放路径
#define OutPutDir = "Z:\Main\Workspace\Output"
diff --git a/PdmSwPlugin.Common/Entity/Pdm/PdmBom.cs b/PdmSwPlugin.Common/Entity/Pdm/PdmBom.cs
index 5348f1b..d8f53e0 100644
--- a/PdmSwPlugin.Common/Entity/Pdm/PdmBom.cs
+++ b/PdmSwPlugin.Common/Entity/Pdm/PdmBom.cs
@@ -271,10 +271,14 @@
if (lost) return false;
// 涓嶅湪鐗╂枡鏄庣粏琛ㄤ腑涓嶅鏍�
if (ExcludeFromBOM) return false;
+ // 妯＄粍涓嶅鏍�
+ if (produceWay == "妯＄粍") return false;
+ // 寰呭鏍哥殑涓嶅啿绐佹彁浜�
+ if (drawStatus == "submitted" || drawStatus == "resubmitted") return false;
if (IsHistoryData)
{
- // 鍘嗗彶鍥剧焊鍙鏍镐竴鑷存�т笉閫氳繃鐨�
- return _drawInfo.checkRuleResult == 2;
+ // 鍘嗗彶鍥剧焊鍙鏍镐竴鑷存�т笉閫氳繃鐨� 鍜岃椹冲洖鐨�
+ return _drawInfo.checkRuleResult == 2 || drawStatus == "rejected";
}
else
{
@@ -294,9 +298,16 @@
{
if (produceWay == "妯＄粍") return null;
if (ExcludeFromBOM) return null;
- if (IsHistoryData && localDocChanged)
+ if (IsHistoryData)
{
- return $"鍘嗗彶鍥剧焊銆恵partModel}銆戝彉鏇村悗鏈噸鏂板鏍�";
+ if (localDocChanged)
+ {
+ return $"鍘嗗彶鍥剧焊銆恵partModel}銆戝彉鏇村悗鏈噸鏂板鏍�";
+ }
+ else if (drawStatus == "rejected" || drawStatus == "submitted" || drawStatus == "resubmitted")
+ {
+ return $"鍘嗗彶鍥剧焊銆恵partModel}銆戞湭閫氳繃瀹℃牳";
+ }
}
if (!IsHistoryData)
{
diff --git a/PdmSwPlugin.DrawApprove/DrawApprove.xaml b/PdmSwPlugin.DrawApprove/DrawApprove.xaml
index 60504fb..acb4f73 100644
--- a/PdmSwPlugin.DrawApprove/DrawApprove.xaml
+++ b/PdmSwPlugin.DrawApprove/DrawApprove.xaml
@@ -168,7 +168,7 @@
<StackPanel Orientation="Horizontal">
<Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="OpenDrw_Click">鎵撳紑宸ョ▼鍥�</Button>
<Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="OpenDoc_Click">鎵撳紑鍥剧焊</Button>
- <Button Style="{StaticResource GLink}" DataContext="{Binding Data}" Click="Resolve_Click">閫氳繃</Button>
+ <Button Style="{StaticResource LinkButton}" DataContext="{Binding Data}" Click="Resolve_Click">閫氳繃</Button>
<Button Style="{StaticResource RLink}" DataContext="{Binding Data}" Margin="0" Click="Reject_Click">涓嶉�氳繃</Button>
</StackPanel>
</DataTemplate>
diff --git a/PdmSwPlugin.DrawApprove/XamlWindow.xaml.cs b/PdmSwPlugin.DrawApprove/XamlWindow.xaml.cs
index 2b46a40..1c2d45f 100644
--- a/PdmSwPlugin.DrawApprove/XamlWindow.xaml.cs
+++ b/PdmSwPlugin.DrawApprove/XamlWindow.xaml.cs
@@ -96,8 +96,8 @@
private void Cancel_Click(object sender, RoutedEventArgs e)
{
- string ss = richBox.ToBase64Image();
- Debug.Print(ss);
+ //string ss = richBox.ToBase64Image();
+ //Debug.Print(ss);
DialogResult = false;
}
diff --git a/PdmSwPlugin.Main/Constant/PluginConst.cs b/PdmSwPlugin.Main/Constant/PluginConst.cs
index 6ac8707..a126319 100644
--- a/PdmSwPlugin.Main/Constant/PluginConst.cs
+++ b/PdmSwPlugin.Main/Constant/PluginConst.cs
@@ -3,6 +3,6 @@
public class PluginConst
{
public static readonly string AppId = "DF23E96F-A469-4302-8367-7FA2F798CD09";
- public static readonly string Version = "0.0.0.39";
+ public static readonly string Version = "0.0.0.40";
}
}
diff --git a/PdmSwPlugin.Util/lib/HtmlToXamlConverter.dll b/PdmSwPlugin.Util/lib/HtmlToXamlConverter.dll
new file mode 100644
index 0000000..7e3ef7f
--- /dev/null
+++ b/PdmSwPlugin.Util/lib/HtmlToXamlConverter.dll
Binary files differ
--
Gitblit v1.9.1