From 1fd408a9ba01142cd824894f01ee0d3affff547e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 12 五月 2025 13:52:12 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 01e41cb..9ac13fa 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -118,6 +118,9 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
+ <Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath>
+ </Reference>
<Reference Include="Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
<HintPath>..\packages\Oracle.ManagedDataAccess.23.6.0\lib\net472\Oracle.ManagedDataAccess.dll</HintPath>
</Reference>
@@ -319,12 +322,6 @@
</Compile>
<Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs">
<DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\FQC\Frm_FqcDetect01Check.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\FQC\Frm_FqcDetect01Check.Designer.cs">
- <DependentUpon>Frm_FqcDetect01Check.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\FQC\MesFqcExceptional.cs">
<SubType>Form</SubType>
@@ -772,6 +769,12 @@
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WOM\ShowJieAn.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\ShowJieAn.Designer.cs">
+ <DependentUpon>ShowJieAn.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Work\Frm_Repair.cs">
<SubType>Form</SubType>
</Compile>
@@ -1027,10 +1030,10 @@
<Compile Include="UserControl\ShowUp.Designer.cs">
<DependentUpon>ShowUp.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\showZhongTai.cs">
+ <Compile Include="DevFrm\WOM\showZhongTai.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\showZhongTai.Designer.cs">
+ <Compile Include="DevFrm\WOM\showZhongTai.Designer.cs">
<DependentUpon>showZhongTai.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcBtnPrint.cs">
@@ -1258,9 +1261,6 @@
<EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx">
<DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01Check.resx">
- <DependentUpon>Frm_FqcDetect01Check.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
<DependentUpon>MesFqcExceptional.cs</DependentUpon>
</EmbeddedResource>
@@ -1470,6 +1470,9 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
+ <DependentUpon>ShowJieAn.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_Repair.resx">
<DependentUpon>Frm_Repair.cs</DependentUpon>
</EmbeddedResource>
@@ -1596,7 +1599,7 @@
<EmbeddedResource Include="UserControl\ShowUp.resx">
<DependentUpon>ShowUp.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\showZhongTai.resx">
+ <EmbeddedResource Include="DevFrm\WOM\showZhongTai.resx">
<DependentUpon>showZhongTai.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcBtnPrint.resx">
@@ -1935,6 +1938,11 @@
<None Include="Resources\bodetails_16x162.png" />
<None Include="Resources\boresume_32x32.png" />
<None Include="Resources\boresume_16x16.png" />
+ <None Include="Resources\trackingchanges_previous_16x161.png" />
+ <None Include="Resources\trackingchanges_previous_32x321.png" />
+ <None Include="Resources\bouser_16x163.png" />
+ <None Include="Resources\bouser_32x32.png" />
+ <None Include="Resources\article_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3