单灯交互修改为与液晶一致
This commit is contained in:
@ -42,7 +42,7 @@ namespace WCS.BLL.Services.Service
|
||||
.ToList();
|
||||
var moduleInfo = DbHelp.db.Queryable<ModuleInfo>()
|
||||
.LeftJoin<ShelfTypeInfo>((si, sti) => si.ShelfTypeId == sti.Id)
|
||||
.Where((si, sti) => sti.ShelfTypeName == "液晶标签货架")
|
||||
.Where((si, sti) => sti.ShelfTypeName == "液晶标签货架" || sti.ShelfTypeName == "信息化货架")
|
||||
.Where((si, sti) => storeCodeList.Contains(si.ModuleCode))
|
||||
.Select((si, sti) => si)
|
||||
.ToList();
|
||||
@ -270,7 +270,7 @@ namespace WCS.BLL.Services.Service
|
||||
|
||||
var needCancelTasks = DbHelp.db.Queryable<CurrentTask>()
|
||||
.Where(t => request.OrderNumber == request.OrderNumber)
|
||||
.WhereIF(!string.IsNullOrEmpty(request.MatCode), t => t.MatCode == request.MatCode)
|
||||
.WhereIF(!string.IsNullOrEmpty(request.MatCode), t => t.ItemNo == request.MatCode)
|
||||
.ToList();
|
||||
needCancelTasks.ForEach(t => t.IsCancel = true);
|
||||
//获取当前
|
||||
|
Reference in New Issue
Block a user