From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 237 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 185 insertions(+), 52 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index cecd65b..8022b31 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1,7 +1,7 @@
锘�<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" />
- <Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" />
- <Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" />
+ <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" />
+ <Import Project="..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" />
+ <Import Project="..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -63,17 +63,19 @@
<Reference Include="AutoUpdater.NET, Version=1.9.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
<HintPath>..\packages\Autoupdater.NET.Official.1.9.2\lib\net462\AutoUpdater.NET.dll</HintPath>
</Reference>
- <Reference Include="CefSharp, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.dll</HintPath>
+ <Reference Include="CefSharp, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.dll</HintPath>
</Reference>
- <Reference Include="CefSharp.Core, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.Core.dll</HintPath>
+ <Reference Include="CefSharp.Core, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.Core.dll</HintPath>
</Reference>
- <Reference Include="CefSharp.WinForms, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>..\packages\CefSharp.WinForms.129.0.110\lib\net462\CefSharp.WinForms.dll</HintPath>
+ <Reference Include="CefSharp.WinForms, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>..\packages\CefSharp.WinForms.109.1.110\lib\net462\CefSharp.WinForms.dll</HintPath>
</Reference>
<Reference Include="DevExpress.BonusSkins.v22.2" />
<Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.DataAccess.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.DataVisualization.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Drawing.v22.2" />
<Reference Include="DevExpress.Data.v22.2" />
<Reference Include="DevExpress.DataAccess.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -84,6 +86,7 @@
<Reference Include="DevExpress.RichEdit.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v22.2.Export, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v22.2" />
+ <Reference Include="DevExpress.Spreadsheet.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Utils.v22.2" />
<Reference Include="DevExpress.Sparkline.v22.2.Core" />
<Reference Include="DevExpress.Utils.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -98,7 +101,10 @@
<Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraReports.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v22.2.Extensions, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraRichEdit.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraTreeMap.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="FastReport">
<HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath>
@@ -120,9 +126,6 @@
</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>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@@ -413,6 +416,66 @@
<Compile Include="DevFrm\IPQC\Frm_XunJianDetect01.Designer.cs">
<DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.Designer.cs">
+ <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesDeToLine.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesDeToLine.Designer.cs">
+ <DependentUpon>Frm_MesDeToLine.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.Designer.cs">
+ <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.Designer.cs">
+ <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.Designer.cs">
+ <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.Designer.cs">
+ <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.Designer.cs">
+ <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\KQCX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\KQCX.Designer.cs">
+ <DependentUpon>KQCX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SelectSTAFF.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SelectSTAFF.Designer.cs">
+ <DependentUpon>SelectSTAFF.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SetLB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\SetLB.Designer.cs">
+ <DependentUpon>SetLB.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\PDA\Frm_AreaBind.cs">
<SubType>Form</SubType>
</Compile>
@@ -424,12 +487,6 @@
</Compile>
<Compile Include="DevFrm\PDA\Frm_UserBind.Designer.cs">
<DependentUpon>Frm_UserBind.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\PDA\Frm_UserBindLst.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\PDA\Frm_UserBindLst.Designer.cs">
- <DependentUpon>Frm_UserBindLst.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\PDA\SelectCk.cs">
<SubType>Form</SubType>
@@ -590,6 +647,12 @@
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
+ <Compile Include="DevFrm\QC\Xls.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Xls.Designer.cs">
+ <DependentUpon>Xls.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\RkQC\Frm_CqDetect01.cs">
<SubType>Form</SubType>
</Compile>
@@ -620,17 +683,17 @@
<Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
<DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
+ <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
- <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.Designer.cs">
+ <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs">
+ <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.Designer.cs">
- <DependentUpon>Frm_XsthDetect01.cs</DependentUpon>
+ <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.Designer.cs">
+ <DependentUpon>Frm_WwrkDetect01.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\RkQC\RkDetect01.cs">
<SubType>UserControl</SubType>
@@ -655,12 +718,6 @@
</Compile>
<Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
- <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rk\HistoryDhmxcs.cs">
<SubType>Form</SubType>
@@ -697,6 +754,18 @@
</Compile>
<Compile Include="DevFrm\Rpt\QLCX.Designer.cs">
<DependentUpon>QLCX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\WomShjh.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\WomShjh.Designer.cs">
+ <DependentUpon>WomShjh.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\WomShjhShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\WomShjhShow.Designer.cs">
+ <DependentUpon>WomShjhShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
<SubType>Form</SubType>
@@ -824,12 +893,6 @@
</Compile>
<Compile Include="DevFrm\Sys\Frm_PrintInfo.Designer.cs">
<DependentUpon>Frm_PrintInfo.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\Sys\Frm_PrintUser.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\Sys\Frm_PrintUser.Designer.cs">
- <DependentUpon>Frm_PrintUser.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sys\Mode\PrintInfo.cs" />
<Compile Include="DevFrm\Sys\Mode\PrintUser.cs" />
@@ -963,11 +1026,23 @@
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.Designer.cs">
+ <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WOM\Frm_WomFanGong.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\WOM\Frm_WomFanGong.Designer.cs">
<DependentUpon>Frm_WomFanGong.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\ShowGx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\ShowGx.Designer.cs">
+ <DependentUpon>ShowGx.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\WOM\ShowJieAn.cs">
<SubType>Form</SubType>
@@ -1045,6 +1120,12 @@
</Compile>
<Compile Include="UserControl\SelectDeleteBar.Designer.cs">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectMesCgthSqLink.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectMesCgthSqLink.Designer.cs">
+ <DependentUpon>SelectMesCgthSqLink.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\SelectSrm.cs">
<SubType>Form</SubType>
@@ -1428,6 +1509,12 @@
<Compile Include="XtraForm1.Designer.cs">
<DependentUpon>XtraForm1.cs</DependentUpon>
</Compile>
+ <Compile Include="XtraForm2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="XtraForm2.Designer.cs">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </Compile>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
<DependentUpon>Frm_Customer.cs</DependentUpon>
</EmbeddedResource>
@@ -1543,14 +1630,41 @@
<EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01Show.resx">
<DependentUpon>Frm_XunJianDetect01Show.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesAttanCon.resx">
+ <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesDeToLine.resx">
+ <DependentUpon>Frm_MesDeToLine.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
+ <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.resx">
+ <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJJSalary.resx">
+ <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJSSalary.resx">
+ <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesTimeType.resx">
+ <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\KQCX.resx">
+ <DependentUpon>KQCX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\SelectSTAFF.resx">
+ <DependentUpon>SelectSTAFF.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\SetLB.resx">
+ <DependentUpon>SetLB.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\Frm_AreaBind.resx">
<DependentUpon>Frm_AreaBind.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\Frm_UserBind.resx">
<DependentUpon>Frm_UserBind.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\PDA\Frm_UserBindLst.resx">
- <DependentUpon>Frm_UserBindLst.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\SelectCk.resx">
<DependentUpon>SelectCk.cs</DependentUpon>
@@ -1609,6 +1723,12 @@
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Xls.resx">
+ <DependentUpon>Xls.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_CqDetect01.resx">
+ <DependentUpon>Frm_CqDetect01.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\RkQC\Frm_Cqfa.resx">
<DependentUpon>Frm_Cqfa.cs</DependentUpon>
</EmbeddedResource>
@@ -1618,8 +1738,8 @@
<EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
<DependentUpon>Frm_Cqsq.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
- <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
+ <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
<DependentUpon>RkDetect01.cs</DependentUpon>
@@ -1632,9 +1752,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
- <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx">
<DependentUpon>HistoryDhmxcs.cs</DependentUpon>
@@ -1653,6 +1770,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
<DependentUpon>QLCX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
+ <DependentUpon>WomShjh.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\WomShjhShow.resx">
+ <DependentUpon>WomShjhShow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
<DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
@@ -1714,9 +1837,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\Frm_PrintInfo.resx">
<DependentUpon>Frm_PrintInfo.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Sys\Frm_PrintUser.resx">
- <DependentUpon>Frm_PrintUser.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\SysHelp.resx">
<DependentUpon>SysHelp.cs</DependentUpon>
@@ -1781,8 +1901,14 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\Frm_WomdaaNbz.resx">
+ <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
<DependentUpon>Frm_WomFanGong.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\ShowGx.resx">
+ <DependentUpon>ShowGx.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
<DependentUpon>ShowJieAn.cs</DependentUpon>
@@ -1819,6 +1945,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectMesCgthSqLink.resx">
+ <DependentUpon>SelectMesCgthSqLink.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
@@ -2008,6 +2137,9 @@
</EmbeddedResource>
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="XtraForm2.resx">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
</EmbeddedResource>
<None Include="App.config" />
<None Include="packages.config" />
@@ -2301,6 +2433,7 @@
<None Include="Resources\pie.svg" />
<None Include="Resources\useinformula_16x16.png" />
<None Include="Resources\boposition2_16x162.png" />
+ <None Include="Resources\apply_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
@@ -2323,12 +2456,12 @@
<ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets'))" />
- <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props'))" />
- <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props'))" />
- <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props'))" />
- <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets'))" />
+ <Error Condition="!Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props'))" />
+ <Error Condition="!Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props'))" />
+ <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets'))" />
</Target>
- <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" />
+ <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
--
Gitblit v1.9.3