From 555986b6d59f85869a31d376f13b522b2c699ed0 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 22 八月 2025 13:56:25 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 28e2fa4..59816a1 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -533,6 +533,12 @@
<Compile Include="DevFrm\PDA\SelectUser.Designer.cs">
<DependentUpon>SelectUser.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\PDA\SelectZZ.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectZZ.Designer.cs">
+ <DependentUpon>SelectZZ.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\DefectCode.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -769,6 +775,12 @@
</Compile>
<Compile Include="DevFrm\Rpt\Frm_MesQL.Designer.cs">
<DependentUpon>Frm_MesQL.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\ItemQL.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\ItemQL.Designer.cs">
+ <DependentUpon>ItemQL.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rpt\QLCX.cs">
<SubType>Form</SubType>
@@ -1100,12 +1112,6 @@
</Compile>
<Compile Include="DevFrm\Work\Frm_Work01.Designer.cs">
<DependentUpon>Frm_Work01.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\Work\Frm_Work09.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\Work\Frm_Work09.Designer.cs">
- <DependentUpon>Frm_Work09.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Work\Frm_WorkProcesses.cs">
<SubType>Form</SubType>
@@ -1810,6 +1816,9 @@
<EmbeddedResource Include="DevFrm\Rpt\Frm_MesQL.resx">
<DependentUpon>Frm_MesQL.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\ItemQL.resx">
+ <DependentUpon>ItemQL.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
<DependentUpon>QLCX.cs</DependentUpon>
</EmbeddedResource>
@@ -1966,9 +1975,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx">
<DependentUpon>Frm_Work01.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Work\Frm_Work09.resx">
- <DependentUpon>Frm_Work09.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx">
<DependentUpon>Frm_WorkProcesses.cs</DependentUpon>
--
Gitblit v1.9.3