From 5afff49d3471e7c966f5e7d5ed30c28891f71c5d Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 01 九月 2025 17:48:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient

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

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d6674b0..52f914d 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -601,6 +601,12 @@
     <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
       <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\WOM\FrmAutoRk.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\WOM\FrmAutoRk.Designer.cs">
+      <DependentUpon>FrmAutoRk.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\WOM\FrmBackFlash.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -896,6 +902,12 @@
     <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
       <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\WOM\Frm_Womdaahb.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\WOM\Frm_Womdaahb.Designer.cs">
+      <DependentUpon>Frm_Womdaahb.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\WOM\Frm_WompbaGx.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -907,6 +919,12 @@
     </Compile>
     <Compile Include="DevFrm\WOM\MesProcInfo.Designer.cs">
       <DependentUpon>MesProcInfo.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\WOM\SelectWomdaa.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\WOM\SelectWomdaa.Designer.cs">
+      <DependentUpon>SelectWomdaa.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\WOM\ShowJieAn.cs">
       <SubType>Form</SubType>
@@ -978,6 +996,12 @@
     </Compile>
     <Compile Include="UserControl\SelectDeleteBar.Designer.cs">
       <DependentUpon>SelectDeleteBar.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcBtnPrintOne.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcBtnPrintOne.Designer.cs">
+      <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
     </Compile>
     <Compile Include="UserControl\UcDictionaryComBox.cs">
       <SubType>UserControl</SubType>
@@ -1252,6 +1276,12 @@
     </Compile>
     <Compile Include="UserControl\UcLookItems.Designer.cs">
       <DependentUpon>UcLookItems.cs</DependentUpon>
+    </Compile>
+    <Compile Include="UserControl\UcLookKw.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControl\UcLookKw.Designer.cs">
+      <DependentUpon>UcLookKw.cs</DependentUpon>
     </Compile>
     <Compile Include="UserControl\UcLookOrg.cs">
       <SubType>UserControl</SubType>
@@ -1536,6 +1566,9 @@
     <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
       <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\WOM\FrmAutoRk.resx">
+      <DependentUpon>FrmAutoRk.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx">
       <DependentUpon>FrmBackFlash.cs</DependentUpon>
     </EmbeddedResource>
@@ -1678,11 +1711,17 @@
     <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
       <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\WOM\Frm_Womdaahb.resx">
+      <DependentUpon>Frm_Womdaahb.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\WOM\Frm_WompbaGx.resx">
       <DependentUpon>Frm_WompbaGx.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\WOM\MesProcInfo.resx">
       <DependentUpon>MesProcInfo.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\WOM\SelectWomdaa.resx">
+      <DependentUpon>SelectWomdaa.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
       <DependentUpon>ShowJieAn.cs</DependentUpon>
@@ -1716,6 +1755,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
       <DependentUpon>SelectDeleteBar.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
+      <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
       <DependentUpon>UcDictionaryComBox.cs</DependentUpon>
@@ -1852,6 +1894,9 @@
     <EmbeddedResource Include="UserControl\UcLookItems.resx">
       <DependentUpon>UcLookItems.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\UcLookKw.resx">
+      <DependentUpon>UcLookKw.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcLookOrg.resx">
       <DependentUpon>UcLookOrg.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3