From dfd02ad42c5b4f8ee7190fe51730c21cf75d37a5 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期一, 24 十一月 2025 15:36:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
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 93dff0d..dbbf210 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -641,6 +641,24 @@
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.Designer.cs">
+ <DependentUpon>Frm_MesQmCheckitemDtByLeiBie.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmByLeiBie.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmByLeiBie.Designer.cs">
+ <DependentUpon>JyxmByLeiBie.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmShowByLeiBie.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmShowByLeiBie.Designer.cs">
+ <DependentUpon>JyxmShowByLeiBie.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\JyxmShowCopy.cs">
<SubType>Form</SubType>
</Compile>
@@ -705,6 +723,12 @@
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
+ <Compile Include="DevFrm\QC\SelOutType.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\SelOutType.Designer.cs">
+ <DependentUpon>SelOutType.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\Xls.cs">
<SubType>Form</SubType>
</Compile>
@@ -818,6 +842,12 @@
</Compile>
<Compile Include="DevFrm\Rpt\CPMX.Designer.cs">
<DependentUpon>CPMX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\Frm_CQTM.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\Frm_CQTM.Designer.cs">
+ <DependentUpon>Frm_CQTM.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rpt\Frm_MesQL.cs">
<SubType>Form</SubType>
@@ -1925,8 +1955,17 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.resx">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.resx">
+ <DependentUpon>Frm_MesQmCheckitemDtByLeiBie.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\JyxmByLeiBie.resx">
+ <DependentUpon>JyxmByLeiBie.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\JyxmShow.resx">
<DependentUpon>JyxmShow.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\JyxmShowByLeiBie.resx">
+ <DependentUpon>JyxmShowByLeiBie.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\JyxmShowCopy.resx">
<DependentUpon>JyxmShowCopy.cs</DependentUpon>
@@ -1951,6 +1990,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\SelOutType.resx">
+ <DependentUpon>SelOutType.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Xls.resx">
<DependentUpon>Xls.cs</DependentUpon>
@@ -2006,6 +2048,9 @@
<EmbeddedResource Include="DevFrm\Rpt\CPMX.resx">
<DependentUpon>CPMX.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\Frm_CQTM.resx">
+ <DependentUpon>Frm_CQTM.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\Frm_MesQL.resx">
<DependentUpon>Frm_MesQL.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3