From 1f99c554ffc67f599fbce5981a3da584945b3b16 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 18 八月 2025 14:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 115 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 38 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 0c62eff..c2ede60 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -74,6 +74,8 @@
</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>
@@ -428,6 +434,12 @@
<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>
@@ -476,12 +488,6 @@
<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>
</Compile>
@@ -493,6 +499,12 @@
</Compile>
<Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
<DependentUpon>SelectItem.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectLine.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectLine.Designer.cs">
+ <DependentUpon>SelectLine.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\PDA\SelectPage.cs">
<SubType>Form</SubType>
@@ -641,6 +653,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>
@@ -671,23 +689,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_WwrkDetect01.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.Designer.cs">
<DependentUpon>Frm_WwrkDetect01.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.Designer.cs">
- <DependentUpon>Frm_XsthDetect01.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\RkQC\RkDetect01.cs">
<SubType>UserControl</SubType>
@@ -712,12 +724,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>
@@ -796,6 +802,18 @@
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.Designer.cs">
<DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs">
+ <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.Designer.cs">
+ <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sys\EasyRptEdt.cs">
<SubType>Form</SubType>
@@ -893,12 +911,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" />
@@ -1031,6 +1043,12 @@
</Compile>
<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>
@@ -1509,6 +1527,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>
@@ -1633,6 +1657,9 @@
<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>
@@ -1657,14 +1684,14 @@
<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>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
<DependentUpon>SelectItem.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
+ <DependentUpon>SelectLine.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\SelectPage.resx">
<DependentUpon>SelectPage.cs</DependentUpon>
@@ -1717,6 +1744,9 @@
<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>
@@ -1729,8 +1759,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>
@@ -1743,9 +1773,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>
@@ -1785,6 +1812,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.resx">
<DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx">
+ <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
<DependentUpon>EasyRptEdt.cs</DependentUpon>
@@ -1831,9 +1861,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>
@@ -1897,6 +1924,9 @@
</EmbeddedResource>
<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>
@@ -2131,6 +2161,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" />
@@ -2425,6 +2458,12 @@
<None Include="Resources\useinformula_16x16.png" />
<None Include="Resources\boposition2_16x162.png" />
<None Include="Resources\apply_16x16.png" />
+ <None Include="Resources\ok12341.jpg" />
+ <None Include="Resources\error6.jpg" />
+ <None Include="Resources\error61.jpg" />
+ <None Include="Resources\error9.jpg" />
+ <None Include="Resources\error10.jpg" />
+ <None Include="Resources\ok10.jpg" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3