From 73488352cf894aead2198683e8e6836bf321b48c Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期五, 19 九月 2025 14:14:47 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 217 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 194 insertions(+), 23 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 1054851..8d57d2e 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -127,6 +127,9 @@ <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="NModbus.Serial, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\NModbus.Serial.3.0.81\lib\net46\NModbus.Serial.dll</HintPath> + </Reference> <Reference Include="PresentationCore" /> <Reference Include="PresentationFramework" /> <Reference Include="System" /> @@ -350,6 +353,12 @@ <Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs"> <DependentUpon>Frm_FqcDetect01.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\FQC\Frm_FQCItem.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\FQC\Frm_FQCItem.Designer.cs"> + <DependentUpon>Frm_FQCItem.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\FQC\MesFqcExceptional.cs"> <SubType>Form</SubType> </Compile> @@ -500,6 +509,18 @@ <Compile Include="DevFrm\PDA\SelectItem.Designer.cs"> <DependentUpon>SelectItem.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\PDA\SelectKW.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\PDA\SelectKW.Designer.cs"> + <DependentUpon>SelectKW.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\PDA\SelectLine.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\PDA\SelectLine.Designer.cs"> + <DependentUpon>SelectLine.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\PDA\SelectPage.cs"> <SubType>Form</SubType> </Compile> @@ -517,6 +538,12 @@ </Compile> <Compile Include="DevFrm\PDA\SelectUser.Designer.cs"> <DependentUpon>SelectUser.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\PDA\SelectZZ.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\PDA\SelectZZ.Designer.cs"> + <DependentUpon>SelectZZ.cs</DependentUpon> </Compile> <Compile Include="DevFrm\QC\DefectCode.cs"> <SubType>UserControl</SubType> @@ -683,11 +710,11 @@ <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs"> <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon> </Compile> - <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs"> + <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs"> - <DependentUpon>Frm_SctlDetect01.cs</DependentUpon> + <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.Designer.cs"> + <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon> </Compile> <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs"> <SubType>Form</SubType> @@ -725,11 +752,23 @@ <Compile Include="DevFrm\Rk\HistoryDhmxcs.Designer.cs"> <DependentUpon>HistoryDhmxcs.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Rpt\BTDetails.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\BTDetails.Designer.cs"> + <DependentUpon>BTDetails.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\CkKuCun.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\CkKuCun.Designer.cs"> + <DependentUpon>CkKuCun.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Rpt\CKTmkc.cs"> <SubType>Form</SubType> @@ -743,17 +782,47 @@ <Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs"> <DependentUpon>CkYtmx.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Rpt\CPMX.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\CPMX.Designer.cs"> + <DependentUpon>CPMX.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Rpt\Frm_MesQL.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\Rpt\Frm_MesQL.Designer.cs"> <DependentUpon>Frm_MesQL.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Rpt\ItemQL.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\ItemQL.Designer.cs"> + <DependentUpon>ItemQL.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Rpt\QLCX.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\Rpt\QLCX.Designer.cs"> <DependentUpon>QLCX.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Rpt\RptQT.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\RptQT.Designer.cs"> + <DependentUpon>RptQT.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Rpt\UcRptCgdhd.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\UcRptCgdhd.Designer.cs"> + <DependentUpon>UcRptCgdhd.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.Designer.cs"> + <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Rpt\WomShjh.cs"> <SubType>Form</SubType> @@ -767,6 +836,12 @@ <Compile Include="DevFrm\Rpt\WomShjhShow.Designer.cs"> <DependentUpon>WomShjhShow.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Rpt\WOTraceCodes.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\WOTraceCodes.Designer.cs"> + <DependentUpon>WOTraceCodes.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs"> <SubType>Form</SubType> </Compile> @@ -778,6 +853,12 @@ </Compile> <Compile Include="DevFrm\Sales\Frm_SalesDeliver.Designer.cs"> <DependentUpon>Frm_SalesDeliver.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.Designer.cs"> + <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Sales\Frm_SalesOrder.cs"> <SubType>Form</SubType> @@ -796,6 +877,24 @@ </Compile> <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.Designer.cs"> <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs"> + <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.Designer.cs"> + <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.Designer.cs"> + <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Sys\EasyRptEdt.cs"> <SubType>Form</SubType> @@ -1062,12 +1161,6 @@ <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> @@ -1092,16 +1185,34 @@ <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs"> <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\WW\Frm_WwLl.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WW\Frm_WwLl.Designer.cs"> + <DependentUpon>Frm_WwLl.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="DevFrm\WW\UcWwBlclSelect.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WW\UcWwBlclSelect.Designer.cs"> + <DependentUpon>UcWwBlclSelect.cs</DependentUpon> + </Compile> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> + </Compile> + <Compile Include="UserControl\CopyXls.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UserControl\CopyXls.Designer.cs"> + <DependentUpon>CopyXls.cs</DependentUpon> </Compile> <Compile Include="UserControl\SelectCk.cs"> <SubType>Form</SubType> @@ -1132,6 +1243,12 @@ </Compile> <Compile Include="UserControl\SelectSrm.Designer.cs"> <DependentUpon>SelectSrm.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\UcCheckFlow.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UcCheckFlow.Designer.cs"> + <DependentUpon>UcCheckFlow.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcDictionaryComBox.cs"> <SubType>UserControl</SubType> @@ -1509,12 +1626,6 @@ <Compile Include="XtraForm1.Designer.cs"> <DependentUpon>XtraForm1.cs</DependentUpon> </Compile> - <Compile Include="XtraForm2.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="XtraForm2.Designer.cs"> - <DependentUpon>XtraForm2.cs</DependentUpon> - </Compile> <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx"> <DependentUpon>Frm_Customer.cs</DependentUpon> </EmbeddedResource> @@ -1596,6 +1707,9 @@ <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx"> <DependentUpon>Frm_FqcDetect01.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\FQC\Frm_FQCItem.resx"> + <DependentUpon>Frm_FQCItem.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx"> <DependentUpon>MesFqcExceptional.cs</DependentUpon> </EmbeddedResource> @@ -1672,6 +1786,12 @@ <EmbeddedResource Include="DevFrm\PDA\SelectItem.resx"> <DependentUpon>SelectItem.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\PDA\SelectKW.resx"> + <DependentUpon>SelectKW.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx"> + <DependentUpon>SelectLine.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\PDA\SelectPage.resx"> <DependentUpon>SelectPage.cs</DependentUpon> </EmbeddedResource> @@ -1680,6 +1800,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\PDA\SelectUser.resx"> <DependentUpon>SelectUser.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\PDA\SelectZZ.resx"> + <DependentUpon>SelectZZ.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\DefectCode.resx"> <DependentUpon>DefectCode.cs</DependentUpon> @@ -1738,8 +1861,8 @@ <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 Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx"> + <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx"> <DependentUpon>RkDetect01.cs</DependentUpon> @@ -1756,8 +1879,14 @@ <EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx"> <DependentUpon>HistoryDhmxcs.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\BTDetails.resx"> + <DependentUpon>BTDetails.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx"> <DependentUpon>Ckcgmx.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\CkKuCun.resx"> + <DependentUpon>CkKuCun.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx"> <DependentUpon>CKTmkc.cs</DependentUpon> @@ -1765,11 +1894,26 @@ <EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx"> <DependentUpon>CkYtmx.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\CPMX.resx"> + <DependentUpon>CPMX.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\Frm_MesQL.resx"> <DependentUpon>Frm_MesQL.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\ItemQL.resx"> + <DependentUpon>ItemQL.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\QLCX.resx"> <DependentUpon>QLCX.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\RptQT.resx"> + <DependentUpon>RptQT.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx"> + <DependentUpon>UcRptCgdhd.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhdPrint.resx"> + <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx"> <DependentUpon>WomShjh.cs</DependentUpon> @@ -1777,11 +1921,17 @@ <EmbeddedResource Include="DevFrm\Rpt\WomShjhShow.resx"> <DependentUpon>WomShjhShow.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\WOTraceCodes.resx"> + <DependentUpon>WOTraceCodes.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx"> <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliver.resx"> <DependentUpon>Frm_SalesDeliver.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverSelect.resx"> + <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sales\Frm_SalesOrder.resx"> <DependentUpon>Frm_SalesOrder.cs</DependentUpon> @@ -1791,6 +1941,15 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.resx"> <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx"> + <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.resx"> + <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.resx"> + <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx"> <DependentUpon>EasyRptEdt.cs</DependentUpon> @@ -1919,9 +2078,6 @@ <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> @@ -1934,8 +2090,17 @@ <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx"> <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WW\Frm_WwLl.resx"> + <DependentUpon>Frm_WwLl.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx"> <DependentUpon>showWwZhongTai.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WW\UcWwBlclSelect.resx"> + <DependentUpon>UcWwBlclSelect.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\CopyXls.resx"> + <DependentUpon>CopyXls.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectCk.resx"> <DependentUpon>SelectCk.cs</DependentUpon> @@ -1951,6 +2116,9 @@ </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectSrm.resx"> <DependentUpon>SelectSrm.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\UcCheckFlow.resx"> + <DependentUpon>UcCheckFlow.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx"> <DependentUpon>UcDictionaryComBox.cs</DependentUpon> @@ -2137,9 +2305,6 @@ </EmbeddedResource> <EmbeddedResource Include="XtraForm1.resx"> <DependentUpon>XtraForm1.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="XtraForm2.resx"> - <DependentUpon>XtraForm2.cs</DependentUpon> </EmbeddedResource> <None Include="App.config" /> <None Include="packages.config" /> @@ -2434,6 +2599,12 @@ <None Include="Resources\useinformula_16x16.png" /> <None Include="Resources\boposition2_16x162.png" /> <None Include="Resources\apply_16x16.png" /> + <None Include="Resources\ok12341.jpg" /> + <None Include="Resources\error6.jpg" /> + <None Include="Resources\error61.jpg" /> + <None Include="Resources\error9.jpg" /> + <None Include="Resources\error10.jpg" /> + <None Include="Resources\ok10.jpg" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> -- Gitblit v1.9.3