nothing

zgq

2021-02-22 87c03e3206ea8c5d20ef1439ead928c162b5cb41

nothing

 CLOUDWEB/CLOUDWEB.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>CLOUDWEBAPI</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 CLOUDWEB/Properties/PublishProfiles/CLOUDWEBAPI.pubxml.user

@@ -10,25 +10,25 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="About.aspx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Account/Login.aspx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Account/Manage.aspx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Account/OpenAuthProviders.ascx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Account/Register.aspx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Account/RegisterExternalLogin.aspx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Account/Web.config">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="bin/AspNet.ScriptManager.jQuery.dll">
      <publishTime>09/21/2012 09:35:38</publishTime>
@@ -49,19 +49,19 @@
      <publishTime>01/13/2021 17:56:02</publishTime>
    </File>
    <File Include="bin/CLOUDWEB.dll">
      <publishTime>01/24/2021 21:48:43</publishTime>
      <publishTime>02/22/2021 03:53:13</publishTime>
    </File>
    <File Include="bin/CLOUDWEB.pdb">
      <publishTime>01/24/2021 21:48:43</publishTime>
      <publishTime>02/22/2021 03:53:13</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/24/2021 17:44:57</publishTime>
      <publishTime>02/22/2021 02:39:31</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>01/24/2021 17:44:57</publishTime>
      <publishTime>02/22/2021 02:39:31</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/DotNetOpenAuth.AspNet.dll">
      <publishTime>11/28/2012 03:03:28</publishTime>
@@ -91,13 +91,13 @@
      <publishTime>01/13/2021 14:25:38</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNet.FriendlyUrls.dll">
      <publishTime>02/13/2013 11:28:16</publishTime>
@@ -109,28 +109,28 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/24/2021 17:44:52</publishTime>
      <publishTime>01/13/2021 20:38:31</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>01/24/2021 17:44:52</publishTime>
      <publishTime>01/13/2021 20:38:31</publishTime>
    </File>
    <File Include="bin/Mono.Math.dll">
      <publishTime>11/28/2012 03:03:36</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/Org.Mentalis.Security.Cryptography.dll">
      <publishTime>11/28/2012 03:03:36</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/13/2021 20:29:05</publishTime>
      <publishTime>01/13/2021 18:04:19</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>01/02/2021 14:46:15</publishTime>
@@ -160,253 +160,253 @@
      <publishTime>02/24/2014 15:34:02</publishTime>
    </File>
    <File Include="Contact.aspx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:29</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_flat_75_ffffff_40x100.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:29</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:29</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_glass_65_ffffff_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:29</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_glass_75_dadada_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-icons_222222_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-icons_2e83ff_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-icons_454545_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-icons_888888_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/images/ui-icons_cd0a0a_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/jquery-ui.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.accordion.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.all.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.autocomplete.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:28</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.base.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.button.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.core.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.datepicker.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.dialog.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.progressbar.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.resizable.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.selectable.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.slider.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:27</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.tabs.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/jquery.ui.theme.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_flat_75_ffffff_40x100.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_glass_65_ffffff_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_glass_75_dadada_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-icons_222222_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-icons_2e83ff_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-icons_454545_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-icons_888888_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/images/ui-icons_cd0a0a_256x240.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:26</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery-ui.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.accordion.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.autocomplete.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.button.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.core.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.datepicker.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.dialog.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.progressbar.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.resizable.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.selectable.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.slider.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:25</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.tabs.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:24</publishTime>
    </File>
    <File Include="Content/themes/base/minified/jquery.ui.theme.min.css">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:24</publishTime>
    </File>
    <File Include="Default.aspx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="favicon.ico">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/accent.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/bullet.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/heroAccent.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList0.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList1.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList2.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList3.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList4.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList5.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList6.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList7.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList8.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Images/orderedList9.png">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:29</publishTime>
    </File>
    <File Include="Scripts/jquery-1.8.2.js">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:13:13</publishTime>
    </File>
    <File Include="Scripts/jquery-1.8.2.min.js">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:13:13</publishTime>
    </File>
    <File Include="Scripts/jquery-ui-1.8.24.js">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:24</publishTime>
    </File>
    <File Include="Scripts/jquery-ui-1.8.24.min.js">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:14:24</publishTime>
    </File>
    <File Include="Scripts/modernizr-2.6.2.js">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Site.Master">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Site.Mobile.Master">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="ViewSwitcher.ascx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>01/24/2021 17:46:20</publishTime>
      <publishTime>01/13/2021 20:38:46</publishTime>
    </File>
    <File Include="WebService1.asmx">
      <publishTime>01/13/2021 20:29:03</publishTime>
      <publishTime>01/13/2021 18:04:18</publishTime>
    </File>
  </ItemGroup>
</Project>

 CLOUDWEB/WebService1.asmx.cs

@@ -2784,7 +2784,7 @@
            dal.oModel = oMain;
            if (!oBar.GetInfoByNumber_View(oMain.HBarCode))
            {
                sErrMsg = "无效条码";
                sErrMsg = "400-无效条码！";
                return false;
            }
            else
@@ -22754,25 +22754,29 @@
            DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
            if (dal.GetInfoByNumber_View(sBarCode))
            {
                sErrMsg = "";
                //-------------获取TMP中的原单主内码和子内码
                DataSet ds = oCN.RunProcReturn("exec h_p_WMS_GetBarCodeSourceInterID " + sInterID.ToString() + ",'" + sBarCode + "' ", "h_p_WMS_GetBarCodeSourceInterID");
                if(ds==null || ds.Tables[0].Rows.Count==0 )
                {
                //if (dal.omodel_View.HBarCodeType != "托盘条码")
                //{
                    sErrMsg = "";
                    //-------------获取TMP中的原单主内码和子内码
                    DataSet ds = oCN.RunProcReturn("exec h_p_WMS_GetBarCodeSourceInterID " + sInterID.ToString() + ",'" + sBarCode + "' ", "h_p_WMS_GetBarCodeSourceInterID");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {

                }
                else
                {
                     if(DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0])==0)
                     {
                         dal.omodel_View.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
                         dal.omodel_View.HSourceEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceEntryID"]);
                         dal.omodel_View.HSourceInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceInterID"]);
                         dal.omodel_View.HinitQty = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[0]["HQtyMust"]);
                         sBool = true;
                     } 
                }
                return dal.omodel_View;
                    }
                    else
                    {
                        if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 0)
                        {
                            dal.omodel_View.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
                            dal.omodel_View.HSourceEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceEntryID"]);
                            dal.omodel_View.HSourceInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceInterID"]);
                            dal.omodel_View.HinitQty = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[0]["HQtyMust"]);
                            sBool = true;
                        }
                    }
                    return dal.omodel_View;
                //}
                
            }
            else
            {
@@ -25785,64 +25789,72 @@
                    if (Dss == null || Dss.Tables[0].Rows.Count == 0)
                    {
                        //

                        //如果是销售出库并且是雅琪诺则托盘条码分解并模拟扫码
                        if (HBillType == "1205" && oSystemParameter.omodel.WMS_CampanyName == "雅琪诺")
                        DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
                        if (dal.GetInfoByNumber_View(sBarCode))
                        {
                            //分解托条码得到明细条码信息写入出入库条码临时表
                            DataSet dsTBarCode;
                            string sBarCode_MX;
                            dsTBarCode = oCn.RunProcReturn("select b.HBarCode HBarCodeMX from Sc_PackUnionBillMain a  " +
                            " inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID " +
                            " Where a.HBarCode_Pack = '" + sBarCode + "'", "Sc_PackUnionBillMain");
                            if(dsTBarCode== null || dsTBarCode.Tables[0].Rows.Count==0)
                            //如果是销售出库并且是雅琪诺则托盘条码分解并模拟扫码
                            if (HBillType == "1205" && dal.omodel_View.HBarCodeType == "托盘条码" && oSystemParameter.omodel.WMS_CampanyName == "雅琪诺")
                            {
                                sErrMsg = "没有找到托盘条码！";
                                return null;
                                //分解托条码得到明细条码信息写入出入库条码临时表
                                DataSet dsTBarCode;
                                string sBarCode_MX;
                                dsTBarCode = oCn.RunProcReturn("select b.HBarCode HBarCodeMX from Sc_PackUnionBillMain a  " +
                                " inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID " +
                                " Where a.HBarCode_Pack = '" + sBarCode + "'", "Sc_PackUnionBillMain");
                                if (dsTBarCode == null || dsTBarCode.Tables[0].Rows.Count == 0)
                                {
                                    sErrMsg = "没有找到托盘条码！";
                                    return null;
                                }
                                else
                                {
                                    for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
                                    {
                                        sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
                                        if (set_SavePonderationBillMain_Temp_BarCode(sBarCode_MX, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
                                        {
                                            oBar.HSourceBillType = sHSourceBillType;
                                            oBar.HSourceBillNo = sHSourceBillNo;
                                            oBar.HSupID = sHSupID;
                                            oBar.HSupName = sHSupName;
                                            oBar.HDeptID = sHDeptID;
                                            oBar.HDeptName = sHDeptName;
                                        }
                                        else
                                        {
                                            sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；扫描失败！" + sBarCode_MX + sErrMsg;
                                            //sErrMsg = "扫描失败！" + sErrMsg;
                                            return null;
                                        }
                                    }
                                    return oBar;
                                }
                            }
                            else
                            {
                                for(int i=0;i<dsTBarCode.Tables[0].Rows.Count;i++)
                                //将物料条码信息写入出入库条码临时表set_SavePonderationBillMain_Temp_BarCode
                                if (set_SavePonderationBillMain_Temp_BarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
                                {
                                    sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
                                    if (set_SavePonderationBillMain_Temp_BarCode(sBarCode_MX, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
                                    {
                                        oBar.HSourceBillType = sHSourceBillType;
                                        oBar.HSourceBillNo = sHSourceBillNo;
                                        oBar.HSupID = sHSupID;
                                        oBar.HSupName = sHSupName;
                                        oBar.HDeptID = sHDeptID;
                                        oBar.HDeptName = sHDeptName;
                                    }
                                    else
                                    {
                                        sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；扫描失败！" + sBarCode_MX  + sErrMsg;
                                        //sErrMsg = "扫描失败！" + sErrMsg;
                                        return null;
                                    }
                                    oBar.HSourceBillType = sHSourceBillType;
                                    oBar.HSourceBillNo = sHSourceBillNo;
                                    oBar.HSupID = sHSupID;
                                    oBar.HSupName = sHSupName;
                                    oBar.HDeptID = sHDeptID;
                                    oBar.HDeptName = sHDeptName;
                                }
                                else
                                {
                                    sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；扫描失败！" + sErrMsg;
                                    //sErrMsg = "扫描失败！" + sErrMsg;
                                    return null;
                                }
                                return oBar;
                            }
                        }
                        else
                        { 
                            //将物料条码信息写入出入库条码临时表set_SavePonderationBillMain_Temp_BarCode
                            if (set_SavePonderationBillMain_Temp_BarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
                            {
                                oBar.HSourceBillType = sHSourceBillType;
                                oBar.HSourceBillNo = sHSourceBillNo;
                                oBar.HSupID = sHSupID;
                                oBar.HSupName = sHSupName;
                                oBar.HDeptID = sHDeptID;
                                oBar.HDeptName = sHDeptName;
                            }
                            else
                            {
                                sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；扫描失败！" + sErrMsg;
                                //sErrMsg = "扫描失败！" + sErrMsg;
                                return null;
                            } 
                            return oBar;
                        else 
                        {
                            sErrMsg = "没有找到该条码！";
                            return null;
                        }
                    }
                    else

 DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs

@@ -108,24 +108,25 @@
                    sKFQty = DBUtility.ClsPub.isDoule(DS.Tables[0].Rows[0]["HKFQty"]);
                    HWHID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HWhID"]);
                    HSPID = DBUtility.ClsPub.isLong(DS.Tables[0].Rows[0]["HSPID"]);
                    //直接返回999
                    DSErp = oCn.RunProcReturn("exec h_p_IF_ICInventory_WMS_GetWHAndSP " + InterID.ToString() + ",'" + sBillType + "','" + sBarCode + "'," + HWHID.ToString() + "," + HSPID.ToString(), "h_p_IF_ICInventory_WMS_GetWHAndSP", ref DBUtility.ClsPub.sExeReturnInfo);
                    if (DSErp.Tables[0].Rows.Count == 0)
                    {
                        sRelQty = 0;
                        sRelQty = 0;//不会走
                        return false;
                    }
                    sKFQtyErp = DBUtility.ClsPub.isDoule(DSErp.Tables[0].Rows[0]["HKFQty"]);
                    if (sQty > sKFQty && sQty > sKFQtyErp)
                    sKFQtyErp = DBUtility.ClsPub.isDoule(DSErp.Tables[0].Rows[0]["HKFQty"]);//9999
                    if (sQty > sKFQty && sQty > sKFQtyErp) //当库存小于标签数量时 取库存数量
                    {
                        sRelQty = sKFQtyErp;
                        return false;
                    }
                    else if (sQty > sKFQty && sQty < sKFQtyErp)
                    else if (sQty > sKFQty && sQty < sKFQtyErp)  //当库存小于标签数量时 取库存数量
                    {
                        sRelQty = sKFQty;
                        return false;
                        return true;
                    }
                    else if (sQty < sKFQty && sQty > sKFQtyErp)
                    else if (sQty < sKFQty && sQty > sKFQtyErp)//无效
                    {
                        sRelQty = sKFQtyErp;
                        return false;