From e3b7fd23fa49bc0329e43d274d9a3e0563e4420d Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 30 五月 2025 13:57:19 +0800 Subject: [PATCH] 缺陷描述 --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 191 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 151 insertions(+), 40 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 6c8a0c2..f52719c 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -118,6 +118,9 @@ <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> </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> @@ -320,12 +323,6 @@ <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> @@ -368,6 +365,18 @@ <Compile Include="DevFrm\IPQC\Frm_XunJian.Designer.cs"> <DependentUpon>Frm_XunJian.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01.Designer.cs"> + <DependentUpon>Frm_XunJianDetect01.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\PDA\Frm_AreaBind.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\PDA\Frm_AreaBind.Designer.cs"> + <DependentUpon>Frm_AreaBind.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\PDA\Frm_UserBind.cs"> <SubType>Form</SubType> </Compile> @@ -386,6 +395,12 @@ <Compile Include="DevFrm\PDA\SelectCk.Designer.cs"> <DependentUpon>SelectCk.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\PDA\SelectItem.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\PDA\SelectItem.Designer.cs"> + <DependentUpon>SelectItem.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\PDA\SelectPage.cs"> <SubType>Form</SubType> </Compile> @@ -398,17 +413,41 @@ <Compile Include="DevFrm\PDA\SelectPrint.Designer.cs"> <DependentUpon>SelectPrint.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\PDA\SelectUser.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\PDA\SelectUser.Designer.cs"> + <DependentUpon>SelectUser.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCode.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCode.Designer.cs"> + <DependentUpon>DefectCode.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeDic.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeDic.Designer.cs"> + <DependentUpon>DefectCodeDic.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeRenZheng.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeRenZheng.Designer.cs"> + <DependentUpon>DefectCodeRenZheng.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeXianChang.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeXianChang.Designer.cs"> + <DependentUpon>DefectCodeXianChang.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\QC\Frm_IQCLookups.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs"> <DependentUpon>Frm_IQCLookups.cs</DependentUpon> - </Compile> - <Compile Include="DevFrm\QC\Frm_MesDefectCode.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\QC\Frm_MesDefectCode.Designer.cs"> - <DependentUpon>Frm_MesDefectCode.cs</DependentUpon> </Compile> <Compile Include="DevFrm\QC\Frm_MesDefectCodeShow.cs"> <SubType>Form</SubType> @@ -427,6 +466,12 @@ </Compile> <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs"> <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\JyxmShow.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\JyxmShow.Designer.cs"> + <DependentUpon>JyxmShow.cs</DependentUpon> </Compile> <Compile Include="DevFrm\QC\MesQcExceptionalShow.cs"> <SubType>Form</SubType> @@ -736,18 +781,8 @@ </Compile> <Compile Include="DevFrm\Warehouse\Models\MesDepots.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" /> - <Compile Include="DevFrm\Warehouse\Models\MesInvItemArn.cs" /> - <Compile Include="DevFrm\Warehouse\Models\MesInvItemArnDetail.cs" /> - <Compile Include="DevFrm\Warehouse\Models\MesInvItemBarcodes.cs" /> - <Compile Include="DevFrm\Warehouse\Models\MesInvItemInCDetails.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutCDetails.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" /> - <Compile Include="DevFrm\Warehouse\Models\MesInvItemOuts.cs" /> - <Compile Include="DevFrm\Warehouse\Models\MesInvItemStocks.cs" /> - <Compile Include="DevFrm\Warehouse\Models\MesItems.cs" /> - <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcode.cs" /> - <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem.cs" /> - <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem3.cs" /> <Compile Include="DevFrm\WOM\Frm_MesScrkDj.cs"> <SubType>Form</SubType> </Compile> @@ -760,6 +795,12 @@ <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\WOM\ShowJieAn.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\ShowJieAn.Designer.cs"> + <DependentUpon>ShowJieAn.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Work\Frm_Repair.cs"> <SubType>Form</SubType> </Compile> @@ -771,6 +812,12 @@ </Compile> <Compile Include="DevFrm\Work\Frm_Work01.Designer.cs"> <DependentUpon>Frm_Work01.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Work\Frm_Work09.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Work\Frm_Work09.Designer.cs"> + <DependentUpon>Frm_Work09.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Work\Frm_WorkProcesses.cs"> <SubType>Form</SubType> @@ -790,6 +837,12 @@ <Compile Include="DevFrm\Work\Frm_WorkTechnique.Designer.cs"> <DependentUpon>Frm_WorkTechnique.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs"> + <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon> + </Compile> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> @@ -800,6 +853,12 @@ </Compile> <Compile Include="UserControl\SelectCk.Designer.cs"> <DependentUpon>SelectCk.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\UcDictionaryComBox.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UcDictionaryComBox.Designer.cs"> + <DependentUpon>UcDictionaryComBox.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcDictionarySelect.cs"> <SubType>Form</SubType> @@ -925,12 +984,6 @@ <Compile Include="UserControl\SelectCgMx.Designer.cs"> <DependentUpon>SelectCgMx.cs</DependentUpon> </Compile> - <Compile Include="DevFrm\QC\SelectCheckDt.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\QC\SelectCheckDt.Designer.cs"> - <DependentUpon>SelectCheckDt.cs</DependentUpon> - </Compile> <Compile Include="UserControl\SelectCw.cs"> <SubType>Form</SubType> </Compile> @@ -1015,10 +1068,10 @@ <Compile Include="UserControl\ShowUp.Designer.cs"> <DependentUpon>ShowUp.cs</DependentUpon> </Compile> - <Compile Include="UserControl\showZhongTai.cs"> + <Compile Include="DevFrm\WOM\showZhongTai.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="UserControl\showZhongTai.Designer.cs"> + <Compile Include="DevFrm\WOM\showZhongTai.Designer.cs"> <DependentUpon>showZhongTai.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcBtnPrint.cs"> @@ -1228,6 +1281,9 @@ <EmbeddedResource Include="DevFrm\Ck\Frm_MesItemQtDj.resx"> <DependentUpon>Frm_MesItemQtDj.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Ck\Frm_MesSctkSqDj.resx"> + <DependentUpon>Frm_MesSctkSqDj.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Ck\SelectSctk.resx"> <DependentUpon>SelectSctk.cs</DependentUpon> </EmbeddedResource> @@ -1242,9 +1298,6 @@ </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> @@ -1271,6 +1324,12 @@ <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01.resx"> <DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01.resx"> + <DependentUpon>Frm_XunJianDetect01.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> @@ -1280,17 +1339,26 @@ <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\SelectPage.resx"> <DependentUpon>SelectPage.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\PDA\SelectPrint.resx"> <DependentUpon>SelectPrint.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\PDA\SelectUser.resx"> + <DependentUpon>SelectUser.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\QC\DefectCode.resx"> + <DependentUpon>DefectCode.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\QC\DefectCodeDic.resx"> + <DependentUpon>DefectCodeDic.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx"> <DependentUpon>Frm_IQCLookups.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCode.resx"> - <DependentUpon>Frm_MesDefectCode.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCodeShow.resx"> <DependentUpon>Frm_MesDefectCodeShow.cs</DependentUpon> @@ -1300,6 +1368,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.resx"> <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\QC\JyxmShow.resx"> + <DependentUpon>JyxmShow.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\MesQcExceptionalShow.resx"> <DependentUpon>MesQcExceptionalShow.cs</DependentUpon> @@ -1449,11 +1520,17 @@ <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx"> + <DependentUpon>ShowJieAn.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Work\Frm_Repair.resx"> <DependentUpon>Frm_Repair.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx"> <DependentUpon>Frm_Work01.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Work\Frm_Work09.resx"> + <DependentUpon>Frm_Work09.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx"> <DependentUpon>Frm_WorkProcesses.cs</DependentUpon> @@ -1464,8 +1541,14 @@ <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechnique.resx"> <DependentUpon>Frm_WorkTechnique.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx"> + <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectCk.resx"> <DependentUpon>SelectCk.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx"> + <DependentUpon>UcDictionaryComBox.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcDictionarySelect.resx"> <DependentUpon>UcDictionarySelect.cs</DependentUpon> @@ -1530,9 +1613,6 @@ <EmbeddedResource Include="UserControl\SelectCgMx.resx"> <DependentUpon>SelectCgMx.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="DevFrm\QC\SelectCheckDt.resx"> - <DependentUpon>SelectCheckDt.cs</DependentUpon> - </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectCw.resx"> <DependentUpon>SelectCw.cs</DependentUpon> </EmbeddedResource> @@ -1575,7 +1655,7 @@ <EmbeddedResource Include="UserControl\ShowUp.resx"> <DependentUpon>ShowUp.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="UserControl\showZhongTai.resx"> + <EmbeddedResource Include="DevFrm\WOM\showZhongTai.resx"> <DependentUpon>showZhongTai.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcBtnPrint.resx"> @@ -1667,6 +1747,8 @@ </ItemGroup> <ItemGroup> <Content Include="logo_ico.ico" /> + <None Include="Resources\user_16x163.png" /> + <None Include="Resources\user_32x321.png" /> <None Include="Resources\zoom100_16x161.png" /> <None Include="Resources\user_32x32.png" /> <None Include="Resources\user_16x162.png" /> @@ -1892,6 +1974,35 @@ <None Include="Resources\ok123.jpg" /> <None Include="Resources\pencolor_32x32.png" /> <None Include="Resources\calculatenow_32x32.png" /> + <None Include="Resources\login_bg.jpg" /> + <None Include="Resources\login_bg1.jpg" /> + <None Include="Resources\login_bgOk.jpg" /> + <None Include="Resources\sendpdf_32x32.png" /> + <None Include="Resources\exporttopdf_16x16.png" /> + <None Include="Resources\chartswitchrowcolumn_16x16.png" /> + <None Include="Resources\inlinesizelegend_32x32.png" /> + <None Include="Resources\inlinesizelegend_16x16.png" /> + <None Include="Resources\employee_32x322.png" /> + <None Include="Resources\employee_16x161.png" /> + <None Include="Resources\botask_32x32.png" /> + <None Include="Resources\botask_16x16.png" /> + <None Include="Resources\boreport2_32x32.png" /> + <None Include="Resources\boreport2_16x161.png" /> + <None Include="Resources\boperson_32x32.png" /> + <None Include="Resources\boperson_16x16.png" /> + <None Include="Resources\bodetails_32x32.png" /> + <None Include="Resources\bodetails_16x162.png" /> + <None Include="Resources\boresume_32x32.png" /> + <None Include="Resources\boresume_16x16.png" /> + <None Include="Resources\trackingchanges_previous_16x161.png" /> + <None Include="Resources\trackingchanges_previous_32x321.png" /> + <None Include="Resources\bouser_16x163.png" /> + <None Include="Resources\bouser_32x32.png" /> + <None Include="Resources\article_16x16.png" /> + <None Include="Resources\media_16x16.png" /> + <None Include="Resources\chartselectdata_16x16.png" /> + <None Include="Resources\copy_16x16.png" /> + <None Include="Resources\exporttoxls_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> -- Gitblit v1.9.3