hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
jl
2024-12-06 14:13:52 +08:00
parent 102cc71af5
commit 122c2cb3bc
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Epost.BLL/OrderBLL.cs
View File

@ -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)

4
Epost.BLL/OrdersQueueBLL.cs
View File

@ -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

4
Epost.BLL/Work_JobDownThread.cs
View File

@ -971,7 +971,7 @@ namespace Epost.BLL
{
List<LabelParamModel> list = new List<LabelParamModel>();
//查询当前通道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

6
Epost.BLL/Work_ScanThread.cs
View File

@ -509,7 +509,7 @@ namespace Epost.BLL
{
List<LabelParamModel> list = new List<LabelParamModel>();
//查询当前通道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<JobModel> jobList = JobCache.GetPlanJobList();
List<JobModel> relist = jobList.FindAll(m => m.Sku == sku && m.Block == block);
List<JobModel> 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