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 | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1753a7d..2da2b2e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -509,6 +509,12 @@
<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>
@@ -770,6 +776,12 @@
<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>
@@ -841,6 +853,12 @@
</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>
@@ -1147,6 +1165,12 @@
<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>
@@ -1726,6 +1750,9 @@
<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>
@@ -1828,6 +1855,9 @@
<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>
@@ -1863,6 +1893,12 @@
</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>
@@ -2006,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>
--
Gitblit v1.9.3