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

lu

2025-10-29 c1c501a803a66d410771fa5ab9aac162f2d5e717

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -669,6 +669,7 @@
    <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" />
@@ -1143,6 +1144,18 @@
    <Compile Include="DevFrm\WOM\Frm_WomFanGong.Designer.cs">
      <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\KanBanLaTou.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\KanBanLaTou.Designer.cs">
      <DependentUpon>KanBanLaTou.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\KanBanLaTouH5.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\KanBanLaTouH5.Designer.cs">
      <DependentUpon>KanBanLaTouH5.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\ShowGx.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1261,6 +1274,12 @@
    </Compile>
    <Compile Include="UserControl\SelectSrm.Designer.cs">
      <DependentUpon>SelectSrm.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcBtnPrintAll.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcBtnPrintAll.Designer.cs">
      <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcCheckFlow.cs">
      <SubType>UserControl</SubType>
@@ -1888,6 +1907,9 @@
    <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_WwrkDetect01.resx">
      <DependentUpon>Frm_WwrkDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
      <DependentUpon>RkDetect01.cs</DependentUpon>
    </EmbeddedResource>
@@ -2093,6 +2115,12 @@
    <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
      <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\KanBanLaTou.resx">
      <DependentUpon>KanBanLaTou.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\KanBanLaTouH5.resx">
      <DependentUpon>KanBanLaTouH5.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\ShowGx.resx">
      <DependentUpon>ShowGx.cs</DependentUpon>
    </EmbeddedResource>
@@ -2150,6 +2178,9 @@
    <EmbeddedResource Include="UserControl\SelectSrm.resx">
      <DependentUpon>SelectSrm.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcBtnPrintAll.resx">
      <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcCheckFlow.resx">
      <DependentUpon>UcCheckFlow.cs</DependentUpon>
    </EmbeddedResource>