diff --git a/Epost.BLL/OrderBLL.cs b/Epost.BLL/OrderBLL.cs index 815ba5f..8b37642 100644 --- a/Epost.BLL/OrderBLL.cs +++ b/Epost.BLL/OrderBLL.cs @@ -917,9 +917,9 @@ namespace Epost.BLL return dal.GetSumList_Echo(matchid, sku, block, area); } //查询sku对应的所有任务 - public DataTable getOrderListBysku(string block, string sku) + public DataTable getOrderListBysku(string block, string sku,string area) { - return dal.getOrderListBysku(block, sku); + return dal.getOrderListBysku(block, sku,area); } public bool UpOrderStateBybat(string id) diff --git a/Epost.BLL/OrdersQueueBLL.cs b/Epost.BLL/OrdersQueueBLL.cs index 262f7d8..72c13a5 100644 --- a/Epost.BLL/OrdersQueueBLL.cs +++ b/Epost.BLL/OrdersQueueBLL.cs @@ -204,9 +204,9 @@ namespace Epost.BLL #endregion #region 删除que - public bool DelQueueOrder(string sku,string block) + public bool DelQueueOrder(string sku,string block,string area) { - return dal.DelQueueOrder(sku,block); + return dal.DelQueueOrder(sku,block,area); } #endregion diff --git a/Epost.BLL/Work_JobDownThread.cs b/Epost.BLL/Work_JobDownThread.cs index f09bab0..7bdfa7b 100644 --- a/Epost.BLL/Work_JobDownThread.cs +++ b/Epost.BLL/Work_JobDownThread.cs @@ -971,7 +971,7 @@ namespace Epost.BLL { List list = new List(); //查询当前通道sku是否有任务 - DataTable dt = orderbll.getOrderListBysku(block, sku); + DataTable dt = orderbll.getOrderListBysku(block, sku, area); if (dt != null && dt.Rows.Count > 0) { // 将当前通道所有sku正在亮的设备熄灭 @@ -1005,7 +1005,7 @@ namespace Epost.BLL model = relist.FirstOrDefault(); JobCache.UpdateJobModelList(relist, EcommendType.Complete); //删除Orderqueue中sku的记录 - bool bo = queueBLL.DelQueueOrder(sku, block); + bool bo = queueBLL.DelQueueOrder(sku, block, area); LogHelper.WriteLogInfo("删除queue返回" + bo); } else diff --git a/Epost.BLL/Work_ScanThread.cs b/Epost.BLL/Work_ScanThread.cs index 1f12ab3..7a05d99 100644 --- a/Epost.BLL/Work_ScanThread.cs +++ b/Epost.BLL/Work_ScanThread.cs @@ -509,7 +509,7 @@ namespace Epost.BLL { List list = new List(); //查询当前通道sku是否有任务 - DataTable dt = orderbll.getOrderListBysku(block, sku); + DataTable dt = orderbll.getOrderListBysku(block, sku,area); if (dt != null && dt.Rows.Count > 0) { // 将当前通道所有sku正在亮的设备熄灭 @@ -539,14 +539,14 @@ namespace Epost.BLL //删除缓存中sku记录 List jobList = JobCache.GetPlanJobList(); - List relist = jobList.FindAll(m => m.Sku == sku && m.Block == block); + List relist = jobList.FindAll(m => m.Sku == sku && m.Block == block&&m.Area==area); JobModel model = new JobModel(); if (relist.Any()) { model = relist.FirstOrDefault(); JobCache.UpdateJobModelList(relist, EcommendType.Complete); //删除Orderqueue中sku的记录 - bool bo = queueBLL.DelQueueOrder(sku, block); + bool bo = queueBLL.DelQueueOrder(sku, block, area); LogHelper.WriteLogInfo("删除queue返回" + bo); } else diff --git a/Epost.DAL/OrdersDAL.cs b/Epost.DAL/OrdersDAL.cs index 4a68d81..13ca6fb 100644 --- a/Epost.DAL/OrdersDAL.cs +++ b/Epost.DAL/OrdersDAL.cs @@ -1245,10 +1245,10 @@ namespace Epost.DAL #region 查询sku对应的所有任务 - public DataTable getOrderListBysku(string block, string sku) + public DataTable getOrderListBysku(string block, string sku,string area) { - string sql = string.Format("select * from v_orders where block = '{0}' and sku ='{1}' order by layer,slist ", - block, + string sql = string.Format("select * from v_orders where block = '{0}' and area='{1}' and sku ='{2}' order by layer,slist ", + block,area, sku); LogHelper.WriteLogInfo("查询sku对应的所有任务:" + sql); DataTable dt = db.GetsqlForDT(sql); diff --git a/Epost.DAL/OrdersQueueDAL.cs b/Epost.DAL/OrdersQueueDAL.cs index 1b1881c..f9e2748 100644 --- a/Epost.DAL/OrdersQueueDAL.cs +++ b/Epost.DAL/OrdersQueueDAL.cs @@ -354,10 +354,10 @@ namespace Epost.DAL #region 删除queue - public bool DelQueueOrder(string sku,string block) + public bool DelQueueOrder(string sku,string block,string area) { - string sql = string.Format("delete from OrdersQueue where sku='{0}' and taskblock='{1}' and state<>3", - sku,block); + string sql = string.Format("delete from OrdersQueue where sku='{0}' and taskblock='{1}' and taskarea='{2}' and state<>3", + sku,block,area); LogHelper.WriteLogInfo("删除queue"+sql); long x = db.DeleteSql(sql); if (x > 0) diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index b8729ae..ae868cf 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -33,19 +33,19 @@ 04/04/2018 15:45:12 - 12/03/2024 14:23:22 + 12/06/2024 13:31:01 - 12/03/2024 14:23:22 + 12/06/2024 13:31:01 02/24/2020 15:29:24 - 12/03/2024 14:23:03 + 12/06/2024 13:29:51 - 12/03/2024 14:23:03 + 12/06/2024 13:29:51 04/29/2020 16:50:14 @@ -63,31 +63,31 @@ 10/23/2017 13:15:20 - 12/03/2024 14:23:04 + 12/06/2024 13:30:43 - 12/03/2024 14:23:04 + 12/06/2024 13:30:43 08/26/2020 18:09:48 - 12/03/2024 14:23:03 + 12/06/2024 13:30:43 - 12/03/2024 14:23:03 + 12/06/2024 13:30:43 - 12/03/2024 14:23:07 + 12/06/2024 13:30:46 - 12/03/2024 14:23:07 + 12/06/2024 13:30:46 - 12/03/2024 14:23:02 + 12/06/2024 13:29:51 - 12/03/2024 14:23:02 + 12/06/2024 13:29:51 09/06/2018 11:57:11 @@ -5652,7 +5652,7 @@ 05/30/2022 16:58:47 - 12/03/2024 14:23:09 + 12/06/2024 13:30:47 04/04/2018 15:45:12 @@ -7572,7 +7572,7 @@ 07/04/2022 14:22:38 - 12/03/2024 14:23:08 + 12/06/2024 13:30:46 \ No newline at end of file