From b70819eee3a21dfb202f99eb0663891cabd9b76d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 14 六月 2025 14:37:22 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 450 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 360 insertions(+), 90 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ab8013b..e67f34f 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>
@@ -236,6 +239,12 @@
<Compile Include="DevFrm\Ck\Frm_MesCgthSq.Designer.cs">
<DependentUpon>Frm_MesCgthSq.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Ck\Frm_MesSctkSq.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Ck\Frm_MesSctkSq.Designer.cs">
+ <DependentUpon>Frm_MesSctkSq.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Ck\Frm_MesCgthSqDj.cs">
<SubType>Form</SubType>
</Compile>
@@ -278,6 +287,18 @@
<Compile Include="DevFrm\Ck\Frm_MesItemQtDj.Designer.cs">
<DependentUpon>Frm_MesItemQtDj.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Ck\Frm_MesSctkSqDj.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Ck\Frm_MesSctkSqDj.Designer.cs">
+ <DependentUpon>Frm_MesSctkSqDj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Ck\SelectSctk.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Ck\SelectSctk.Designer.cs">
+ <DependentUpon>SelectSctk.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Ck\UcBlcl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -289,6 +310,12 @@
</Compile>
<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>
@@ -302,11 +329,41 @@
<Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs">
<DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\FQC\SelectFqcItem.cs">
+ <Compile Include="DevFrm\FQC\MesFqcExceptional.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\FQC\SelectFqcItem.Designer.cs">
- <DependentUpon>SelectFqcItem.cs</DependentUpon>
+ <Compile Include="DevFrm\FQC\MesFqcExceptional.Designer.cs">
+ <DependentUpon>MesFqcExceptional.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcBox.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcBox.Designer.cs">
+ <DependentUpon>SelectFqcBox.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcDaa.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcDaa.Designer.cs">
+ <DependentUpon>SelectFqcDaa.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\FQC\UcChouJianList.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <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>
@@ -314,11 +371,29 @@
<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>
</Compile>
<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>
@@ -338,6 +413,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>
@@ -350,17 +431,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>
@@ -374,17 +497,29 @@
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.Designer.cs">
- <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.cs">
<SubType>Form</SubType>
</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>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmShow.Designer.cs">
+ <DependentUpon>JyxmShow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\MesQcExceptionalShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\MesQcExceptionalShow.Designer.cs">
+ <DependentUpon>MesQcExceptionalShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
<SubType>Form</SubType>
@@ -442,6 +577,24 @@
</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>
+ </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>
@@ -545,12 +698,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>
@@ -688,18 +835,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>
@@ -712,6 +849,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>
@@ -723,6 +866,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>
@@ -742,10 +891,40 @@
<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>
<DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="test\XtraForm2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="test\XtraForm2.Designer.cs">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectCk.cs">
+ <SubType>Form</SubType>
+ </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>
@@ -871,24 +1050,6 @@
<Compile Include="UserControl\SelectCgMx.Designer.cs">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectCgOutMx.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\SelectCgOutMx.Designer.cs">
- <DependentUpon>SelectCgOutMx.cs</DependentUpon>
- </Compile>
- <Compile Include="UserControl\SelectCheckDt.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\SelectCheckDt.Designer.cs">
- <DependentUpon>SelectCheckDt.cs</DependentUpon>
- </Compile>
- <Compile Include="UserControl\SelectCk.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\SelectCk.Designer.cs">
- <DependentUpon>SelectCk.cs</DependentUpon>
- </Compile>
<Compile Include="UserControl\SelectCw.cs">
<SubType>Form</SubType>
</Compile>
@@ -907,10 +1068,10 @@
<Compile Include="UserControl\SelectHz.Designer.cs">
<DependentUpon>SelectHz.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectItemTbl.cs">
+ <Compile Include="DevFrm\Rk\SelectItemTbl.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\SelectItemTbl.Designer.cs">
+ <Compile Include="DevFrm\Rk\SelectItemTbl.Designer.cs">
<DependentUpon>SelectItemTbl.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\SelectMesCgthSq.cs">
@@ -925,28 +1086,22 @@
<Compile Include="UserControl\SelectOrg.Designer.cs">
<DependentUpon>SelectOrg.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectShuoTuiSq.cs">
+ <Compile Include="DevFrm\Warehouse\SelectShuoTuiSq.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\SelectShuoTuiSq.Designer.cs">
+ <Compile Include="DevFrm\Warehouse\SelectShuoTuiSq.Designer.cs">
<DependentUpon>SelectShuoTuiSq.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectWomdaahb.cs">
+ <Compile Include="DevFrm\WOM\SelectWompba.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\SelectWomdaahb.Designer.cs">
- <DependentUpon>SelectWomdaahb.cs</DependentUpon>
- </Compile>
- <Compile Include="UserControl\SelectWompba.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\SelectWompba.Designer.cs">
+ <Compile Include="DevFrm\WOM\SelectWompba.Designer.cs">
<DependentUpon>SelectWompba.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectWwPc.cs">
+ <Compile Include="DevFrm\WW\SelectWwPc.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\SelectWwPc.Designer.cs">
+ <Compile Include="DevFrm\WW\SelectWwPc.Designer.cs">
<DependentUpon>SelectWwPc.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\ShowFile.cs">
@@ -979,10 +1134,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">
@@ -1129,6 +1284,12 @@
<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>
@@ -1162,6 +1323,9 @@
<EmbeddedResource Include="DevFrm\Ck\Frm_MesCgthSq.resx">
<DependentUpon>Frm_MesCgthSq.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Ck\Frm_MesSctkSq.resx">
+ <DependentUpon>Frm_MesSctkSq.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\Frm_MesCgthSqDj.resx">
<DependentUpon>Frm_MesCgthSqDj.cs</DependentUpon>
</EmbeddedResource>
@@ -1183,11 +1347,20 @@
<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>
<EmbeddedResource Include="DevFrm\Ck\UcBlcl.resx">
<DependentUpon>UcBlcl.cs</DependentUpon>
</EmbeddedResource>
<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>
@@ -1195,8 +1368,17 @@
<EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx">
<DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\FQC\SelectFqcItem.resx">
- <DependentUpon>SelectFqcItem.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
+ <DependentUpon>MesFqcExceptional.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\FQC\SelectFqcBox.resx">
+ <DependentUpon>SelectFqcBox.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\FQC\SelectFqcDaa.resx">
+ <DependentUpon>SelectFqcDaa.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\FQC\UcChouJianList.resx">
+ <DependentUpon>UcChouJianList.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\FrmLogin.resx">
<DependentUpon>FrmLogin.cs</DependentUpon>
@@ -1208,6 +1390,18 @@
<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\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>
@@ -1217,17 +1411,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>
@@ -1235,11 +1435,17 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.resx">
- <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
- </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\JyxmShowCopy.resx">
+ <DependentUpon>JyxmShowCopy.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\MesQcExceptionalShow.resx">
+ <DependentUpon>MesQcExceptionalShow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
<DependentUpon>Frm_MesQaMj.cs</DependentUpon>
@@ -1264,6 +1470,15 @@
</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>
@@ -1386,11 +1601,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>
@@ -1400,6 +1621,21 @@
</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="DevFrm\WW\showWwZhongTai.resx">
+ <DependentUpon>showWwZhongTai.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="test\XtraForm2.resx">
+ <DependentUpon>XtraForm2.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>
@@ -1464,15 +1700,6 @@
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectCgOutMx.resx">
- <DependentUpon>SelectCgOutMx.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
- <DependentUpon>SelectCheckDt.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectCk.resx">
- <DependentUpon>SelectCk.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCw.resx">
<DependentUpon>SelectCw.cs</DependentUpon>
</EmbeddedResource>
@@ -1482,7 +1709,7 @@
<EmbeddedResource Include="UserControl\SelectHz.resx">
<DependentUpon>SelectHz.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectItemTbl.resx">
+ <EmbeddedResource Include="DevFrm\Rk\SelectItemTbl.resx">
<DependentUpon>SelectItemTbl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectMesCgthSq.resx">
@@ -1491,16 +1718,13 @@
<EmbeddedResource Include="UserControl\SelectOrg.resx">
<DependentUpon>SelectOrg.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectShuoTuiSq.resx">
+ <EmbeddedResource Include="DevFrm\Warehouse\SelectShuoTuiSq.resx">
<DependentUpon>SelectShuoTuiSq.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectWomdaahb.resx">
- <DependentUpon>SelectWomdaahb.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectWompba.resx">
+ <EmbeddedResource Include="DevFrm\WOM\SelectWompba.resx">
<DependentUpon>SelectWompba.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectWwPc.resx">
+ <EmbeddedResource Include="DevFrm\WW\SelectWwPc.resx">
<DependentUpon>SelectWwPc.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowFile.resx">
@@ -1518,7 +1742,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">
@@ -1590,6 +1814,9 @@
<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>
@@ -1607,6 +1834,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" />
@@ -1832,6 +2061,47 @@
<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" />
+ <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" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3