From 73d47d0d2ff835761df928c5897a1535b9b4f3bd Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期二, 12 八月 2025 08:41:57 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 75 +++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 33 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 0c62eff..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> @@ -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> @@ -475,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> @@ -641,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> @@ -683,12 +695,6 @@ <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> </Compile> @@ -712,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> @@ -894,12 +894,6 @@ <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" /> <Compile Include="DevFrm\Sys\SysHelp.cs"> @@ -1031,6 +1025,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 +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> @@ -1633,6 +1639,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> @@ -1656,9 +1665,6 @@ </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> @@ -1717,6 +1723,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> @@ -1743,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> @@ -1832,9 +1838,6 @@ <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> </EmbeddedResource> @@ -1897,6 +1900,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> @@ -2132,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