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

cnf

2025-11-05 2a9921ce0216fac169587c35087f0d383e5fdb28

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -209,6 +209,12 @@
    <Compile Include="DevFrm\BasicData\Frm_Department.Designer.cs">
      <DependentUpon>Frm_Department.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.Designer.cs">
      <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\BasicData\Frm_MesItems.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -794,6 +800,18 @@
    <Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs">
      <DependentUpon>CkYtmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_iqcWeek.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_iqcWeek.Designer.cs">
      <DependentUpon>YS_iqcWeek.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_iqcMonth.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_iqcMonth.Designer.cs">
      <DependentUpon>YS_iqcMonth.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\IPQCSJMX.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -866,6 +884,12 @@
    <Compile Include="DevFrm\Rpt\YS_bgjlb.Designer.cs">
      <DependentUpon>YS_bgjlb.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_iqcdjy.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_iqcdjy.Designer.cs">
      <DependentUpon>YS_iqcdjy.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_iqc_report.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -877,6 +901,12 @@
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_jhdcl.Designer.cs">
      <DependentUpon>YS_jhdcl.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_mjczjlMax .cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_mjczjlMax .Designer.cs">
      <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_mjczjl.cs">
      <SubType>Form</SubType>
@@ -895,6 +925,18 @@
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_py_pk_d.Designer.cs">
      <DependentUpon>YS_py_pk_d.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_drkmx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_drkmx.Designer.cs">
      <DependentUpon>YS_drkmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_rkmx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_rkmx.Designer.cs">
      <DependentUpon>YS_rkmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\YS_rkjreport.cs">
      <SubType>Form</SubType>
@@ -1716,6 +1758,9 @@
    <EmbeddedResource Include="DevFrm\BasicData\Frm_Department.resx">
      <DependentUpon>Frm_Department.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDepotMin.resx">
      <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
      <DependentUpon>Frm_MesItems.cs</DependentUpon>
    </EmbeddedResource>
@@ -1981,6 +2026,12 @@
    <EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx">
      <DependentUpon>CkYtmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_iqcWeek.resx">
      <DependentUpon>YS_iqcWeek.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_iqcMonth.resx">
      <DependentUpon>YS_iqcMonth.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\IPQCSJMX.resx">
      <DependentUpon>IPQCSJMX.cs</DependentUpon>
    </EmbeddedResource>
@@ -2017,11 +2068,17 @@
    <EmbeddedResource Include="DevFrm\Rpt\YS_bgjlb.resx">
      <DependentUpon>YS_bgjlb.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_iqcdjy.resx">
      <DependentUpon>YS_iqcdjy.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_iqc_report.resx">
      <DependentUpon>YS_iqc_report.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_jhdcl.resx">
      <DependentUpon>YS_jhdcl.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_mjczjlMax .resx">
      <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_mjczjl.resx">
      <DependentUpon>YS_mjczjl.cs</DependentUpon>
@@ -2032,6 +2089,12 @@
    <EmbeddedResource Include="DevFrm\Rpt\YS_py_pk_d.resx">
      <DependentUpon>YS_py_pk_d.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_drkmx.resx">
      <DependentUpon>YS_drkmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_rkmx.resx">
      <DependentUpon>YS_rkmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\YS_rkjreport.resx">
      <DependentUpon>YS_rkjreport.cs</DependentUpon>
    </EmbeddedResource>