From 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 18 九月 2025 16:16:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 108 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 24658d0..22bd9d8 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>
@@ -787,6 +805,24 @@
</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>
@@ -818,6 +854,12 @@
<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>
</Compile>
@@ -841,6 +883,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>
@@ -1137,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>
@@ -1177,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>
@@ -1554,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>
@@ -1720,6 +1786,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>
@@ -1816,11 +1885,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>
@@ -1830,6 +1905,12 @@
</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\WomShjh.resx">
<DependentUpon>WomShjh.cs</DependentUpon>
@@ -1846,6 +1927,9 @@
<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>
</EmbeddedResource>
@@ -1857,6 +1941,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>
@@ -1997,8 +2087,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>
@@ -2014,6 +2113,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>
@@ -2200,9 +2302,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" />
--
Gitblit v1.9.3