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

cdk

5 天以前 ae28c33700e413d5acf60d1e48bbc9870bdef5a5

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -434,6 +434,12 @@
    <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.Designer.cs">
      <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.Designer.cs">
      <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -481,12 +487,6 @@
    </Compile>
    <Compile Include="DevFrm\PDA\Frm_UserBind.Designer.cs">
      <DependentUpon>Frm_UserBind.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\Frm_UserBindLst.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\PDA\Frm_UserBindLst.Designer.cs">
      <DependentUpon>Frm_UserBindLst.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectCk.cs">
      <SubType>Form</SubType>
@@ -683,23 +683,17 @@
    <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
      <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.Designer.cs">
      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.Designer.cs">
      <DependentUpon>Frm_WwrkDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.Designer.cs">
      <DependentUpon>Frm_XsthDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\RkDetect01.cs">
      <SubType>UserControl</SubType>
@@ -724,12 +718,6 @@
    </Compile>
    <Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
      <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
      <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rk\HistoryDhmxcs.cs">
      <SubType>Form</SubType>
@@ -906,12 +894,6 @@
    <Compile Include="DevFrm\Sys\Frm_PrintInfo.Designer.cs">
      <DependentUpon>Frm_PrintInfo.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sys\Frm_PrintUser.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sys\Frm_PrintUser.Designer.cs">
      <DependentUpon>Frm_PrintUser.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sys\Mode\PrintInfo.cs" />
    <Compile Include="DevFrm\Sys\Mode\PrintUser.cs" />
    <Compile Include="DevFrm\Sys\SysHelp.cs">
@@ -1043,6 +1025,12 @@
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
      <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.Designer.cs">
      <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_WomFanGong.cs">
      <SubType>Form</SubType>
@@ -1521,6 +1509,12 @@
    <Compile Include="XtraForm1.Designer.cs">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </Compile>
    <Compile Include="XtraForm2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="XtraForm2.Designer.cs">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </Compile>
    <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
      <DependentUpon>Frm_Customer.cs</DependentUpon>
    </EmbeddedResource>
@@ -1645,6 +1639,9 @@
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
      <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJjgzSchedule.resx">
      <DependentUpon>Frm_MesJjgzSchedule.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJJSalary.resx">
      <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
    </EmbeddedResource>
@@ -1668,9 +1665,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\Frm_UserBind.resx">
      <DependentUpon>Frm_UserBind.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\Frm_UserBindLst.resx">
      <DependentUpon>Frm_UserBindLst.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\SelectCk.resx">
      <DependentUpon>SelectCk.cs</DependentUpon>
@@ -1744,8 +1738,8 @@
    <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
      <DependentUpon>Frm_Cqsq.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
      <DependentUpon>RkDetect01.cs</DependentUpon>
@@ -1758,9 +1752,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
      <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
      <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx">
      <DependentUpon>HistoryDhmxcs.cs</DependentUpon>
@@ -1847,9 +1838,6 @@
    <EmbeddedResource Include="DevFrm\Sys\Frm_PrintInfo.resx">
      <DependentUpon>Frm_PrintInfo.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sys\Frm_PrintUser.resx">
      <DependentUpon>Frm_PrintUser.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sys\SysHelp.resx">
      <DependentUpon>SysHelp.cs</DependentUpon>
    </EmbeddedResource>
@@ -1912,6 +1900,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
      <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_WomdaaNbz.resx">
      <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
      <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
@@ -2147,6 +2138,9 @@
    <EmbeddedResource Include="XtraForm1.resx">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="XtraForm2.resx">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </EmbeddedResource>
    <None Include="App.config" />
    <None Include="packages.config" />
    <None Include="Properties\Settings.settings">