From 7ce5df49becfd770e719e5bc3d078389ea35d0f9 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 14 三月 2022 21:18:09 +0800
Subject: [PATCH] 修改了生产汇报单扫描条码方法

---
 WebAPI/Properties/Settings.settings                         |    2 
 WebAPI/Web References/WebS/WebService1.wsdl                 |  103 ++++++++++++
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user |  176 +++++++++++-----------
 WebAPI/Web References/WebS/Reference.cs                     |  164 ++++++++++++++++++++
 WebAPI/Web.config                                           |    6 
 WebAPI/WebAPI.csproj.user                                   |    2 
 WebAPI/Properties/Settings.Designer.cs                      |    4 
 WebAPI/WebAPI.csproj                                        |    4 
 WebAPI/Web References/WebS/Reference.map                    |    4 
 WebAPI/Controllers/POStockInBillController.cs               |    5 
 WebAPI/Web References/WebS/WebService1.disco                |    6 
 11 files changed, 370 insertions(+), 106 deletions(-)

diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 73cdd77..8391864 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -136,7 +136,7 @@
                 WebS.WebService1 oWebs = new WebS.WebService1();
                 WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
                 string sExpressNumber = "";
-                WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+                WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
                 if (WebSoBar == null)
                 {
                     objJsonResult.code = "0";
@@ -347,6 +347,7 @@
         {
             try
             {
+                LogService.Write("鎵ц鎴愬姛!");
                 // DataSet ds = new DataSet();
                 // WebServer webserver = new WebServer();
                 string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "'";
@@ -377,7 +378,7 @@
                 {
                     HDeptID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
                     HDeptName = Convert.ToString(ds.Tables[0].Rows[0]["HDeptName"]);
-                    if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, "钃濆瓧", ref DBUtility.ClsPub.sErrInfo))
+                    if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, "3711", HSourceBillNo, HSourceBillType, "钃濆瓧", ref DBUtility.ClsPub.sErrInfo))
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 1;
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 8247674..44f7a65 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
       <publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,40 +18,40 @@
       <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>03/09/2022 14:37:51</publishTime>
+      <publishTime>03/14/2022 15:28:25</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>03/09/2022 14:37:51</publishTime>
+      <publishTime>03/14/2022 15:28:25</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
-      <publishTime>12/18/2020 05:32:28</publishTime>
+      <publishTime>12/17/2020 21:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>03/09/2022 14:37:49</publishTime>
+      <publishTime>03/14/2022 15:28:24</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>03/09/2022 14:37:49</publishTime>
+      <publishTime>03/14/2022 15:28:24</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>03/09/2022 14:37:44</publishTime>
+      <publishTime>03/14/2022 15:28:22</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>03/09/2022 14:37:44</publishTime>
+      <publishTime>03/14/2022 15:28:22</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
-      <publishTime>05/09/2021 01:08:30</publishTime>
+      <publishTime>05/08/2021 17:08:30</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.pdb">
-      <publishTime>05/09/2021 01:08:30</publishTime>
+      <publishTime>05/08/2021 17:08:30</publishTime>
     </File>
     <File Include="bin/Interop.gregn6Lib.dll">
       <publishTime>08/25/2021 10:28:25</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/16/2021 17:23:13</publishTime>
+      <publishTime>12/23/2021 16:19:02</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>09/20/2018 19:23:20</publishTime>
@@ -69,58 +69,58 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>03/09/2022 14:37:45</publishTime>
+      <publishTime>03/14/2022 15:28:22</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>03/09/2022 14:37:45</publishTime>
+      <publishTime>03/14/2022 15:28:22</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>08/03/2014 20:33:56</publishTime>
     </File>
     <File Include="bin/NPOI.dll">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 01:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.dll">
-      <publishTime>10/23/2021 09:07:56</publishTime>
+      <publishTime>10/23/2021 01:07:56</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.pdb">
-      <publishTime>10/23/2021 17:07:56</publishTime>
+      <publishTime>10/23/2021 09:07:56</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.dll">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 01:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
-    </File>
-    <File Include="bin/NPOI.OpenXmlFormats.dll">
       <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
+    <File Include="bin/NPOI.OpenXmlFormats.dll">
+      <publishTime>10/23/2021 01:07:54</publishTime>
+    </File>
     <File Include="bin/NPOI.OpenXmlFormats.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.pdb">
-      <publishTime>10/23/2021 17:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>03/09/2022 14:37:42</publishTime>
+      <publishTime>03/14/2022 15:28:20</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>03/09/2022 14:37:42</publishTime>
+      <publishTime>03/14/2022 15:28:20</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>03/09/2022 14:37:43</publishTime>
+      <publishTime>03/14/2022 15:28:21</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>03/09/2022 14:37:43</publishTime>
+      <publishTime>03/14/2022 15:28:21</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>03/09/2022 14:37:43</publishTime>
+      <publishTime>03/14/2022 15:28:21</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>03/09/2022 14:37:43</publishTime>
+      <publishTime>03/14/2022 15:28:21</publishTime>
     </File>
     <File Include="bin/stdole.dll">
       <publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,7 +189,7 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 04:02:18</publishTime>
@@ -222,181 +222,181 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>03/09/2022 14:37:55</publishTime>
+      <publishTime>03/14/2022 15:28:29</publishTime>
     </File>
     <File Include="bin/WebAPI.dll.config">
       <publishTime>12/15/2021 17:59:43</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>03/09/2022 14:37:55</publishTime>
+      <publishTime>03/14/2022 15:28:29</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/17/2013 17:03:52</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
-      <publishTime>11/29/2018 21:26:02</publishTime>
+      <publishTime>11/29/2018 13:26:02</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
-      <publishTime>11/29/2018 21:26:30</publishTime>
+      <publishTime>11/29/2018 13:26:30</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:04</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:04</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:04</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>10/29/2021 19:50:53</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>12/23/2021 16:19:08</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>01/12/2022 09:30:51</publishTime>
+      <publishTime>01/14/2022 09:12:59</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>12/23/2021 16:19:07</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
-      <publishTime>01/14/2022 19:33:07</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>03/11/2022 10:06:33</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.cs">
       <publishTime>12/20/2021 13:19:56</publishTime>
@@ -411,7 +411,7 @@
       <publishTime>12/20/2021 13:19:56</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>03/09/2022 14:50:48</publishTime>
+      <publishTime>03/14/2022 15:28:35</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/Settings.Designer.cs b/WebAPI/Properties/Settings.Designer.cs
index 4f8006d..c8fd941 100644
--- a/WebAPI/Properties/Settings.Designer.cs
+++ b/WebAPI/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -26,7 +26,7 @@
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WEBS-WMS/WebService1.asmx")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost:8098/WebService1.asmx")]
         public string WebAPI_WebS_WebService1 {
             get {
                 return ((string)(this["WebAPI_WebS_WebService1"]));
diff --git a/WebAPI/Properties/Settings.settings b/WebAPI/Properties/Settings.settings
index e0334fe..d37166d 100644
--- a/WebAPI/Properties/Settings.settings
+++ b/WebAPI/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">http://localhost/WEBS-WMS/WebService1.asmx</Value>
+      <Value Profile="(Default)">http://localhost:8098/WebService1.asmx</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 8c9a66f..00cf2b2 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -55,9 +55,13 @@
         
         private System.Threading.SendOrPostCallback get_CheckTypeByPackBarCode_PackOperationCompleted;
         
+        private System.Threading.SendOrPostCallback get_CheckTypeByBarCode_PackUnionOperationCompleted;
+        
         private System.Threading.SendOrPostCallback get_CheckTypeByBarCode_PackSplitOperationCompleted;
         
         private System.Threading.SendOrPostCallback GetBillEntry_TmpList_PackOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback set_SavePackUnionBill_NewOperationCompleted;
         
         private System.Threading.SendOrPostCallback set_SavePackSplitBill_NewOperationCompleted;
         
@@ -1034,10 +1038,16 @@
         public event get_CheckTypeByPackBarCode_PackCompletedEventHandler get_CheckTypeByPackBarCode_PackCompleted;
         
         /// <remarks/>
+        public event get_CheckTypeByBarCode_PackUnionCompletedEventHandler get_CheckTypeByBarCode_PackUnionCompleted;
+        
+        /// <remarks/>
         public event get_CheckTypeByBarCode_PackSplitCompletedEventHandler get_CheckTypeByBarCode_PackSplitCompleted;
         
         /// <remarks/>
         public event GetBillEntry_TmpList_PackCompletedEventHandler GetBillEntry_TmpList_PackCompleted;
+        
+        /// <remarks/>
+        public event set_SavePackUnionBill_NewCompletedEventHandler set_SavePackUnionBill_NewCompleted;
         
         /// <remarks/>
         public event set_SavePackSplitBill_NewCompletedEventHandler set_SavePackSplitBill_NewCompleted;
@@ -2780,6 +2790,50 @@
         }
         
         /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_CheckTypeByBarCode_PackUnion", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool get_CheckTypeByBarCode_PackUnion(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, ref string sErrMsg) {
+            object[] results = this.Invoke("get_CheckTypeByBarCode_PackUnion", new object[] {
+                        HBarCode,
+                        HInterID,
+                        HBillType,
+                        HBillNo,
+                        HBarCode_Pack,
+                        HMaker,
+                        HOWNERID,
+                        sErrMsg});
+            sErrMsg = ((string)(results[1]));
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void get_CheckTypeByBarCode_PackUnionAsync(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg) {
+            this.get_CheckTypeByBarCode_PackUnionAsync(HBarCode, HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HOWNERID, sErrMsg, null);
+        }
+        
+        /// <remarks/>
+        public void get_CheckTypeByBarCode_PackUnionAsync(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg, object userState) {
+            if ((this.get_CheckTypeByBarCode_PackUnionOperationCompleted == null)) {
+                this.get_CheckTypeByBarCode_PackUnionOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_CheckTypeByBarCode_PackUnionOperationCompleted);
+            }
+            this.InvokeAsync("get_CheckTypeByBarCode_PackUnion", new object[] {
+                        HBarCode,
+                        HInterID,
+                        HBillType,
+                        HBillNo,
+                        HBarCode_Pack,
+                        HMaker,
+                        HOWNERID,
+                        sErrMsg}, this.get_CheckTypeByBarCode_PackUnionOperationCompleted, userState);
+        }
+        
+        private void Onget_CheckTypeByBarCode_PackUnionOperationCompleted(object arg) {
+            if ((this.get_CheckTypeByBarCode_PackUnionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.get_CheckTypeByBarCode_PackUnionCompleted(this, new get_CheckTypeByBarCode_PackUnionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_CheckTypeByBarCode_PackSplit", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public bool get_CheckTypeByBarCode_PackSplit(string HBarCode, long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, ref string sErrMsg) {
             object[] results = this.Invoke("get_CheckTypeByBarCode_PackSplit", new object[] {
@@ -2856,6 +2910,48 @@
             if ((this.GetBillEntry_TmpList_PackCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetBillEntry_TmpList_PackCompleted(this, new GetBillEntry_TmpList_PackCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SavePackUnionBill_New", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool set_SavePackUnionBill_New(long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, ref string sErrMsg) {
+            object[] results = this.Invoke("set_SavePackUnionBill_New", new object[] {
+                        HInterID,
+                        HBillType,
+                        HBillNo,
+                        HBarCode_Pack,
+                        HMaker,
+                        HOWNERID,
+                        sErrMsg});
+            sErrMsg = ((string)(results[1]));
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void set_SavePackUnionBill_NewAsync(long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg) {
+            this.set_SavePackUnionBill_NewAsync(HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HOWNERID, sErrMsg, null);
+        }
+        
+        /// <remarks/>
+        public void set_SavePackUnionBill_NewAsync(long HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, long HOWNERID, string sErrMsg, object userState) {
+            if ((this.set_SavePackUnionBill_NewOperationCompleted == null)) {
+                this.set_SavePackUnionBill_NewOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SavePackUnionBill_NewOperationCompleted);
+            }
+            this.InvokeAsync("set_SavePackUnionBill_New", new object[] {
+                        HInterID,
+                        HBillType,
+                        HBillNo,
+                        HBarCode_Pack,
+                        HMaker,
+                        HOWNERID,
+                        sErrMsg}, this.set_SavePackUnionBill_NewOperationCompleted, userState);
+        }
+        
+        private void Onset_SavePackUnionBill_NewOperationCompleted(object arg) {
+            if ((this.set_SavePackUnionBill_NewCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.set_SavePackUnionBill_NewCompleted(this, new set_SavePackUnionBill_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
         
@@ -40670,6 +40766,40 @@
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void get_CheckTypeByBarCode_PackUnionCompletedEventHandler(object sender, get_CheckTypeByBarCode_PackUnionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class get_CheckTypeByBarCode_PackUnionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal get_CheckTypeByBarCode_PackUnionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+        
+        /// <remarks/>
+        public string sErrMsg {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[1]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     public delegate void get_CheckTypeByBarCode_PackSplitCompletedEventHandler(object sender, get_CheckTypeByBarCode_PackSplitCompletedEventArgs e);
     
     /// <remarks/>
@@ -40738,6 +40868,40 @@
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void set_SavePackUnionBill_NewCompletedEventHandler(object sender, set_SavePackUnionBill_NewCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class set_SavePackUnionBill_NewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal set_SavePackUnionBill_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+        
+        /// <remarks/>
+        public string sErrMsg {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[1]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     public delegate void set_SavePackSplitBill_NewCompletedEventHandler(object sender, set_SavePackSplitBill_NewCompletedEventArgs e);
     
     /// <remarks/>
diff --git a/WebAPI/Web References/WebS/Reference.map b/WebAPI/Web References/WebS/Reference.map
index d3cb9d0..952b627 100644
--- a/WebAPI/Web References/WebS/Reference.map
+++ b/WebAPI/Web References/WebS/Reference.map
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:8098/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:8098/WebService1.asmx?disco" filename="WebService1.disco" />
   </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.disco b/WebAPI/Web References/WebS/WebService1.disco
index 22b350a..9475a15 100644
--- a/WebAPI/Web References/WebS/WebService1.disco
+++ b/WebAPI/Web References/WebS/WebService1.disco
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://localhost/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://localhost/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://localhost/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://localhost:8098/WebService1.asmx?wsdl" docRef="http://localhost:8098/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://localhost:8098/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://localhost:8098/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index adcf90c..791bed6 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -315,6 +315,28 @@
           <s:element minOccurs="0" maxOccurs="1" name="HStockOutOrgName" type="s:string" />
         </s:sequence>
       </s:complexType>
+      <s:element name="get_CheckTypeByBarCode_PackUnion">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="HBarCode" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+            <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="HBarCode_Pack" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="get_CheckTypeByBarCode_PackUnionResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="get_CheckTypeByBarCode_PackUnionResult" type="s:boolean" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
       <s:element name="get_CheckTypeByBarCode_PackSplit">
         <s:complexType>
           <s:sequence>
@@ -358,6 +380,27 @@
                 </s:sequence>
               </s:complexType>
             </s:element>
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="set_SavePackUnionBill_New">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
+            <s:element minOccurs="0" maxOccurs="1" name="HBillType" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="HBillNo" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="HBarCode_Pack" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+            <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="set_SavePackUnionBill_NewResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="set_SavePackUnionBill_NewResult" type="s:boolean" />
             <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
           </s:sequence>
         </s:complexType>
@@ -11448,6 +11491,12 @@
   <wsdl:message name="get_CheckTypeByPackBarCode_PackSoapOut">
     <wsdl:part name="parameters" element="tns:get_CheckTypeByPackBarCode_PackResponse" />
   </wsdl:message>
+  <wsdl:message name="get_CheckTypeByBarCode_PackUnionSoapIn">
+    <wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode_PackUnion" />
+  </wsdl:message>
+  <wsdl:message name="get_CheckTypeByBarCode_PackUnionSoapOut">
+    <wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode_PackUnionResponse" />
+  </wsdl:message>
   <wsdl:message name="get_CheckTypeByBarCode_PackSplitSoapIn">
     <wsdl:part name="parameters" element="tns:get_CheckTypeByBarCode_PackSplit" />
   </wsdl:message>
@@ -11459,6 +11508,12 @@
   </wsdl:message>
   <wsdl:message name="GetBillEntry_TmpList_PackSoapOut">
     <wsdl:part name="parameters" element="tns:GetBillEntry_TmpList_PackResponse" />
+  </wsdl:message>
+  <wsdl:message name="set_SavePackUnionBill_NewSoapIn">
+    <wsdl:part name="parameters" element="tns:set_SavePackUnionBill_New" />
+  </wsdl:message>
+  <wsdl:message name="set_SavePackUnionBill_NewSoapOut">
+    <wsdl:part name="parameters" element="tns:set_SavePackUnionBill_NewResponse" />
   </wsdl:message>
   <wsdl:message name="set_SavePackSplitBill_NewSoapIn">
     <wsdl:part name="parameters" element="tns:set_SavePackSplitBill_New" />
@@ -14219,6 +14274,10 @@
       <wsdl:input message="tns:get_CheckTypeByPackBarCode_PackSoapIn" />
       <wsdl:output message="tns:get_CheckTypeByPackBarCode_PackSoapOut" />
     </wsdl:operation>
+    <wsdl:operation name="get_CheckTypeByBarCode_PackUnion">
+      <wsdl:input message="tns:get_CheckTypeByBarCode_PackUnionSoapIn" />
+      <wsdl:output message="tns:get_CheckTypeByBarCode_PackUnionSoapOut" />
+    </wsdl:operation>
     <wsdl:operation name="get_CheckTypeByBarCode_PackSplit">
       <wsdl:input message="tns:get_CheckTypeByBarCode_PackSplitSoapIn" />
       <wsdl:output message="tns:get_CheckTypeByBarCode_PackSplitSoapOut" />
@@ -14226,6 +14285,10 @@
     <wsdl:operation name="GetBillEntry_TmpList_Pack">
       <wsdl:input message="tns:GetBillEntry_TmpList_PackSoapIn" />
       <wsdl:output message="tns:GetBillEntry_TmpList_PackSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="set_SavePackUnionBill_New">
+      <wsdl:input message="tns:set_SavePackUnionBill_NewSoapIn" />
+      <wsdl:output message="tns:set_SavePackUnionBill_NewSoapOut" />
     </wsdl:operation>
     <wsdl:operation name="set_SavePackSplitBill_New">
       <wsdl:input message="tns:set_SavePackSplitBill_NewSoapIn" />
@@ -16132,6 +16195,15 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="get_CheckTypeByBarCode_PackUnion">
+      <soap:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackUnion" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="get_CheckTypeByBarCode_PackSplit">
       <soap:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackSplit" style="document" />
       <wsdl:input>
@@ -16143,6 +16215,15 @@
     </wsdl:operation>
     <wsdl:operation name="GetBillEntry_TmpList_Pack">
       <soap:operation soapAction="http://tempuri.org/GetBillEntry_TmpList_Pack" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="set_SavePackUnionBill_New">
+      <soap:operation soapAction="http://tempuri.org/set_SavePackUnionBill_New" style="document" />
       <wsdl:input>
         <soap:body use="literal" />
       </wsdl:input>
@@ -20320,6 +20401,15 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="get_CheckTypeByBarCode_PackUnion">
+      <soap12:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackUnion" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="get_CheckTypeByBarCode_PackSplit">
       <soap12:operation soapAction="http://tempuri.org/get_CheckTypeByBarCode_PackSplit" style="document" />
       <wsdl:input>
@@ -20331,6 +20421,15 @@
     </wsdl:operation>
     <wsdl:operation name="GetBillEntry_TmpList_Pack">
       <soap12:operation soapAction="http://tempuri.org/GetBillEntry_TmpList_Pack" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="set_SavePackUnionBill_New">
+      <soap12:operation soapAction="http://tempuri.org/set_SavePackUnionBill_New" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -24418,10 +24517,10 @@
   </wsdl:binding>
   <wsdl:service name="WebService1">
     <wsdl:port name="WebService1Soap" binding="tns:WebService1Soap">
-      <soap:address location="http://localhost/WEBS-WMS/WebService1.asmx" />
+      <soap:address location="http://localhost:8098/WebService1.asmx" />
     </wsdl:port>
     <wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12">
-      <soap12:address location="http://localhost/WEBS-WMS/WebService1.asmx" />
+      <soap12:address location="http://localhost:8098/WebService1.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 254f457..06a4d3d 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -21,8 +21,8 @@
 	<add key="FileIP" value="http://localhost:8080/" />
 	  <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
 	  <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
-	  <add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> <!--澶忓疂-->
-	 
+	  <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
+	  <add key="sUrl" value="http://47.96.97.237:8018/Web_WJ/WebService1.asmx" /> 
 	  <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    鍗氭棩绉戞妧-->
     <add key="webpages:Version" value="3.0.0.0" />
     <add key="webpages:Enabled" value="false" />
@@ -86,7 +86,7 @@
   <applicationSettings>
     <WebAPI.Properties.Settings>
       <setting name="WebAPI_WebS_WebService1" serializeAs="String">
-        <value>http://localhost/WEBS-WMS/WebService1.asmx</value>
+        <value>http://localhost:8098/WebService1.asmx</value>
       </setting>
     </WebAPI.Properties.Settings>
   </applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b007a0f..7dc6921 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -811,10 +811,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://localhost/WEBS-WMS/WebService1.asmx">
+    <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\WebS\</RelPath>
-      <UpdateFromURL>http://localhost/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+      <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index a3179f3..16d95e2 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />

--
Gitblit v1.9.1