From 5a9a89ad3fef9dff5abd05231b7c722ed576d7df Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Sat, 11 Nov 2023 17:59:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 10 ++++++++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 10 ++++++++++ .../ChangeBoxRecordQueryResponse.cs | 4 ++++ .../MoveBoxRecordQueryInfoResponse.cs | 4 ++++ src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs | 5 +++++ src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs | 5 +++++ .../ChangeBoxRecordRepositories.cs | 19 +++++++++++++++---- .../MoveBoxRecordRepositories.cs | 1 + 8 files changed, 54 insertions(+), 4 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index c5076000..ff3e68e6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -335,6 +335,11 @@ 改箱列表 + + + 单据编号 + + 物料名称 @@ -2565,6 +2570,11 @@ 物料规格型号 + + + 单据编号 + + 箱号 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index a96ccf7f..2a468b9f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -235,6 +235,11 @@ 主键 订单编号 + + + 单据编号 + + 物料ID @@ -683,6 +688,11 @@ 主键 订单编号 + + + 单据编号 + + 箱号ID diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs index 275e61e0..7ac7eb4b 100644 --- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs @@ -9,6 +9,10 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord /// public class ChangeBoxRecordQueryInfoResponse { + /// + /// 单据编号 + /// + public string BillNo { get; set; } /// /// 物料名称 /// diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs index 89f75e5d..adb8cad5 100644 --- a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs +++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs @@ -6,6 +6,10 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord { public class MoveBoxRecordQueryInfoResponse { + /// + /// 单据编号 + /// + public string BillNo { get; set; } /// /// 箱号 /// diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs index 2d5b371d..e0f6d70d 100644 --- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -20,6 +20,11 @@ namespace WMS.Web.Domain.Entitys [Column("Id")] public override int Id { get; set; } /// + /// 单据编号 + /// + [Column("BillNo")] + public string BillNo { get; set; } + /// /// 物料ID /// [Column("MaterialId")] diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index a5791780..d1f7d138 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -21,6 +21,11 @@ namespace WMS.Web.Domain.Entitys [Column("Id")] public override int Id { get; set; } /// + /// 单据编号 + /// + [Column("BillNo")] + public string BillNo { get; set; } + /// /// 箱号ID /// [Column("BoxId")] diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 9b63cff4..762b6ef2 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -26,9 +26,12 @@ namespace WMS.Web.Repositories private readonly ISingleDataService _singleDataService; private readonly ILoginRepositories _loginRepositories; private readonly IBasicsRepositories _basicsRepositories; + private readonly IErpService _erpService; + private readonly IErpBasicDataExtendService _erpBasicDataExtendService; public ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider, - ISingleDataService singleDataService, ILoginRepositories loginRepositories, IBasicsRepositories basicsRepositories) + ISingleDataService singleDataService, ILoginRepositories loginRepositories, IBasicsRepositories basicsRepositories, + IErpService erpService, IErpBasicDataExtendService erpBasicDataExtendService) { _context = context; _mapper = mapper; @@ -36,6 +39,8 @@ namespace WMS.Web.Repositories _singleDataService = singleDataService; _loginRepositories = loginRepositories; _basicsRepositories = basicsRepositories; + _erpService = erpService; + _erpBasicDataExtendService = erpBasicDataExtendService; } /// /// 新增 @@ -113,6 +118,11 @@ namespace WMS.Web.Repositories ids = staffList.Where(w => EF.Functions.Like(w.Name, "%" + dto.Creator + "%")).Select(s => s.Id).ToList(); } + var materials_result = await _erpService.BillQueryForMaterial(); + if (!materials_result.IsSuccess) + return (new List(), 0); + var materials = materials_result.Data.ToList(); + var query = _context.ChangeBoxRecord .GroupJoin(_context.Box, changeBox => changeBox.SrcBoxId, srcBox => srcBox.Id, (changeBox, srcBox) => new { changeBox, srcBox }) .SelectMany(x => x.srcBox.DefaultIfEmpty(), (d, srcBox) => new { d.changeBox, srcBox }) @@ -140,9 +150,10 @@ namespace WMS.Web.Repositories var list = await query.Select(s => new ChangeBoxRecordQueryInfoResponse() { #region dto组装 - MaterialName = "", - MaterialNumber = "", - Specifications = "", + BillNo=s.changeBox.BillNo, + MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.changeBox.MaterialId), + MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId), + Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId), //Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.changeBox.StockId), SerialNumbers = JsonConvert.SerializeObject(s.changeBox.SerialNumbers), SrcBox = s.srcBox.BoxBillNo, diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index d6ea6216..3cc2a3de 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -110,6 +110,7 @@ namespace WMS.Web.Repositories var list = await query.Select(s => new MoveBoxRecordQueryInfoResponse() { #region dto组装 + BillNo=s.moveBox.BillNo, Box = s.box.BoxBillNo, SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId),