From 0cdc51485ad887f5d299d22bc580345970c3769b Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 07 十一月 2025 16:58:35 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 06ca45c..9908421 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>
@@ -830,6 +860,12 @@
</Compile>
<Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.Designer.cs">
<DependentUpon>UcRptCgdhdPrint.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>
@@ -1808,6 +1844,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>
@@ -1817,6 +1862,12 @@
<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>
</EmbeddedResource>
--
Gitblit v1.9.3