diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs index a2fd74f..35dd9a4 100644 --- a/src/BarCode.Web.Domain/Services/BoxService.cs +++ b/src/BarCode.Web.Domain/Services/BoxService.cs @@ -442,43 +442,46 @@ 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)); - + 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); - //int isTwo = 1; - //if (serialList2.Count > 1) - //{ - // isTwo = serialList2.Count; - //} - - foreach (var s2 in serialList2) + sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse() { - var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s2) || f.NumberCode.Equals(s2)); + SerialNumber = s, + BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId), + BarCreateTime = sentity == null ? null : sentity.CreateTime, + IsTwo = sentity==null ? 1 :sentity.IsTwo, + TwoSerialNumber = sentity == null ? s: sentity.TwoSerialNumber, + IsNotCount = sentity == null ? "0":sentity.isNotCount + }); + //以前是之前的 + //// 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); + ////int isTwo = 1; + + ////if (serialList2.Count > 1) + ////{ + //// isTwo = serialList2.Count; + ////} + + //foreach (var s2 in serialList2) + //{ + // 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, - IsTwo= s2.IsTwo, - TwoSerialNumber=s2.TwoSerialNumber, - IsNotCount=s2.isNotCount - }); - } + // 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, + // IsTwo= s2.IsTwo, + // TwoSerialNumber=s2.TwoSerialNumber, + // IsNotCount=s2.isNotCount + // }); + //} }