18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
tongfei
2024-04-17 10:14:08 +08:00
parent 820db120ef
commit c908243664
4 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1948,6 +1948,11 @@
序列号 序列号
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.SaleBillNo">
<summary>
销售订单号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto"> <member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto">
<summary> <summary>
入库任务单明细详情 入库任务单明细详情

5
src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs
View File

@@ -79,5 +79,10 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary> /// </summary>
public string SerialNumbers { get; set; } public string SerialNumbers { get; set; }
/// <summary>
/// 销售订单号
/// </summary>
public string SaleBillNo { get; set; }
} }
} }

49
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -183,7 +183,7 @@ namespace WMS.Web.Repositories
Method = InventoryInOutMethod.Box.GetRemark(), Method = InventoryInOutMethod.Box.GetRemark(),
MaterialNumber = x.detail.MaterialNumber, MaterialNumber = x.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),
ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"", ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
Receiver = x.box.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.box.ReceiverId.Value) : "", Receiver = x.box.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.box.ReceiverId.Value) : "",
Qty = x.detail.ReceiveQty, Qty = x.detail.ReceiveQty,
ReceiveQty = x.detail.ReceiveQty ReceiveQty = x.detail.ReceiveQty
@@ -220,7 +220,7 @@ namespace WMS.Web.Repositories
boxList.ForEach(x => boxList.ForEach(x =>
{ {
x.SerialNumbers = (string.Join(",", serialNumbList.Where(t =>t.BoxId==x.BoxId && t.MaterialNumber == x.MaterialNumber).Select(t => t.SerialNumber).ToList())).TrimEnd(','); x.SerialNumbers = (string.Join(",", serialNumbList.Where(t => t.BoxId == x.BoxId && t.MaterialNumber == x.MaterialNumber).Select(t => t.SerialNumber).ToList())).TrimEnd(',');
}); });
@@ -236,6 +236,8 @@ namespace WMS.Web.Repositories
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .SelectMany(x => x.ts.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.GroupJoin(_context.Box, p => p.detail.BoxId, ts => ts.Id, (p, ts) => new { p.detail, p.order, ts }) .GroupJoin(_context.Box, p => p.detail.BoxId, ts => ts.Id, (p, ts) => new { p.detail, p.order, ts })
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order, box }) .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order, box })
.GroupJoin(_context.InStockTaskDetails, p => p.detail.TaskDetailId, ts => ts.Id, (p, ts) => new { p.detail, p.order, p.box, ts })
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, taskDet) => new { p.detail, p.order, p.box, taskDet })
.Where(x => x.detail.TaskId == entity.Id).Select(x => new InStockTaskBoxInfoDto() .Where(x => x.detail.TaskId == entity.Id).Select(x => new InStockTaskBoxInfoDto()
{ {
BoxId = x.box.Id, BoxId = x.box.Id,
@@ -244,7 +246,7 @@ namespace WMS.Web.Repositories
MethodForInt = (int)x.order.Method, MethodForInt = (int)x.order.Method,
MaterialNumber = x.detail.MaterialNumber, MaterialNumber = x.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),
SaleBillNo = x.taskDet.SaleBillNo,
Qty = 0, Qty = 0,
RealityQty = x.detail.Qty, RealityQty = x.detail.Qty,
ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -358,7 +360,7 @@ namespace WMS.Web.Repositories
{ {
Id = s.order.Id, Id = s.order.Id,
DetailsId = s.detail.Id, DetailsId = s.detail.Id,
CustomerCode=s.detail.CustomerCode, CustomerCode = s.detail.CustomerCode,
SupplierId = s.detail.SupplierId, SupplierId = s.detail.SupplierId,
OrgId = s.detail.OrgId, OrgId = s.detail.OrgId,
OrgCode = s.detail.OrgCode, OrgCode = s.detail.OrgCode,
@@ -373,7 +375,7 @@ namespace WMS.Web.Repositories
ReceiveQty = s.detail.ReceiveQty, ReceiveQty = s.detail.ReceiveQty,
//采购：可入库数量=应入库数量-收货数量-已交数量+该明细的入库数量之和； //采购：可入库数量=应入库数量-收货数量-已交数量+该明细的入库数量之和；
AvailableQty = s.detail.AccruedQty - s.detail.ReceiveQty - (s.detail.DeliveredQty > s.detail.RealityQty ? s.detail.DeliveredQty : s.detail.RealityQty), AvailableQty = s.detail.AccruedQty - s.detail.ReceiveQty - (s.detail.DeliveredQty > s.detail.RealityQty ? s.detail.DeliveredQty : s.detail.RealityQty),
WaitSlefQty = s.detail.ReceiveQty-s.detail.RealityQty, WaitSlefQty = s.detail.ReceiveQty - s.detail.RealityQty,
Remark = s.detail.Remark, Remark = s.detail.Remark,
ErpDetailId = s.detail.ErpDetailId ErpDetailId = s.detail.ErpDetailId
}).ToListAsync(); }).ToListAsync();
@@ -507,7 +509,7 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<List<ReceiveBoxResponse>> GetReceiveBox(int taskId, string materialNumber) public async Task<List<ReceiveBoxResponse>> GetReceiveBox(int taskId, string materialNumber)
{ {
var list = await _context.InstockTaskBox.Include(x => x.Details.Where(t=>t.MaterialNumber==materialNumber)).Where(x => x.TaskId == taskId && x.Details.Where(t => t.MaterialNumber == materialNumber).Count()>0).ToListAsync(); var list = await _context.InstockTaskBox.Include(x => x.Details.Where(t => t.MaterialNumber == materialNumber)).Where(x => x.TaskId == taskId && x.Details.Where(t => t.MaterialNumber == materialNumber).Count() > 0).ToListAsync();
//var list_last = list.Where(x => x.Details.Any(t => t.MaterialNumber == materialNumber)).ToList(); //var list_last = list.Where(x => x.Details.Any(t => t.MaterialNumber == materialNumber)).ToList();
var result = list.Select(x => new ReceiveBoxResponse() var result = list.Select(x => new ReceiveBoxResponse()
{ {
@@ -749,14 +751,22 @@ namespace WMS.Web.Repositories
} }
} }
var taskIds = new List<int>();
if (dto.BoxBillNos != null && dto.BoxBillNos.Count != 0)
{
var tids = await _context.InstockTaskBox.Where(x => dto.BoxBillNos.Contains(x.BoxBillNo)).GroupBy(x => x.TaskId).Select(x => x.Key).ToListAsync();
taskIds.AddRange(tids);
}
if (dto.SerialNumbers != null && dto.SerialNumbers.Count != 0)
{
var tids= await _context.InStockDetails.Where(w => w.SerialNumbers.SequenceEqual(dto.SerialNumbers)).GroupBy(x => x.TaskId).Select(x => x.Key).ToListAsync();
taskIds.AddRange(tids);
}
var query = _context.InStockTaskDetails var query = _context.InStockTaskDetails
.GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
.GroupJoin(_context.InstockTaskBox,p=>p.order.Id,ts=>ts.TaskId, (p,ts)=>new { p.detail,p.order,ts}) .Where(adv => 1 == 1);
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order,box })
.GroupJoin(_context.InStockDetails, p => p.order.Id, ts => ts.TaskId, (p, ts) => new { p.detail, p.order, p.box,ts })
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, instockdet) => new { p.detail, p.order,p.box, instockdet })
.Where(adv => 1 == 1);
if (!string.IsNullOrEmpty(dto.SourceBillNo)) if (!string.IsNullOrEmpty(dto.SourceBillNo))
query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%")); query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%"));
@@ -767,16 +777,9 @@ namespace WMS.Web.Repositories
query = query.Where(w => materialNumbs.Contains(w.detail.MaterialNumber)); query = query.Where(w => materialNumbs.Contains(w.detail.MaterialNumber));
} }
//箱号 if (taskIds.Count!=0)
if (dto.BoxBillNos != null && dto.BoxBillNos.Count != 0)
{ {
query = query.Where(w => dto.BoxBillNos.Contains(w.box.BoxBillNo)); query = query.Where(w => taskIds.Contains(w.order.Id));
}
//序列号
if (dto.SerialNumbers != null && dto.SerialNumbers.Count != 0)
{
query = query.Where(w => w.instockdet.SerialNumbers.SequenceEqual(dto.SerialNumbers));
} }
if (!string.IsNullOrEmpty(dto.Receiver)) if (!string.IsNullOrEmpty(dto.Receiver))
@@ -835,7 +838,7 @@ namespace WMS.Web.Repositories
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
Remark = s.detail.Remark, Remark = s.detail.Remark,
IsRepeal = s.detail.IsRepeal ?? false, IsRepeal = s.detail.IsRepeal ?? false,
SaleBillNo=s.detail.SaleBillNo, SaleBillNo = s.detail.SaleBillNo,
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total); return (list, total);