From a6f65537fd87ae065fe5cec62863ac4380d2a745 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 28 八月 2025 11:15:54 +0800
Subject: [PATCH] 销售退货单增加字段
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 178 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 140 insertions(+), 38 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ffd9501..966eb87 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>
@@ -488,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>
@@ -505,6 +508,12 @@
</Compile>
<Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
<DependentUpon>SelectItem.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>
@@ -523,6 +532,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>
@@ -689,23 +704,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>
@@ -737,6 +746,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>
@@ -755,11 +770,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>
@@ -778,6 +805,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>
@@ -808,6 +841,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>
@@ -905,12 +956,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" />
@@ -1044,6 +1089,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>
@@ -1073,12 +1124,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>
@@ -1115,6 +1160,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>
@@ -1144,6 +1195,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>
@@ -1521,6 +1578,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>
@@ -1602,6 +1665,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,14 +1738,14 @@
<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\SelectLine.resx">
+ <DependentUpon>SelectLine.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\SelectPage.resx">
<DependentUpon>SelectPage.cs</DependentUpon>
@@ -1689,6 +1755,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>
@@ -1747,8 +1816,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>
@@ -1765,6 +1834,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>
@@ -1774,8 +1846,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>
@@ -1785,6 +1863,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>
@@ -1800,6 +1881,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>
@@ -1846,9 +1936,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>
@@ -1913,6 +2000,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>
@@ -1927,9 +2017,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>
@@ -1946,6 +2033,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>
@@ -1960,6 +2050,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>
@@ -2146,6 +2239,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" />
@@ -2440,6 +2536,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