From ebd8dc093cc83a41aade3fd74857974806ad9298 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 15 十月 2025 17:46:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

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

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 21b43e1..c11f9cc 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -812,6 +812,12 @@
     <Compile Include="DevFrm\Rpt\RptQT.Designer.cs">
       <DependentUpon>RptQT.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\Rpt\SysTuiSong.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Rpt\SysTuiSong.Designer.cs">
+      <DependentUpon>SysTuiSong.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Rpt\UcRptCgdhd.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -1137,6 +1143,18 @@
     <Compile Include="DevFrm\WOM\Frm_WomFanGong.Designer.cs">
       <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\WOM\KanBanLaTou.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\WOM\KanBanLaTou.Designer.cs">
+      <DependentUpon>KanBanLaTou.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\WOM\KanBanLaTouH5.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\WOM\KanBanLaTouH5.Designer.cs">
+      <DependentUpon>KanBanLaTouH5.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\WOM\ShowGx.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1208,6 +1226,12 @@
     </Compile>
     <Compile Include="DevFrm\WW\UcWwBlclSelect.Designer.cs">
       <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\WW\UcWwBlclSelectAll.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\WW\UcWwBlclSelectAll.Designer.cs">
+      <DependentUpon>UcWwBlclSelectAll.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -1535,6 +1559,12 @@
     </Compile>
     <Compile Include="UserControl\UcLookOrg.Designer.cs">
       <DependentUpon>UcLookOrg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcLookOrgAll.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLookOrgAll.Designer.cs">
+      <DependentUpon>UcLookOrgAll.cs</DependentUpon>
     </Compile>
     <Compile Include="UserControl\UcLookPrint.cs">
       <SubType>UserControl</SubType>
@@ -1870,6 +1900,9 @@
     <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
       <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\RkQC\Frm_WwrkDetect01.resx">
+      <DependentUpon>Frm_WwrkDetect01.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
       <DependentUpon>RkDetect01.cs</DependentUpon>
     </EmbeddedResource>
@@ -1914,6 +1947,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rpt\RptQT.resx">
       <DependentUpon>RptQT.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Rpt\SysTuiSong.resx">
+      <DependentUpon>SysTuiSong.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx">
       <DependentUpon>UcRptCgdhd.cs</DependentUpon>
@@ -2072,6 +2108,12 @@
     <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
       <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\WOM\KanBanLaTou.resx">
+      <DependentUpon>KanBanLaTou.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\WOM\KanBanLaTouH5.resx">
+      <DependentUpon>KanBanLaTouH5.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\WOM\ShowGx.resx">
       <DependentUpon>ShowGx.cs</DependentUpon>
     </EmbeddedResource>
@@ -2107,6 +2149,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\WW\UcWwBlclSelect.resx">
       <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\WW\UcWwBlclSelectAll.resx">
+      <DependentUpon>UcWwBlclSelectAll.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\CopyXls.resx">
       <DependentUpon>CopyXls.cs</DependentUpon>
@@ -2267,6 +2312,9 @@
     <EmbeddedResource Include="UserControl\UcLookOrg.resx">
       <DependentUpon>UcLookOrg.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLookOrgAll.resx">
+      <DependentUpon>UcLookOrgAll.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcLookPrint.resx">
       <DependentUpon>UcLookPrint.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3