From d40f55fc2cf19c5fca6cdf9001a3b15b1040bef7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 09 四月 2025 14:12:46 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 182 +++++++++++++++++++++++++++-----------------
1 files changed, 111 insertions(+), 71 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 14b303e..7fb333f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -194,18 +194,6 @@
<Compile Include="DevFrm\BasicData\Frm_Department.Designer.cs">
<DependentUpon>Frm_Department.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\BasicData\Frm_Holidy.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_Holidy.Designer.cs">
- <DependentUpon>Frm_Holidy.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.Designer.cs">
- <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItems.cs">
<SubType>Form</SubType>
</Compile>
@@ -217,12 +205,6 @@
</Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItemType.Designer.cs">
<DependentUpon>Frm_MesItemType.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesPosition.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesPosition.Designer.cs">
- <DependentUpon>Frm_MesPosition.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\BasicData\Frm_MesWorkshopLine.cs">
<SubType>Form</SubType>
@@ -308,11 +290,47 @@
<Compile Include="DevFrm\Ck\UcBlclDj.Designer.cs">
<DependentUpon>UcBlclDj.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\FQC\Frm_Fqc.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\FQC\Frm_Fqc.Designer.cs">
+ <DependentUpon>Frm_Fqc.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\FQC\Frm_FqcDetect01.cs">
+ <SubType>Form</SubType>
+ </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>
+ </Compile>
+ <Compile Include="DevFrm\FQC\MesFqcExceptional.Designer.cs">
+ <DependentUpon>MesFqcExceptional.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcItem.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcItem.Designer.cs">
+ <DependentUpon>SelectFqcItem.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\IPQC\Frm_ShouJian.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\IPQC\Frm_ShouJian.Designer.cs">
<DependentUpon>Frm_ShouJian.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01.Designer.cs">
+ <DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\IPQC\Frm_XunJian.cs">
<SubType>Form</SubType>
@@ -362,11 +380,11 @@
<Compile Include="DevFrm\QC\Frm_MesDefectCode.Designer.cs">
<DependentUpon>Frm_MesDefectCode.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\QC\Frm_MesDefectType.cs">
+ <Compile Include="DevFrm\QC\Frm_MesDefectCodeShow.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\QC\Frm_MesDefectType.Designer.cs">
- <DependentUpon>Frm_MesDefectType.cs</DependentUpon>
+ <Compile Include="DevFrm\QC\Frm_MesDefectCodeShow.Designer.cs">
+ <DependentUpon>Frm_MesDefectCodeShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
@@ -423,7 +441,6 @@
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Models\MesDefectCode.cs" />
- <Compile Include="DevFrm\QC\Models\MesDefectType.cs" />
<Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
@@ -743,6 +760,17 @@
<Compile Include="DevFrm\Work\Frm_WorkTechnique.Designer.cs">
<DependentUpon>Frm_WorkTechnique.cs</DependentUpon>
</Compile>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcDictionarySelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcDictionarySelect.Designer.cs">
+ <DependentUpon>UcDictionarySelect.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Work\SelectProcess.cs">
<SubType>Form</SubType>
</Compile>
@@ -778,12 +806,6 @@
</Compile>
<Compile Include="DevFrm\WW\Frm_WwTbl.Designer.cs">
<DependentUpon>Frm_WwTbl.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\WOM\Frm_MesWomdaahb.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\WOM\Frm_MesWomdaahb.Designer.cs">
- <DependentUpon>Frm_MesWomdaahb.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\WOM\Frm_Womcaa.cs">
<SubType>Form</SubType>
@@ -851,23 +873,12 @@
<Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
<DependentUpon>WwBlclDj.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\XtraForm2.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\XtraForm2.Designer.cs">
- <DependentUpon>XtraForm2.cs</DependentUpon>
- </Compile>
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
<Compile Include="Entity\ReturnModel.cs" />
<Compile Include="Entity\XlsOutModel.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
<Compile Include="ToolBox\LogHelper.cs" />
<Compile Include="ToolBox\MsgHelper.cs" />
<Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -998,11 +1009,11 @@
<Compile Include="UserControl\UcBtnPrint.Designer.cs">
<DependentUpon>UcBtnPrint.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\UcComBox.cs">
+ <Compile Include="UserControl\UcDictionary.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="UserControl\UcComBox.Designer.cs">
- <DependentUpon>UcComBox.cs</DependentUpon>
+ <Compile Include="UserControl\UcDictionary.Designer.cs">
+ <DependentUpon>UcDictionary.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookCk.cs">
<SubType>UserControl</SubType>
@@ -1022,17 +1033,17 @@
<Compile Include="UserControl\UcLookDaa.Designer.cs">
<DependentUpon>UcLookDaa.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\UcLookDefectType.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="UserControl\UcLookDefectType.Designer.cs">
- <DependentUpon>UcLookDefectType.cs</DependentUpon>
- </Compile>
<Compile Include="UserControl\UcLookDepartment.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UserControl\UcLookDepartment.Designer.cs">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLookGx.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookGx.Designer.cs">
+ <DependentUpon>UcLookGx.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookHuoZhu.cs">
<SubType>UserControl</SubType>
@@ -1130,6 +1141,18 @@
<Compile Include="UserControl\UCUpFile.Designer.cs">
<DependentUpon>UCUpFile.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\Toast.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\Toast.Designer.cs">
+ <DependentUpon>Toast.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UCUpFileList.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UCUpFileList.Designer.cs">
+ <DependentUpon>UCUpFileList.cs</DependentUpon>
+ </Compile>
<Compile Include="XtraForm1.cs">
<SubType>Form</SubType>
</Compile>
@@ -1142,20 +1165,11 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_Department.resx">
<DependentUpon>Frm_Department.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\BasicData\Frm_Holidy.resx">
- <DependentUpon>Frm_Holidy.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDaaDirectOut.resx">
- <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemType.resx">
<DependentUpon>Frm_MesItemType.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\BasicData\Frm_MesPosition.resx">
- <DependentUpon>Frm_MesPosition.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesWorkshopLine.resx">
<DependentUpon>Frm_MesWorkshopLine.cs</DependentUpon>
@@ -1199,6 +1213,21 @@
<EmbeddedResource Include="DevFrm\Ck\UcBlclDj.resx">
<DependentUpon>UcBlclDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\FQC\Frm_Fqc.resx">
+ <DependentUpon>Frm_Fqc.cs</DependentUpon>
+ </EmbeddedResource>
+ <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>
+ <EmbeddedResource Include="DevFrm\FQC\SelectFqcItem.resx">
+ <DependentUpon>SelectFqcItem.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\FrmLogin.resx">
<DependentUpon>FrmLogin.cs</DependentUpon>
</EmbeddedResource>
@@ -1208,6 +1237,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJian.resx">
<DependentUpon>Frm_ShouJian.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01.resx">
+ <DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\Frm_UserBind.resx">
<DependentUpon>Frm_UserBind.cs</DependentUpon>
@@ -1230,8 +1262,8 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCode.resx">
<DependentUpon>Frm_MesDefectCode.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectType.resx">
- <DependentUpon>Frm_MesDefectType.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCodeShow.resx">
+ <DependentUpon>Frm_MesDefectCodeShow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
@@ -1402,6 +1434,9 @@
<EmbeddedResource Include="DevFrm\Work\Frm_WorkTechnique.resx">
<DependentUpon>Frm_WorkTechnique.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcDictionarySelect.resx">
+ <DependentUpon>UcDictionarySelect.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\SelectProcess.resx">
<DependentUpon>SelectProcess.cs</DependentUpon>
</EmbeddedResource>
@@ -1419,9 +1454,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\Frm_WwTbl.resx">
<DependentUpon>Frm_WwTbl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\WOM\Frm_MesWomdaahb.resx">
- <DependentUpon>Frm_MesWomdaahb.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_Womcaa.resx">
<DependentUpon>Frm_Womcaa.cs</DependentUpon>
@@ -1455,9 +1487,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
<DependentUpon>WwBlclDj.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\XtraForm2.resx">
- <DependentUpon>XtraForm2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
@@ -1528,9 +1557,6 @@
<EmbeddedResource Include="UserControl\UcBtnPrint.resx">
<DependentUpon>UcBtnPrint.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\UcComBox.resx">
- <DependentUpon>UcComBox.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookCk.resx">
<DependentUpon>UcLookCk.cs</DependentUpon>
</EmbeddedResource>
@@ -1540,11 +1566,11 @@
<EmbeddedResource Include="UserControl\UcLookDaa.resx">
<DependentUpon>UcLookDaa.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\UcLookDefectType.resx">
- <DependentUpon>UcLookDefectType.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookDepartment.resx">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookGx.resx">
+ <DependentUpon>UcLookGx.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookHuoZhu.resx">
<DependentUpon>UcLookHuoZhu.cs</DependentUpon>
@@ -1594,6 +1620,12 @@
<EmbeddedResource Include="UserControl\UCUpFile.resx">
<DependentUpon>UCUpFile.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\Toast.resx">
+ <DependentUpon>Toast.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UCUpFileList.resx">
+ <DependentUpon>UCUpFileList.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
@@ -1611,6 +1643,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="logo_ico.ico" />
+ <None Include="Resources\zoom100_16x161.png" />
<None Include="Resources\user_32x32.png" />
<None Include="Resources\user_16x162.png" />
<None Include="Resources\wordwrap_32x32.png" />
@@ -1828,6 +1861,13 @@
<None Include="Resources\subreport_16x16.png" />
<None Include="Resources\checkbox2_32x324.png" />
<None Include="Resources\snapmodifytablecellstyle_32x32.png" />
+ <None Include="Resources\statistical_16x16.png" />
+ <None Include="Resources\ok1.png" />
+ <None Include="Resources\error1.png" />
+ <None Include="Resources\error123.jpg" />
+ <None Include="Resources\ok123.jpg" />
+ <None Include="Resources\pencolor_32x32.png" />
+ <None Include="Resources\calculatenow_32x32.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3