From fb4eb5877d7281959f090716d4eaf348e8d424ee Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 18 Mar 2024 09:52:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChangeBoxRecordQueryRequest.cs | 16 +++++++++++---- .../MoveBoxRecordQueryRequest.cs | 12 +++++++++-- src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs | 20 +++++++++---------- src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs | 20 +++++++++---------- .../Entitys/OutStockBoxsDetails.cs | 10 +++++----- .../Entitys/TakeStockDetails.cs | 10 +++++----- .../Services/ChangeMoveBoxService.cs | 4 ++-- .../Services/TakeStockService.cs | 8 ++++---- src/WMS.Web.Repositories/BoxRepositories.cs | 10 +++++----- .../ChangeBoxRecordRepositories.cs | 12 +++++------ .../MoveBoxRecordRepositories.cs | 12 +++++------ .../TakeStockRepositories.cs | 2 +- 12 files changed, 76 insertions(+), 60 deletions(-) diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs index 01578005..141be577 100644 --- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs @@ -17,14 +17,22 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord /// 目标箱子 /// public string DestBox { get; set; } + ///// + ///// 原仓位ID + ///// + //public int? SrcSubStockId { get; set; } + ///// + ///// 现仓位ID + ///// + //public int? DestSubStockId { get; set; } /// - /// 原仓位ID + /// 原仓位编码 /// - public int? SrcSubStockId { get; set; } + public string SrcSubStockCode { get; set; } /// - /// 现仓位ID + /// 现仓位编码 /// - public int? DestSubStockId { get; set; } + public string DestSubStockCode { get; set; } /// /// 操作人 /// diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs index 1b93a0ec..0b39fcca 100644 --- a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs @@ -9,14 +9,22 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord /// public class MoveBoxRecordQueryRequest : PaginationBaseRequestDto { + ///// + ///// 原仓位编码 + ///// + //public int? SrcSubStockId { get; set; } + ///// + ///// 目标仓位编码 + ///// + //public int? DestSubStockId { get; set; } /// /// 原仓位编码 /// - public int? SrcSubStockId { get; set; } + public string SrcSubStockCode { get; set; } /// /// 目标仓位编码 /// - public int? DestSubStockId { get; set; } + public string DestSubStockCode { get; set; } /// /// 类型：1- 整箱移货上级，2-整箱移货下级 /// diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs index 64964642..17873e02 100644 --- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -54,11 +54,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("DestBoxId")] public int DestBoxId { get; set; } - /// - /// 原箱仓位 - /// - [Column("SrcSubStockId")] - public int SrcSubStockId { get; set; } + ///// + ///// 原箱仓位 + ///// + //[Column("SrcSubStockId")] + //public int SrcSubStockId { get; set; } /// /// 原箱仓位 /// @@ -69,11 +69,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("DestStockCode")] public string DestStockCode { get; set; } - /// - /// 目标箱仓位或重新上架选择仓位 - /// - [Column("DestSubStockId")] - public int DestSubStockId { get; set; } + ///// + ///// 目标箱仓位或重新上架选择仓位 + ///// + //[Column("DestSubStockId")] + //public int DestSubStockId { get; set; } /// /// 目标箱仓位或重新上架选择仓位 /// diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index c3c9df83..b5322dbb 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -40,16 +40,16 @@ namespace WMS.Web.Domain.Entitys /// [Column("StockCode")] public string StockCode { get; set; } - /// - /// 原仓位Id - /// - [Column("SrcSubStockId")] - public int SrcSubStockId { get; set; } - /// - /// 目标仓位Id - /// - [Column("DestSubStockId")] - public int DestSubStockId { get; set; } + ///// + ///// 原仓位Id + ///// + //[Column("SrcSubStockId")] + //public int SrcSubStockId { get; set; } + ///// + ///// 目标仓位Id + ///// + //[Column("DestSubStockId")] + //public int DestSubStockId { get; set; } /// /// 原仓位编码 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs index 270dc604..7090c6f2 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs @@ -34,11 +34,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("SerialNumbers")] public List SerialNumbers { get; set; } = new List(); - /// - /// 仓位 - /// - [Column("SubStockId")] - public int SubStockId { get; set; } + ///// + ///// 仓位 + ///// + //[Column("SubStockId")] + //public int SubStockId { get; set; } /// /// 仓位 /// diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs index 5fc83588..56303753 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs @@ -50,11 +50,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("StockCode")] public string StockCode { get; set; } - /// - /// 仓位 - /// - [Column("SubStockId")] - public int SubStockId { get; set; } + ///// + ///// 仓位 + ///// + //[Column("SubStockId")] + //public int SubStockId { get; set; } /// /// 仓位 /// diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index 8481c7f7..ed8c79f5 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -168,8 +168,8 @@ namespace WMS.Web.Domain.Services { ChangeBoxRecord entity = new ChangeBoxRecord(); entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId); - entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取 - entity.SrcSubStockCode = subStock_s?.Code ?? ""; + //entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取 + entity.SrcSubStockCode = subStock_s?.Code ?? "";//原乡仓位需要去拉一下库存获取 if (subStock != null) { //entity.DestSubStockId = dt.SubStockId; diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 6693edc5..99b98620 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -89,11 +89,11 @@ namespace WMS.Web.Domain.Services TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit); takeStock.Details = _mapper.Map>(profitList); - var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); + var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList(); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); foreach (var d in takeStock.Details) { - var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); + var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; d.SubStockCode = subStock?.Code; @@ -110,11 +110,11 @@ namespace WMS.Web.Domain.Services TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss); takeStock.Details = _mapper.Map>(lossList); - var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); + var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList(); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); foreach (var d in takeStock.Details) { - var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); + var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; d.SubStockCode = subStock?.Code; diff --git a/src/WMS.Web.Repositories/BoxRepositories.cs b/src/WMS.Web.Repositories/BoxRepositories.cs index a98c762f..7f1efa92 100644 --- a/src/WMS.Web.Repositories/BoxRepositories.cs +++ b/src/WMS.Web.Repositories/BoxRepositories.cs @@ -68,15 +68,15 @@ namespace WMS.Web.Repositories var serialList = await _context.SerialNumbers.Where(f => ids.Contains(f.BoxId)).ToListAsync(); //获取物料信息 显示物料三件套 - var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialId).ToList(); + var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialNumber).ToList(); foreach (var r in resList) { foreach (var detail in r.Details) { - detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialId); - detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, detail.MaterialId); - detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialId); - detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialId == detail.MaterialId).Select(s => s.SerialNumber).ToList(); + detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialNumber); + detail.MaterialNumber = detail.MaterialNumber; + detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber); + detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialNumber == detail.MaterialNumber).Select(s => s.SerialNumber).ToList(); } r.TotalQty = r.Details.Sum(s => s.Qty); } diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 75aa2cd2..295a901f 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -149,10 +149,10 @@ namespace WMS.Web.Repositories query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); if (!string.IsNullOrEmpty(dto.DestBox)) query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); - if (dto.SrcSubStockId != null) - query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId); - if (dto.DestSubStockId != null) - query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId); + if (dto.SrcSubStockCode != null) + query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode); + if (dto.DestSubStockCode != null) + query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode); if (dto.CreateBeginDate != null) query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -172,8 +172,8 @@ namespace WMS.Web.Repositories DestBox = s.destBox.BoxBillNo, Qty=s.changeBox.Qty, DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode), - SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockId), - DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockId), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockCode), + DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId), CreateTime = s.changeBox.CreateTime.DateToStringSeconds() #endregion diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index 9f0d9a82..f741195d 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -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), diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 72ac0cc1..8d8e40f5 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -259,7 +259,7 @@ namespace WMS.Web.Repositories BillNo = s.order.BillNo, Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode), - SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId), + SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockCode), Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber), MaterialNumber = s.detail.MaterialNumber,