From cc286e3641ef72fe7cb1312487a6d4e40bda81fe Mon Sep 17 00:00:00 2001 From: cdk <2441919651@qq.com> Date: 星期三, 03 九月 2025 09:23:31 +0800 Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 196 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 158 insertions(+), 38 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 090cd6e..2da2b2e 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> @@ -434,6 +443,12 @@ <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.Designer.cs"> <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.Designer.cs"> + <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.cs"> <SubType>Form</SubType> </Compile> @@ -482,12 +497,6 @@ <Compile Include="DevFrm\PDA\Frm_UserBind.Designer.cs"> <DependentUpon>Frm_UserBind.cs</DependentUpon> </Compile> - <Compile Include="DevFrm\PDA\Frm_UserBindLst.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\PDA\Frm_UserBindLst.Designer.cs"> - <DependentUpon>Frm_UserBindLst.cs</DependentUpon> - </Compile> <Compile Include="DevFrm\PDA\SelectCk.cs"> <SubType>Form</SubType> </Compile> @@ -499,6 +508,18 @@ </Compile> <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> @@ -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,23 +710,17 @@ <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> </Compile> <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.Designer.cs"> <DependentUpon>Frm_WwrkDetect01.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> @@ -731,6 +752,12 @@ <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> @@ -749,11 +776,23 @@ <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> @@ -772,6 +811,12 @@ </Compile> <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> @@ -802,6 +847,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> @@ -899,12 +962,6 @@ </Compile> <Compile Include="DevFrm\Sys\Frm_PrintInfo.Designer.cs"> <DependentUpon>Frm_PrintInfo.cs</DependentUpon> - </Compile> - <Compile Include="DevFrm\Sys\Frm_PrintUser.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\Sys\Frm_PrintUser.Designer.cs"> - <DependentUpon>Frm_PrintUser.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Sys\Mode\PrintInfo.cs" /> <Compile Include="DevFrm\Sys\Mode\PrintUser.cs" /> @@ -1038,6 +1095,12 @@ <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.Designer.cs"> + <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\WOM\Frm_WomFanGong.cs"> <SubType>Form</SubType> </Compile> @@ -1067,12 +1130,6 @@ </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> @@ -1109,6 +1166,12 @@ <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> </Compile> @@ -1138,6 +1201,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> @@ -1515,6 +1584,12 @@ <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 +1671,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> @@ -1639,6 +1717,9 @@ <EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx"> <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.resx"> + <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJJSalary.resx"> <DependentUpon>Frm_MesJJSalary.cs</DependentUpon> </EmbeddedResource> @@ -1663,14 +1744,17 @@ <EmbeddedResource Include="DevFrm\PDA\Frm_UserBind.resx"> <DependentUpon>Frm_UserBind.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="DevFrm\PDA\Frm_UserBindLst.resx"> - <DependentUpon>Frm_UserBindLst.cs</DependentUpon> - </EmbeddedResource> <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\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> @@ -1680,6 +1764,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 +1825,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,6 +1843,9 @@ <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> @@ -1765,8 +1855,14 @@ <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> @@ -1776,6 +1872,9 @@ </EmbeddedResource> <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> @@ -1791,6 +1890,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> @@ -1837,9 +1945,6 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sys\Frm_PrintInfo.resx"> <DependentUpon>Frm_PrintInfo.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="DevFrm\Sys\Frm_PrintUser.resx"> - <DependentUpon>Frm_PrintUser.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sys\SysHelp.resx"> <DependentUpon>SysHelp.cs</DependentUpon> @@ -1904,6 +2009,9 @@ <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\Frm_WomdaaNbz.resx"> + <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx"> <DependentUpon>Frm_WomFanGong.cs</DependentUpon> </EmbeddedResource> @@ -1918,9 +2026,6 @@ </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> @@ -1937,6 +2042,9 @@ <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx"> <DependentUpon>showWwZhongTai.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="UserControl\CopyXls.resx"> + <DependentUpon>CopyXls.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectCk.resx"> <DependentUpon>SelectCk.cs</DependentUpon> </EmbeddedResource> @@ -1951,6 +2059,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,6 +2248,9 @@ </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" /> @@ -2431,6 +2545,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