From 2691afba0b2d101b5ac12ffe8b419e4a82a9c9b4 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 26 六月 2025 17:29:29 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 371 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 334 insertions(+), 37 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 3d09d87..11f2d6f 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> @@ -200,6 +203,12 @@ <Compile Include="DevFrm\BasicData\Frm_MesItems.Designer.cs"> <DependentUpon>Frm_MesItems.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\BasicData\Frm_MesItemsShow.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\BasicData\Frm_MesItemsShow.Designer.cs"> + <DependentUpon>Frm_MesItemsShow.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\BasicData\Frm_MesItemType.cs"> <SubType>Form</SubType> </Compile> @@ -229,6 +238,12 @@ </Compile> <Compile Include="DevFrm\BasicData\Frm_MesUnit.Designer.cs"> <DependentUpon>Frm_MesUnit.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\BasicData\Frm_SupplierSrm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\BasicData\Frm_SupplierSrm.Designer.cs"> + <DependentUpon>Frm_SupplierSrm.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Ck\Frm_MesCgthSq.cs"> <SubType>Form</SubType> @@ -308,6 +323,12 @@ <Compile Include="DevFrm\Ck\UcBlclDj.Designer.cs"> <DependentUpon>UcBlclDj.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Ck\UcBlclSelect.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Ck\UcBlclSelect.Designer.cs"> + <DependentUpon>UcBlclSelect.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\FQC\Frm_Fqc.cs"> <SubType>Form</SubType> </Compile> @@ -319,12 +340,6 @@ </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> @@ -350,6 +365,18 @@ <Compile Include="DevFrm\FQC\UcChouJianList.Designer.cs"> <DependentUpon>UcChouJianList.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\FrmMain.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\FrmMain.Designer.cs"> + <DependentUpon>FrmMain.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.Designer.cs"> + <DependentUpon>Frm_XunJianDetect01Show.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\IPQC\Frm_ShouJian.cs"> <SubType>Form</SubType> </Compile> @@ -374,6 +401,12 @@ <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> @@ -392,6 +425,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> @@ -404,17 +443,59 @@ <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\DefectCodeCk.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeCk.Designer.cs"> + <DependentUpon>DefectCodeCk.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeQc.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeQc.Designer.cs"> + <DependentUpon>DefectCodeQc.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeRk.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeRk.Designer.cs"> + <DependentUpon>DefectCodeRk.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeDaa.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeDaa.Designer.cs"> + <DependentUpon>DefectCodeDaa.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeShouJian.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\DefectCodeShouJian.Designer.cs"> + <DependentUpon>DefectCodeShouJian.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> @@ -433,6 +514,12 @@ </Compile> <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs"> <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\JyxmShowCopy.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\JyxmShowCopy.Designer.cs"> + <DependentUpon>JyxmShowCopy.cs</DependentUpon> </Compile> <Compile Include="DevFrm\QC\JyxmShow.cs"> <SubType>Form</SubType> @@ -491,6 +578,60 @@ <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" /> <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" /> <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" /> + <Compile Include="DevFrm\RkQC\Frm_CqDetect01.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_CqDetect01.Designer.cs"> + <DependentUpon>Frm_CqDetect01.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_Cqfa.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_Cqfa.Designer.cs"> + <DependentUpon>Frm_Cqfa.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_CqfaItems.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_CqfaItems.Designer.cs"> + <DependentUpon>Frm_CqfaItems.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_Cqsq.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_Cqsq.Designer.cs"> + <DependentUpon>Frm_Cqsq.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs"> + <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs"> + <DependentUpon>Frm_SctlDetect01.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> + <Compile Include="DevFrm\RkQC\RkDetect01.Designer.cs"> + <DependentUpon>RkDetect01.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\RkQC\SelectCqsq.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\RkQC\SelectCqsq.Designer.cs"> + <DependentUpon>SelectCqsq.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs"> <SubType>Form</SubType> </Compile> @@ -503,11 +644,35 @@ <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> + </Compile> + <Compile Include="DevFrm\Rk\HistoryDhmxcs.Designer.cs"> + <DependentUpon>HistoryDhmxcs.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Rpt\Ckcgmx.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\Ckcgmx.Designer.cs"> + <DependentUpon>Ckcgmx.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Rpt\CKTmkc.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\Rpt\CKTmkc.Designer.cs"> <DependentUpon>CKTmkc.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Rpt\CkYtmx.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs"> + <DependentUpon>CkYtmx.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs"> <SubType>Form</SubType> @@ -605,12 +770,6 @@ </Compile> <Compile Include="DevFrm\FrmLogin.Designer.cs"> <DependentUpon>FrmLogin.cs</DependentUpon> - </Compile> - <Compile Include="DevFrm\FrmMain.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\FrmMain.Designer.cs"> - <DependentUpon>FrmMain.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Sys\DocNoRule.cs"> <SubType>Form</SubType> @@ -748,18 +907,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> @@ -772,6 +921,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> @@ -783,6 +938,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> @@ -802,6 +963,18 @@ <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="DevFrm\WW\showWwZhongTai.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WW\showWwZhongTai.Designer.cs"> + <DependentUpon>showWwZhongTai.cs</DependentUpon> + </Compile> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> @@ -812,6 +985,24 @@ </Compile> <Compile Include="UserControl\SelectCk.Designer.cs"> <DependentUpon>SelectCk.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\SelectDaa.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UserControl\SelectDaa.Designer.cs"> + <DependentUpon>SelectDaa.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\SelectDeleteBar.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UserControl\SelectDeleteBar.Designer.cs"> + <DependentUpon>SelectDeleteBar.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\SelectSrm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UserControl\SelectSrm.Designer.cs"> + <DependentUpon>SelectSrm.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcDictionaryComBox.cs"> <SubType>UserControl</SubType> @@ -1027,10 +1218,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"> @@ -1198,6 +1389,9 @@ <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx"> <DependentUpon>Frm_MesItems.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemsShow.resx"> + <DependentUpon>Frm_MesItemsShow.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemType.resx"> <DependentUpon>Frm_MesItemType.cs</DependentUpon> </EmbeddedResource> @@ -1212,6 +1406,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\BasicData\Frm_MesUnit.resx"> <DependentUpon>Frm_MesUnit.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\BasicData\Frm_SupplierSrm.resx"> + <DependentUpon>Frm_SupplierSrm.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Ck\Frm_MesCgthSq.resx"> <DependentUpon>Frm_MesCgthSq.cs</DependentUpon> @@ -1252,14 +1449,14 @@ <EmbeddedResource Include="DevFrm\Ck\UcBlclDj.resx"> <DependentUpon>UcBlclDj.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Ck\UcBlclSelect.resx"> + <DependentUpon>UcBlclSelect.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> @@ -1289,6 +1486,12 @@ <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01.resx"> <DependentUpon>Frm_XunJianDetect01.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01Show.resx"> + <DependentUpon>Frm_XunJianDetect01Show.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> @@ -1298,17 +1501,23 @@ <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\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> @@ -1321,6 +1530,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\JyxmShow.resx"> <DependentUpon>JyxmShow.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\QC\JyxmShowCopy.resx"> + <DependentUpon>JyxmShowCopy.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\MesQcExceptionalShow.resx"> <DependentUpon>MesQcExceptionalShow.cs</DependentUpon> @@ -1343,14 +1555,44 @@ <EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx"> <DependentUpon>MesQcExceptional.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqfa.resx"> + <DependentUpon>Frm_Cqfa.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\RkQC\Frm_CqfaItems.resx"> + <DependentUpon>Frm_CqfaItems.cs</DependentUpon> + </EmbeddedResource> + <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> + <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx"> + <DependentUpon>RkDetect01.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\RkQC\SelectCqsq.resx"> + <DependentUpon>SelectCqsq.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx"> <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon> </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> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx"> + <DependentUpon>Ckcgmx.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx"> <DependentUpon>CKTmkc.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx"> + <DependentUpon>CkYtmx.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx"> <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon> @@ -1470,11 +1712,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> @@ -1485,8 +1733,23 @@ <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="DevFrm\WW\showWwZhongTai.resx"> + <DependentUpon>showWwZhongTai.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectCk.resx"> <DependentUpon>SelectCk.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\SelectDaa.resx"> + <DependentUpon>SelectDaa.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\SelectDeleteBar.resx"> + <DependentUpon>SelectDeleteBar.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\SelectSrm.resx"> + <DependentUpon>SelectSrm.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx"> <DependentUpon>UcDictionaryComBox.cs</DependentUpon> @@ -1596,7 +1859,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"> @@ -1925,6 +2188,40 @@ <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" /> + <None Include="Resources\historyitem_16x16.png" /> + <None Include="Resources\usergroup_16x16.png" /> + <None Include="Resources\usergroup_16x161.png" /> + <None Include="Resources\print_32x32.png" /> + <None Include="Resources\print_32x321.png" /> + <None Include="Resources\print_16x161.png" /> + <None Include="Resources\print_32x322.png" /> + <None Include="Resources\print_16x162.png" /> + <None Include="Resources\printer_32x32.png" /> + <None Include="Resources\printer_16x16.png" /> + <None Include="Resources\bodetails_32x321.png" /> + <None Include="Resources\bodetails_16x163.png" /> + <None Include="Resources\refreshpivottable_16x16.png" /> + <None Include="Resources\dayview_32x32.png" /> + <None Include="Resources\dayview_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> -- Gitblit v1.9.3