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

lu

3 天以前 430e096780219b81e19043829b637fcda4e61ca1

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -353,6 +353,12 @@
    <Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.Designer.cs">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\MesFqcExceptional.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -775,6 +781,12 @@
    </Compile>
    <Compile Include="DevFrm\Rpt\WomShjhShow.Designer.cs">
      <DependentUpon>WomShjhShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\WOTraceCodes.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\WOTraceCodes.Designer.cs">
      <DependentUpon>WOTraceCodes.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
      <SubType>Form</SubType>
@@ -1625,6 +1637,9 @@
    <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\Frm_FQCItem.resx">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
      <DependentUpon>MesFqcExceptional.cs</DependentUpon>
    </EmbeddedResource>
@@ -1809,6 +1824,9 @@
    <EmbeddedResource Include="DevFrm\Rpt\WomShjhShow.resx">
      <DependentUpon>WomShjhShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\WOTraceCodes.resx">
      <DependentUpon>WOTraceCodes.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
      <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
    </EmbeddedResource>