Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api
This commit is contained in:
@@ -57,7 +57,7 @@ namespace WMS.Web.Repositories
|
||||
/// <returns></returns>
|
||||
public async Task<List<BoxResponse>> GetBox(List<string> BoxBillNos)
|
||||
{
|
||||
var list = await _context.Box.Include(x => x.Details).Where(f => BoxBillNos.Contains(f.BoxBillNo)).ToListAsync();
|
||||
var list = await _context.Box.Include(x => x.Details).Where(f => BoxBillNos.Contains(f.BoxBillNo.ToLower())).ToListAsync();
|
||||
var resList = _mapper.Map<List<BoxResponse>>(list);
|
||||
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
|
||||
@@ -296,7 +296,7 @@ namespace WMS.Web.Repositories
|
||||
CreateTime = s.order.CreateTime.DateToStringSeconds(),
|
||||
OperateTime = s.order.OperateTime.DateToStringSeconds(),
|
||||
Operator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.OperatorId ?? 0),
|
||||
OutStockTime = s.order.OperateTime.DateToStringSeconds(),
|
||||
OutStockTime = s.order.OutStockTime.DateToStringSeconds(),
|
||||
OutStock = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.OutStockId ?? 0),
|
||||
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
|
||||
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
|
||||
|
||||
Reference in New Issue
Block a user