diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index d154cfe6..4314d5cc 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -3286,6 +3286,11 @@ 序列号信息 + + + 箱Id + + 序列号 diff --git a/src/WMS.Web.Core/Dto/MaterialResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs index b6ee0d6a..126a92de 100644 --- a/src/WMS.Web.Core/Dto/MaterialResponse.cs +++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs @@ -9,6 +9,10 @@ namespace WMS.Web.Core.Dto /// public class MaterialResponse { + /// + /// 箱Id + /// + public int BoxId { get; set; } /// /// 序列号 /// diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 832b6821..a9d07f3d 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -145,10 +145,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.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.CreateBeginDate != null) query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -163,11 +163,11 @@ namespace WMS.Web.Repositories 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), + SerialNumbers = string.Join(",", s.changeBox.SerialNumbers), SrcBox = s.srcBox.BoxBillNo, DestBox = s.destBox.BoxBillNo, - //SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.SrcSubStockId), - //DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.DestSubStockId), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.SrcSubStockId), + DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.DestSubStockId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.changeBox.CreatorId), CreateTime = s.changeBox.CreateTime.DateToStringSeconds() #endregion diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 53f9df21..5c3de32d 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -151,6 +151,7 @@ namespace WMS.Web.Repositories } var entity = await _context.SerialNumbers.FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber)); if (entity == null) return null; + response.BoxId = entity.BoxId; response.SerialNumber = entity.SerialNumber; response.MaterialId = entity.MaterialId; response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId);