From f73005fcf883e6c4b147f4ff33eaf6d751ae4ccf Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 10 八月 2025 22:38:50 +0800
Subject: [PATCH] 受托bug
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 195 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 165 insertions(+), 30 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 4d24b02..1054851 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>
@@ -410,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>
@@ -421,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>
@@ -587,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>
@@ -623,11 +689,11 @@
<Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
<DependentUpon>Frm_SctlDetect01.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>
@@ -652,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>
@@ -694,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>
@@ -821,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" />
@@ -960,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>
@@ -1042,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>
@@ -1425,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>
@@ -1540,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>
@@ -1606,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>
@@ -1630,9 +1753,6 @@
<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>
</EmbeddedResource>
@@ -1650,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>
@@ -1711,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>
@@ -1778,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>
@@ -1816,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>
@@ -2006,6 +2138,9 @@
<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" />
<None Include="Properties\Settings.settings">
--
Gitblit v1.9.3