Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient

wbc

2025-12-03 6940ba1b4fe555c94353de9d7ab6a53a6c8884bc

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -824,11 +824,35 @@
    <Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs">
      <DependentUpon>CkYtmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\gdwldcqtkc.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\gdwldcqtkc.Designer.cs">
      <DependentUpon>gdwldcqtkc.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\wlhzdcqtkc.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\wlhzdcqtkc.Designer.cs">
      <DependentUpon>wlhzdcqtkc.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\SysTuiSong.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\SysTuiSong.Designer.cs">
      <DependentUpon>SysTuiSong.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\YS_iqcWeek.cs">
      <SubType>Form</SubType>
@@ -1435,6 +1459,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\UcBtnPrintOne.cs">
      <SubType>UserControl</SubType>
@@ -2122,8 +2152,20 @@
    <EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx">
      <DependentUpon>CkYtmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\gdwldcqtkc.resx">
      <DependentUpon>gdwldcqtkc.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\wlhzdcqtkc.resx">
      <DependentUpon>wlhzdcqtkc.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\SysTuiSong.resx">
      <DependentUpon>SysTuiSong.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\YS_iqcWeek.resx">
      <DependentUpon>YS_iqcWeek.cs</DependentUpon>
@@ -2420,6 +2462,9 @@
    <EmbeddedResource Include="UserControl\SelectSrm.resx">
      <DependentUpon>SelectSrm.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcBtnPrintAll.resx">
      <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
      <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
    </EmbeddedResource>