From cabb7ecdde336baec10b5ca4e0bd09d443b2023b Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期二, 23 十二月 2025 13:28:57 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 105 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 8a56265..cb92c88 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -593,6 +593,12 @@
<Compile Include="DevFrm\QC\DefectCodeQc.Designer.cs">
<DependentUpon>DefectCodeQc.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\DefectCodeQtck.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\DefectCodeQtck.Designer.cs">
+ <DependentUpon>DefectCodeQtck.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\DefectCodeRk.cs">
<SubType>Form</SubType>
</Compile>
@@ -640,6 +646,24 @@
</Compile>
<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>
@@ -705,6 +729,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>
@@ -819,6 +849,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>
@@ -860,6 +896,18 @@
</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>
@@ -939,6 +987,12 @@
<Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.Designer.cs">
<DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sys\DefectCodeKanban.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\DefectCodeKanban.Designer.cs">
+ <DependentUpon>DefectCodeKanban.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Sys\EasyRptEdt.cs">
<SubType>Form</SubType>
</Compile>
@@ -956,6 +1010,18 @@
</Compile>
<Compile Include="DevFrm\Sys\Frm_Config.Designer.cs">
<DependentUpon>Frm_Config.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBan.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBan.Designer.cs">
+ <DependentUpon>SimpleKanBan.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBanEdit.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBanEdit.Designer.cs">
+ <DependentUpon>SimpleKanBanEdit.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\User\ViewRole.cs">
<SubType>Form</SubType>
@@ -1215,6 +1281,12 @@
</Compile>
<Compile Include="DevFrm\Work\Frm_Work01.Designer.cs">
<DependentUpon>Frm_Work01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_Work01Fg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_Work01Fg.Designer.cs">
+ <DependentUpon>Frm_Work01Fg.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Work\Frm_WorkProcesses.cs">
<SubType>Form</SubType>
@@ -1913,8 +1985,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>
@@ -1939,6 +2020,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>
@@ -1994,6 +2078,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>
@@ -2014,6 +2101,12 @@
</EmbeddedResource>
<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>
@@ -2054,6 +2147,9 @@
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.resx">
<DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\DefectCodeKanban.resx">
+ <DependentUpon>DefectCodeKanban.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
<DependentUpon>EasyRptEdt.cs</DependentUpon>
</EmbeddedResource>
@@ -2062,6 +2158,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\Frm_Config.resx">
<DependentUpon>Frm_Config.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\SimpleKanBan.resx">
+ <DependentUpon>SimpleKanBan.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\SimpleKanBanEdit.resx">
+ <DependentUpon>SimpleKanBanEdit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\ViewRole.resx">
<DependentUpon>ViewRole.cs</DependentUpon>
@@ -2187,6 +2289,9 @@
<EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx">
<DependentUpon>Frm_Work01.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Work\Frm_Work01Fg.resx">
+ <DependentUpon>Frm_Work01Fg.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx">
<DependentUpon>Frm_WorkProcesses.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3