From a80c1ccadaa85132c7ac26474e7aab3da7706cbc Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 02 六月 2025 13:24:13 +0800 Subject: [PATCH] iqc导出 --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 133 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 105 insertions(+), 28 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 38858df..147fcaa 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> @@ -368,6 +371,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> @@ -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,53 @@ <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\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 +478,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> @@ -742,18 +799,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> @@ -784,6 +831,12 @@ <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> </Compile> @@ -801,6 +854,12 @@ </Compile> <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> @@ -1183,12 +1242,6 @@ <Compile Include="UserControl\UCUpFileList.Designer.cs"> <DependentUpon>UCUpFileList.cs</DependentUpon> </Compile> - <Compile Include="XtraForm1.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="XtraForm1.Designer.cs"> - <DependentUpon>XtraForm1.cs</DependentUpon> - </Compile> <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx"> <DependentUpon>Frm_Customer.cs</DependentUpon> </EmbeddedResource> @@ -1286,6 +1339,9 @@ <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> @@ -1295,17 +1351,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> @@ -1318,6 +1380,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> @@ -1476,6 +1541,9 @@ <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> </EmbeddedResource> @@ -1484,6 +1552,9 @@ </EmbeddedResource> <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> @@ -1670,9 +1741,6 @@ </EmbeddedResource> <EmbeddedResource Include="UserControl\UCUpFileList.resx"> <DependentUpon>UCUpFileList.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="XtraForm1.resx"> - <DependentUpon>XtraForm1.cs</DependentUpon> </EmbeddedResource> <None Include="App.config" /> <None Include="packages.config" /> @@ -1935,6 +2003,15 @@ <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