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

调整仓库在出库单的位置

Browse Source
This commit is contained in:
18942506660
2023-11-22 10:05:06 +08:00
parent e9d775870b
commit 21291356d7
10 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -273,7 +273,7 @@ namespace WMS.Web.Repositories
if (dto.DeliveryOrgId != null)
query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
if (!string.IsNullOrEmpty(dto.StockCode))
query = query.Where(w => w.detail.StockCode == dto.StockCode);
query = query.Where(w => w.order.StockCode == dto.StockCode);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
@@ -291,7 +291,7 @@ namespace WMS.Web.Repositories
CreateTime = s.order.OperateTime.DateToStringSeconds(),
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),
@@ -331,7 +331,7 @@ namespace WMS.Web.Repositories
foreach (var r in response)
{
var entity = list.FirstOrDefault(f => f.Id == r.Id);
r.StockCode = entity.Details.First().StockCode;
r.StockCode = entity.StockCode;
r.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, r.StockCode);
}
//获取物料信息 显示物料三件套
@@ -363,7 +363,7 @@ namespace WMS.Web.Repositories
if (entity == null) return new GetOutStockTaskByNoResponse();
var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
response.StockCode = entity.Details.First().StockCode;
response.StockCode = entity.StockCode;
response.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode);
//获取物料信息 显示物料三件套
foreach (var r in response.details)