From 7eff397fb5531782adb1c18f51fb2d738fb61157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=85=E5=87=AF=20=E8=B4=BE?= <807404298@qq.com>
Date: Thu, 31 Aug 2023 13:26:37 +0800
Subject: [PATCH]

---
 Epost.BLL/CommandBLL.cs                       |  4 +--
 Epost.BLL/OrderControlBLL.cs                  |  4 +--
 .../PublishProfiles/Toolsweb.pubxml.user      | 26 +++++++++----------
 Epost.TestToolsWeb/Web.config                 |  2 +-
 .../WebService/WebService.asmx.cs             |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs
index 18d3140..a91f391 100644
--- a/Epost.BLL/CommandBLL.cs
+++ b/Epost.BLL/CommandBLL.cs
@@ -565,14 +565,14 @@ namespace Epost.BLL
                     model.Address = item.Address;
                     model.Command = "REMOVE_JOB";
                     model.Uid = item.ID;
-                    model.Type = "N";
+                    model.Type = "C";
                     list.Add(model);
                     LabelParamModel Unlockmodel = new LabelParamModel();
                     Unlockmodel.ControlIP = item.ControlIP;
                     Unlockmodel.Address = item.Address;
                     Unlockmodel.Command = "UNLOCK";
 
-                    Unlockmodel.Type = "N";
+                    Unlockmodel.Type = "C";
                     Unlockmodel.Parameter = "11111000";
                     list.Add(Unlockmodel);
 
diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs
index 0f7ce7d..79dc3c3 100644
--- a/Epost.BLL/OrderControlBLL.cs
+++ b/Epost.BLL/OrderControlBLL.cs
@@ -214,7 +214,7 @@ namespace Epost.BLL
             {
                 List<JobModel> jobList = JobCache.GetPlanJobList().FindAll(x => x.OrderID == orderid);
                 ResultModel resultModel = comBLL.Forcedend(orderid);
-                
+                comBLL.ClearArea_M(jobList);
 
                 JobCache.UpdateJobModelList(jobList, EcommendType.Execute);
                 return resultModel;
@@ -628,7 +628,7 @@ namespace Epost.BLL
 
 
                             lamodel.Title = item.genericname;
-                            lamodel.Content = "" + item.Sku.Substring(item.Sku.Length - 4, 4) + "\t" + item.Spec + "\r" + item.GoodsName + "\r批号" + item.batchno + "\t" + item.manufactname.Substring(0, 4) + "";
+                            lamodel.Content = "" + item.Sku.Substring(item.Sku.Length - 4, 4) + " " + item.Spec + "\r" + item.GoodsName + "\r批号" + item.batchno + " " + item.manufactname.Substring(0, 4) + "";
                             var aryloc = item.Tolocation.Split('-');
                             lamodel.Loc = "" + aryloc[0].ToString() + "-" + aryloc[1].ToString() + "";
                             lamodel.W_quantity = aryloc[2].ToString();
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index 16d83af..90f10e8 100644
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@@ -7,7 +7,7 @@
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <_PublishTargetUrl>D:\驿传\抚远</_PublishTargetUrl>
-    <History>True|2023-08-29T06:40:55.7436382Z;True|2023-08-29T13:53:07.9540335+08:00;True|2023-08-28T18:11:01.9231397+08:00;True|2023-08-28T14:56:19.8843265+08:00;True|2023-08-23T11:17:33.7204155+08:00;True|2023-08-11T10:59:03.8399200+08:00;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
+    <History>True|2023-08-31T04:12:45.4579572Z;False|2023-08-31T12:03:58.6171819+08:00;False|2023-08-31T12:03:32.2416438+08:00;True|2023-08-29T14:40:55.7436382+08:00;True|2023-08-29T13:53:07.9540335+08:00;True|2023-08-28T18:11:01.9231397+08:00;True|2023-08-28T14:56:19.8843265+08:00;True|2023-08-23T11:17:33.7204155+08:00;True|2023-08-11T10:59:03.8399200+08:00;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -33,19 +33,19 @@
       <publishTime>04/16/2023 15:06:26</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>08/30/2023 15:26:38</publishTime>
+      <publishTime>08/31/2023 12:19:14</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>08/30/2023 15:26:38</publishTime>
+      <publishTime>08/31/2023 12:19:14</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>02/24/2020 15:29:24</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>08/29/2023 13:52:05</publishTime>
+      <publishTime>08/31/2023 12:02:42</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>08/29/2023 13:52:05</publishTime>
+      <publishTime>08/31/2023 12:02:42</publishTime>
     </File>
     <File Include="bin/ComposerSDK.dll">
       <publishTime>04/16/2023 15:06:26</publishTime>
@@ -63,25 +63,25 @@
       <publishTime>10/23/2017 13:15:20</publishTime>
     </File>
     <File Include="bin/Epost.BLL.dll">
-      <publishTime>08/30/2023 15:23:28</publishTime>
+      <publishTime>08/31/2023 12:18:20</publishTime>
     </File>
     <File Include="bin/Epost.BLL.pdb">
-      <publishTime>08/30/2023 15:23:28</publishTime>
+      <publishTime>08/31/2023 12:18:20</publishTime>
     </File>
     <File Include="bin/Epost.BLL.XmlSerializers.dll">
       <publishTime>08/26/2020 18:09:48</publishTime>
     </File>
     <File Include="bin/Epost.DAL.dll">
-      <publishTime>08/29/2023 16:29:38</publishTime>
+      <publishTime>08/31/2023 12:02:43</publishTime>
     </File>
     <File Include="bin/Epost.DAL.pdb">
-      <publishTime>08/29/2023 16:29:38</publishTime>
+      <publishTime>08/31/2023 12:02:43</publishTime>
     </File>
     <File Include="bin/Epost.DPS.dll">
-      <publishTime>08/30/2023 15:26:31</publishTime>
+      <publishTime>08/31/2023 12:19:02</publishTime>
     </File>
     <File Include="bin/Epost.DPS.pdb">
-      <publishTime>08/30/2023 15:26:30</publishTime>
+      <publishTime>08/31/2023 12:19:02</publishTime>
     </File>
     <File Include="bin/Epost.Model.dll">
       <publishTime>07/19/2023 15:37:56</publishTime>
@@ -5652,7 +5652,7 @@
       <publishTime>04/16/2023 15:06:27</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>08/30/2023 15:26:32</publishTime>
+      <publishTime>08/31/2023 12:19:04</publishTime>
     </File>
     <File Include="Scripts/ai.0.22.9-build00167.js">
       <publishTime>04/04/2018 15:45:12</publishTime>
@@ -7572,7 +7572,7 @@
       <publishTime>04/16/2023 15:06:27</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/30/2023 15:26:31</publishTime>
+      <publishTime>08/31/2023 12:02:52</publishTime>
     </File>
     <File Include="WebService/WebService.asmx">
       <publishTime>07/19/2023 15:30:16</publishTime>
diff --git a/Epost.TestToolsWeb/Web.config b/Epost.TestToolsWeb/Web.config
index e40e2ff..aa6f607 100644
--- a/Epost.TestToolsWeb/Web.config
+++ b/Epost.TestToolsWeb/Web.config
@@ -25,7 +25,7 @@
     <add key="ControlXML" value="/App_Data/EpostController.xml" />
     <add key="LabelXML" value="/App_Data/AddressStorage.xml" />
     <add key="ResultsXML" value="/App_Data/Results.xml" />
-    <add key="WebAPIUrl" value="http://192.168.0.111:8081/api/WebAPI/ProcessingResult"/>
+    <add key="WebAPIUrl" value="http://localhost:63118/api/WebAPI/ProcessingResult"/>
     <add key="ShowMode" value="1" />
     <add key="SetupMode" value="\Epost_P\Epost.TestToolsWeb\App_Data\SetupMode.txt" />
     <add key="CARID" value="HT01" />
diff --git a/Epost.TestToolsWeb/WebService/WebService.asmx.cs b/Epost.TestToolsWeb/WebService/WebService.asmx.cs
index 56d70d3..8ff118a 100644
--- a/Epost.TestToolsWeb/WebService/WebService.asmx.cs
+++ b/Epost.TestToolsWeb/WebService/WebService.asmx.cs
@@ -54,7 +54,7 @@ namespace Epost.DPS.WebService
                         bool flag = true;
                         string mms = string.Empty;
                         LogHelper.WriteLogInfo("======开始处理数据======");
-                        DataSet set = XmlHelper.GetDataSetStrXml(messages.Replace("&", "").Replace("#", "").Replace("△", "").Replace("☆", "").Replace("=", "").Replace("】", "").Replace("【", "").Replace(" ","").Replace("\"", ""));
+                        DataSet set = XmlHelper.GetDataSetStrXml(messages.Replace("&", "").Replace("#", "").Replace("△", "").Replace("☆", "").Replace("=", "").Replace("】", "").Replace("【", "").Replace(" ", "").Replace("\"", "").Replace("：", ":").Replace("（", "(").Replace("）", ")"));
                         if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0)
                         {
                             var ReturnDt = set.Tables["pick"];