Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

2025-11-19 c4f46e49677576ac7f1a74feee547b3238c0eeaf

 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>
@@ -819,6 +837,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 +884,12 @@
    </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>
@@ -1919,8 +1949,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>
@@ -2000,6 +2039,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>
@@ -2021,6 +2063,9 @@
    <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>