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 | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 118 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index cf2cd75..dbbf210 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -467,6 +467,24 @@
<Compile Include="DevFrm\JJGZ\Frm_MesTimeType.Designer.cs">
<DependentUpon>Frm_MesTimeType.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_YDCQ.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_YDCQ.Designer.cs">
+ <DependentUpon>Frm_YDCQ.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_YDGZ.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_YDGZ.Designer.cs">
+ <DependentUpon>Frm_YDGZ.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_JJMX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\Frm_JJMX.Designer.cs">
+ <DependentUpon>Frm_JJMX.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\JJGZ\KQCX.cs">
<SubType>Form</SubType>
</Compile>
@@ -484,6 +502,18 @@
</Compile>
<Compile Include="DevFrm\JJGZ\SetLB.Designer.cs">
<DependentUpon>SetLB.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\YDCQCX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\YDCQCX.Designer.cs">
+ <DependentUpon>YDCQCX.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\YDGZCX.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\JJGZ\YDGZCX.Designer.cs">
+ <DependentUpon>YDGZCX.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\PDA\Frm_AreaBind.cs">
<SubType>Form</SubType>
@@ -611,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>
@@ -669,11 +717,18 @@
<Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQmAql4.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
<Compile Include="DevFrm\QC\Models\MesQmCheckitem.cs" />
<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>
@@ -788,6 +843,12 @@
<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>
</Compile>
@@ -829,6 +890,24 @@
</Compile>
<Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.Designer.cs">
<DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\ucRptCgrk.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\ucRptCgrk.Designer.cs">
+ <DependentUpon>ucRptCgrk.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtdj.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtdj.Designer.cs">
+ <DependentUpon>UcRptQtdj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtrkdj.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtrkdj.Designer.cs">
+ <DependentUpon>UcRptQtrkdj.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rpt\WomShjh.cs">
<SubType>Form</SubType>
@@ -1807,6 +1886,15 @@
<EmbeddedResource Include="DevFrm\JJGZ\Frm_MesTimeType.resx">
<DependentUpon>Frm_MesTimeType.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_YDCQ.resx">
+ <DependentUpon>Frm_YDCQ.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_YDGZ.resx">
+ <DependentUpon>Frm_YDGZ.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\Frm_JJMX.resx">
+ <DependentUpon>Frm_JJMX.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\JJGZ\KQCX.resx">
<DependentUpon>KQCX.cs</DependentUpon>
</EmbeddedResource>
@@ -1815,6 +1903,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\JJGZ\SetLB.resx">
<DependentUpon>SetLB.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\YDCQCX.resx">
+ <DependentUpon>YDCQCX.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\JJGZ\YDGZCX.resx">
+ <DependentUpon>YDGZCX.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\Frm_AreaBind.resx">
<DependentUpon>Frm_AreaBind.cs</DependentUpon>
@@ -1861,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>
@@ -1887,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>
@@ -1942,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>
@@ -1963,6 +2072,15 @@
<EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhdPrint.resx">
<DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\ucRptCgrk.resx">
+ <DependentUpon>ucRptCgrk.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptQtdj.resx">
+ <DependentUpon>UcRptQtdj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptQtrkdj.resx">
+ <DependentUpon>UcRptQtrkdj.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
<DependentUpon>WomShjh.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3