From 800f1652b2ed0473850975efe5028685bcd605c4 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 20 九月 2025 14:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |   63 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 2b3abe6..21b43e1 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -806,6 +806,24 @@
     <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>
     </Compile>
@@ -1167,11 +1185,29 @@
     <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\Frm_WwLlDjN.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\WW\Frm_WwLlDjN.Designer.cs">
+      <DependentUpon>Frm_WwLlDjN.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>
@@ -1596,12 +1632,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>
@@ -1882,6 +1912,15 @@
     <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\UcRptCgdhdPrint.resx">
+      <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
       <DependentUpon>WomShjh.cs</DependentUpon>
     </EmbeddedResource>
@@ -2057,8 +2096,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\Frm_WwLlDjN.resx">
+      <DependentUpon>Frm_WwLlDjN.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>
@@ -2266,9 +2314,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