From 0aad4f32fcffad78d88ecd9fb9d55a97dd8186b5 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Tue, 6 May 2025 16:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E5=BE=97=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BarCode.Web.Domain/Services/BoxService.cs | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs index fedf54b..9cc26ba 100644 --- a/src/BarCode.Web.Domain/Services/BoxService.cs +++ b/src/BarCode.Web.Domain/Services/BoxService.cs @@ -382,13 +382,36 @@ namespace BarCode.Web.Domain.Services List sList = new List(); foreach (var s in bdsList) { - var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s)); - sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse() + // // var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s)); + + + + // sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse() + // { + // SerialNumber = s, + // BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId), + // BarCreateTime = sentity == null ? null : sentity.CreateTime + // }); + //以前是之前的 + // var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s)); + // var sentity = serialList.GetEntityListBySuitNumber(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s)); + var serialList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(s); + + foreach (var s2 in serialList2) { - SerialNumber = s, - BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId), - BarCreateTime = sentity == null ? null : sentity.CreateTime - }); + var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s2) || f.NumberCode.Equals(s2)); + + + + sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse() + { + SerialNumber = s2.SerialNumber, + BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId), + BarCreateTime = sentity == null ? null : sentity.CreateTime + }); + } + + } Core.Dto.Box.OpsBoxDetailsResponse Detail = new Core.Dto.Box.OpsBoxDetailsResponse() {