修复bug

This commit is contained in:
18942506660
2024-03-18 09:52:46 +08:00
parent b9862b9a20
commit fb4eb5877d
12 changed files with 76 additions and 60 deletions

View File

@@ -161,10 +161,10 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.moveBox.Id)
.Where(adv => 1 == 1);
if (dto.SrcSubStockId != null)
query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId);
if (dto.DestSubStockId != null)
query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId);
if (dto.SrcSubStockCode != null)
query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockCode != null)
query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode);
if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => ids.Contains(w.moveBox.CreatorId));
if (!string.IsNullOrEmpty(dto.Box))
@@ -182,8 +182,8 @@ namespace WMS.Web.Repositories
#region dto组装
BillNo = s.moveBox.BillNo,
Box = s.box.BoxBillNo,
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockId),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockId),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode),
Qty = s.moveBox.Qty,
Type = s.moveBox.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId),