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

cdk

4 天以前 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -509,6 +509,12 @@
    <Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
      <DependentUpon>SelectItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectKW.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectKW.Designer.cs">
      <DependentUpon>SelectKW.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectLine.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -758,6 +764,12 @@
    <Compile Include="DevFrm\Rpt\Ckcgmx.Designer.cs">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\CkKuCun.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\CkKuCun.Designer.cs">
      <DependentUpon>CkKuCun.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\CKTmkc.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -794,6 +806,24 @@
    <Compile Include="DevFrm\Rpt\QLCX.Designer.cs">
      <DependentUpon>QLCX.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\RptQT.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\RptQT.Designer.cs">
      <DependentUpon>RptQT.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\UcRptCgdhd.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\UcRptCgdhd.Designer.cs">
      <DependentUpon>UcRptCgdhd.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.Designer.cs">
      <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\WomShjh.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -824,6 +854,12 @@
    <Compile Include="DevFrm\Sales\Frm_SalesDeliver.Designer.cs">
      <DependentUpon>Frm_SalesDeliver.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.Designer.cs">
      <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesOrder.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -847,6 +883,12 @@
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.Designer.cs">
      <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs">
      <SubType>Form</SubType>
@@ -1143,11 +1185,23 @@
    <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs">
      <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\Frm_WwLl.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\Frm_WwLl.Designer.cs">
      <DependentUpon>Frm_WwLl.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\showWwZhongTai.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\showWwZhongTai.Designer.cs">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\UcWwBlclSelect.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\UcWwBlclSelect.Designer.cs">
      <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
    </Compile>
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
@@ -1572,12 +1626,6 @@
    <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>
@@ -1738,6 +1786,9 @@
    <EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
      <DependentUpon>SelectItem.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\SelectKW.resx">
      <DependentUpon>SelectKW.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
      <DependentUpon>SelectLine.cs</DependentUpon>
    </EmbeddedResource>
@@ -1834,6 +1885,9 @@
    <EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\CkKuCun.resx">
      <DependentUpon>CkKuCun.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
      <DependentUpon>CKTmkc.cs</DependentUpon>
    </EmbeddedResource>
@@ -1852,6 +1906,12 @@
    <EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
      <DependentUpon>QLCX.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\RptQT.resx">
      <DependentUpon>RptQT.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx">
      <DependentUpon>UcRptCgdhd.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
      <DependentUpon>WomShjh.cs</DependentUpon>
    </EmbeddedResource>
@@ -1867,6 +1927,9 @@
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliver.resx">
      <DependentUpon>Frm_SalesDeliver.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverSelect.resx">
      <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesOrder.resx">
      <DependentUpon>Frm_SalesOrder.cs</DependentUpon>
    </EmbeddedResource>
@@ -1878,6 +1941,12 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.resx">
      <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
      <DependentUpon>EasyRptEdt.cs</DependentUpon>
@@ -2018,8 +2087,14 @@
    <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx">
      <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\Frm_WwLl.resx">
      <DependentUpon>Frm_WwLl.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\UcWwBlclSelect.resx">
      <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\CopyXls.resx">
      <DependentUpon>CopyXls.cs</DependentUpon>
@@ -2227,9 +2302,6 @@
    </EmbeddedResource>
    <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" />