1.出库界面展示当前正在进行出库的单据
2.后台退出了入库模式 通知前台扫码枪退出入库 3.对接盟讯公司登录Mes接口 4.接口记录增加本地日志排查问题
This commit is contained in:
@ -474,23 +474,30 @@ namespace WCS.BLL.Services.Service
|
||||
var recordsQueryable = DbHelp.db.Queryable<OutOrder>()
|
||||
.Where(t => request.OrderExeStatus.Contains(t.OutOrderExeStatus))
|
||||
.WhereIF(request.IsMXPD != null, t => t.IsMXPD == request.IsMXPD)
|
||||
.WhereIF(LocalFile.Config.IsMx, t => t.CreateTime > DateTime.Now.AddDays(-3));
|
||||
.WhereIF(LocalFile.Config.IsMx, t => t.CreateTime > DateTime.Now.AddDays(-3))
|
||||
.WhereIF(!string.IsNullOrEmpty(LocalFile.Config.GroupName), t => t.GroupName == LocalFile.Config.GroupName);
|
||||
|
||||
var totalCount = await recordsQueryable.CountAsync();
|
||||
var records = await recordsQueryable
|
||||
.OrderByDescending(t => t.CreateTime)
|
||||
//.Take(request.PageSize)
|
||||
.ToListAsync();
|
||||
|
||||
//获取后台当前正在进行出库的订单 将出库状态反馈给前端
|
||||
var outingOrderNumbers = ShelfManager.Shelves
|
||||
.Where(t => t.CurrentMode == HardWare.Mode.出库模式).Select(t => t.OrderNumber)
|
||||
.ToList();
|
||||
foreach (var record in records)
|
||||
{
|
||||
if (outingOrderNumbers.Contains(record.OrderNumber))
|
||||
record.IsOuting = true;
|
||||
}
|
||||
|
||||
return new PageQueryResponse<OutOrder>()
|
||||
{
|
||||
Code = 200,
|
||||
Message = $"success",
|
||||
Data = new PageQueryResponseData<OutOrder>()
|
||||
{
|
||||
//TotalCount = totalCount,
|
||||
//MaxPage = request.PageSize == 0 ? 0 : (int)Math.Ceiling((decimal)totalCount / request.PageSize),
|
||||
//Count = records.Count,
|
||||
Lists = records.ToList()
|
||||
}
|
||||
};
|
||||
|
Reference in New Issue
Block a user