Merge branch 'feature/智能货架'
This commit is contained in:
@ -208,7 +208,7 @@ namespace WCS.BLL.Services.Service
|
||||
//生成序号
|
||||
for (int i = 0; i < records.Count; i++)
|
||||
{
|
||||
records[i].RowNumber = (request.PageNumber - 1) * 10 + i + 1;
|
||||
records[i].RowNumber = (request.PageNumber - 1) * request.PageSize + i + 1;
|
||||
}
|
||||
|
||||
return new PageQueryResponse<OutOrder>()
|
||||
@ -378,7 +378,7 @@ namespace WCS.BLL.Services.Service
|
||||
return new ResponseCommon<List<OutOrderMatDetail>>
|
||||
{
|
||||
Code = 200,
|
||||
Message = "Success",
|
||||
Message = outOrder.OrderStatus.ToString(),
|
||||
Data = orderMatDetail
|
||||
};
|
||||
}
|
||||
@ -619,7 +619,7 @@ namespace WCS.BLL.Services.Service
|
||||
.WhereIF(!string.IsNullOrEmpty(outOrderDetail.MatBatch), t => t.MatBatch == outOrderDetail.MatBatch)
|
||||
.Where(t => t.IsLocked == false)//未锁定的物料
|
||||
.OrderBy(t => t.MatBatch)//先进先出
|
||||
//(t => t.MatQty)//零散料先出
|
||||
//(t => t.MatQty)//零散料先出
|
||||
.ToList();
|
||||
|
||||
//2.2按照搜索出来的库存和当前未出的数量 计算需要出的SN
|
||||
|
Reference in New Issue
Block a user