From 550cb6847bf4c8586bd5430b10ac9d25e8469f5a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 05 九月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 75e413e..74e30c4 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>
@@ -758,6 +764,12 @@
     <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>
     </Compile>
@@ -769,6 +781,12 @@
     </Compile>
     <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>
@@ -841,6 +859,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>
@@ -1148,6 +1172,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>
@@ -1177,6 +1207,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>
@@ -1554,6 +1590,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>
@@ -1714,6 +1756,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>
@@ -1810,11 +1855,17 @@
     <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>
     </EmbeddedResource>
     <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>
@@ -1851,6 +1902,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>
@@ -1994,6 +2051,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>
@@ -2008,6 +2068,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>
@@ -2195,6 +2258,9 @@
     <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" />
     <None Include="Properties\Settings.settings">

--
Gitblit v1.9.3