From af8728f2b911b84dc4142e5b8fa47b21098ba71f Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 06 八月 2025 15:34:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d36af3e..68bb0e9 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -857,12 +857,6 @@
<Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemOutCDetails.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" />
- <Compile Include="DevFrm\WOM\FrmBackFlash.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\WOM\FrmBackFlash.Designer.cs">
- <DependentUpon>FrmBackFlash.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\WOM\Frm_MesProcGx.cs">
<SubType>Form</SubType>
</Compile>
@@ -892,6 +886,12 @@
</Compile>
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_WompbaGx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_WompbaGx.Designer.cs">
+ <DependentUpon>Frm_WompbaGx.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\WOM\MesProcInfo.cs">
<SubType>Form</SubType>
@@ -1651,9 +1651,6 @@
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesShouTuiDj.resx">
<DependentUpon>Frm_MesShouTuiDj.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx">
- <DependentUpon>FrmBackFlash.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_MesProcGx.resx">
<DependentUpon>Frm_MesProcGx.cs</DependentUpon>
</EmbeddedResource>
@@ -1669,6 +1666,9 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.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>
--
Gitblit v1.9.3