From 8f5d9ffbd3b2dd316edd358984f367186b814a42 Mon Sep 17 00:00:00 2001
From: jl <jialigo@163.com>
Date: Mon, 9 Dec 2024 13:16:59 +0800
Subject: [PATCH]

---
 Epost.BLL/Work_JobDownThread.cs               |  4 +--
 Epost.BLL/Work_ScanThread.cs                  |  6 ++--
 Epost.DAL/Cache/JobModelCacheDAL.cs           | 12 ++++----
 Epost.TestToolsWeb/Epost.DPS.csproj.user      |  2 +-
 .../PublishProfiles/Toolsweb.pubxml.user      | 28 +++++++++----------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Epost.BLL/Work_JobDownThread.cs b/Epost.BLL/Work_JobDownThread.cs
index 7bdfa7b..d9f611a 100644
--- a/Epost.BLL/Work_JobDownThread.cs
+++ b/Epost.BLL/Work_JobDownThread.cs
@@ -506,7 +506,7 @@ namespace Epost.BLL
                         else
                         {
                             ShowMessageModel_M show = new ShowMessageModel_M();
-                            show.Title = "SKU" + scanStr + "无任务！";
+                            show.Title = "SKU" + scanStr + "未完纳！";
                             show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
                             show.Block = item.block;
                             show.Islock = true;
@@ -698,7 +698,7 @@ namespace Epost.BLL
 
                                 //提示无任务
                                 ShowMessageModel_M show = new ShowMessageModel_M();
-                                show.Title = "商品：" + scanStr + "当前区无任务！";
+                                show.Title = "商品：" + scanStr + "无任务！";
                                 show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
                                 show.Block = data.Block;
                                 show.Area = data.Area;
diff --git a/Epost.BLL/Work_ScanThread.cs b/Epost.BLL/Work_ScanThread.cs
index 7a05d99..99ef719 100644
--- a/Epost.BLL/Work_ScanThread.cs
+++ b/Epost.BLL/Work_ScanThread.cs
@@ -286,7 +286,7 @@ namespace Epost.BLL
                 else
                 {
                     ShowMessageModel_M show = new ShowMessageModel_M();
-                    show.Title = "SKU" + scanStr + "无任务！";
+                    show.Title = "SKU" + scanStr + "未完纳！";
                     show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
                     show.Block = data.Block;
                     show.Islock = true;
@@ -377,7 +377,7 @@ namespace Epost.BLL
                         // data.Parameter = scanStr;
                          Hangup_SKU(scanStr, data.Block, data.Area);
                         //删除sku对应缓存
-                        List<ResultMessageModel> sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr && p.Parameter == qdt.Rows[0]["sku"].ToString()&&p.Block == data.Block);
+                        List<ResultMessageModel> sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr && p.Parameter == qdt.Rows[0]["sku"].ToString()&&p.Block == data.Block&&p.Area ==data.Area);
                         downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute);
                     }
                     downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute);
@@ -479,7 +479,7 @@ namespace Epost.BLL
 
                                 //提示无任务
                                 ShowMessageModel_M show = new ShowMessageModel_M();
-                                show.Title = "商品：" + scanStr + "当前区无任务！";
+                                show.Title = "商品：" + scanStr + "无任务！";
                                 show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
                                 show.Block = data.Block;
                                 show.Area = data.Area;
diff --git a/Epost.DAL/Cache/JobModelCacheDAL.cs b/Epost.DAL/Cache/JobModelCacheDAL.cs
index 570071e..e29a735 100644
--- a/Epost.DAL/Cache/JobModelCacheDAL.cs
+++ b/Epost.DAL/Cache/JobModelCacheDAL.cs
@@ -131,12 +131,12 @@ namespace Epost.DAL.Cache
                     //{
                     //    PlanJobList.Remove(planitem);
                     //}
-                    List<JobModel> list = PlanJobList.FindAll(p => p.Block == JobParam.FirstOrDefault().Block);
-                    foreach (JobModel item in list)
-                    {
-                        PlanJobList.Remove(item);
-                    }
-
+                    //List<JobModel> list = PlanJobList.FindAll(p => p.Block == JobParam.FirstOrDefault().Block);
+                    //foreach (JobModel item in list)
+                    //{
+                    //    PlanJobList.Remove(item);
+                    //}
+                    JobParam.ForEach(m => PlanJobList.Remove(m));//删除计划任务
 
                 }
 
diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user
index 4d10158..2eaafac 100644
--- a/Epost.TestToolsWeb/Epost.DPS.csproj.user
+++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user
@@ -11,7 +11,7 @@
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <NameOfLastUsedPublishProfile>E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
index ae868cf..e877ec5 100644
--- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
+++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
@@ -33,19 +33,19 @@
       <publishTime>04/04/2018 15:45:12</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>12/06/2024 13:31:01</publishTime>
+      <publishTime>12/06/2024 17:02:43</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>12/06/2024 13:31:01</publishTime>
+      <publishTime>12/06/2024 17:02:43</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>02/24/2020 15:29:24</publishTime>
     </File>
     <File Include="bin/Common.dll">
-      <publishTime>12/06/2024 13:29:51</publishTime>
+      <publishTime>12/06/2024 14:38:44</publishTime>
     </File>
     <File Include="bin/Common.pdb">
-      <publishTime>12/06/2024 13:29:51</publishTime>
+      <publishTime>12/06/2024 14:38:44</publishTime>
     </File>
     <File Include="bin/ComposerSDK.dll">
       <publishTime>04/29/2020 16:50:14</publishTime>
@@ -63,31 +63,31 @@
       <publishTime>10/23/2017 13:15:20</publishTime>
     </File>
     <File Include="bin/Epost.BLL.dll">
-      <publishTime>12/06/2024 13:30:43</publishTime>
+      <publishTime>12/06/2024 17:02:33</publishTime>
     </File>
     <File Include="bin/Epost.BLL.pdb">
-      <publishTime>12/06/2024 13:30:43</publishTime>
+      <publishTime>12/06/2024 17:02:33</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>12/06/2024 13:30:43</publishTime>
+      <publishTime>12/06/2024 15:54:14</publishTime>
     </File>
     <File Include="bin/Epost.DAL.pdb">
-      <publishTime>12/06/2024 13:30:43</publishTime>
+      <publishTime>12/06/2024 15:54:14</publishTime>
     </File>
     <File Include="bin/Epost.DPS.dll">
-      <publishTime>12/06/2024 13:30:46</publishTime>
+      <publishTime>12/06/2024 17:02:35</publishTime>
     </File>
     <File Include="bin/Epost.DPS.pdb">
-      <publishTime>12/06/2024 13:30:46</publishTime>
+      <publishTime>12/06/2024 17:02:35</publishTime>
     </File>
     <File Include="bin/Epost.Model.dll">
-      <publishTime>12/06/2024 13:29:51</publishTime>
+      <publishTime>12/06/2024 14:38:44</publishTime>
     </File>
     <File Include="bin/Epost.Model.pdb">
-      <publishTime>12/06/2024 13:29:51</publishTime>
+      <publishTime>12/06/2024 14:38:44</publishTime>
     </File>
     <File Include="bin/Epost.TestToolsWeb.dll">
       <publishTime>09/06/2018 11:57:11</publishTime>
@@ -5652,7 +5652,7 @@
       <publishTime>05/30/2022 16:58:47</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>12/06/2024 13:30:47</publishTime>
+      <publishTime>12/06/2024 17:02:37</publishTime>
     </File>
     <File Include="Scripts/ai.0.22.9-build00167.js">
       <publishTime>04/04/2018 15:45:12</publishTime>
@@ -7572,7 +7572,7 @@
       <publishTime>07/04/2022 14:22:38</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>12/06/2024 13:30:46</publishTime>
+      <publishTime>12/06/2024 14:42:01</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file