From 2eb5a89cf692e79e94e27f61a01e74fc764a818f Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 13 Nov 2023 16:13:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=BF=9D=E5=AD=98=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=AF=B9=E8=B1=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaveBackRecordDetailsRequest.cs           |  2 +-
 .../BackRecordRepositories.cs                 | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/BackRecord/SaveBackRecordDetailsRequest.cs b/src/WMS.Web.Core/Dto/BackRecord/SaveBackRecordDetailsRequest.cs
index e99d4fed..c5b75ba8 100644
--- a/src/WMS.Web.Core/Dto/BackRecord/SaveBackRecordDetailsRequest.cs
+++ b/src/WMS.Web.Core/Dto/BackRecord/SaveBackRecordDetailsRequest.cs
@@ -35,6 +35,6 @@ namespace WMS.Web.Core.Dto.BackRecord
         /// 序列号集
         /// </summary>
         [Required(ErrorMessage = "序列号不能为空")]
-        public string SerialNumbers { get; set; }
+        public List<string> SerialNumbers { get; set; } = new List<string>();
     }
 }
diff --git a/src/WMS.Web.Repositories/BackRecordRepositories.cs b/src/WMS.Web.Repositories/BackRecordRepositories.cs
index 8580fb71..50ebacca 100644
--- a/src/WMS.Web.Repositories/BackRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/BackRecordRepositories.cs
@@ -13,6 +13,7 @@ using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Values.Single;
 using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
@@ -26,15 +27,20 @@ namespace WMS.Web.Repositories
         private readonly IServiceProvider _serviceProvider;
         private readonly ILoginRepositories _loginRepositories;
         private readonly RepositoryDbContext _context;
+        private readonly IErpService _erpService;
         private readonly ISingleDataService _singleDataService;
+        private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
 
 
         public BackRecordRepositories(RepositoryDbContext context,
             IMapper mapper,
+            IErpService erpService,
             ILoginRepositories loginRepositories,
             IServiceProvider serviceProvider,
-            ISingleDataService singleDataService)
+            ISingleDataService singleDataService,
+            IErpBasicDataExtendService erpBasicDataExtendService)
         {
+            _erpService = erpService;
             _context = context;
             _mapper = mapper;
             _serviceProvider = serviceProvider;
@@ -49,17 +55,17 @@ namespace WMS.Web.Repositories
         /// <returns></returns>
         public async Task<ResultPagedList<BackRecordQueryResponse>> GetPagedList(BackRecordQueryRequest dto) 
         {
+            //1.获取物料集合和组织集合和供应商的集合
+            var materials_result = await _erpService.BillQueryForMaterial();
+            if (!materials_result.IsSuccess)
+                return ResultPagedList<BackRecordQueryResponse>.ReFailure(materials_result);
+            var materials = materials_result.Data.ToList();
+
             var query = _context.BackRecordDetails
                 .GroupJoin(_context.BackRecord, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
                 .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
                 .Where(adv => 1 == 1);
 
-            //if (!string.IsNullOrEmpty(dto.BoxBillNo))
-            //    query = query.Where(w => EF.Functions.Like(w.order.BoxBillNo, "%" + dto.BoxBillNo + "%"));
-
-            //if (!string.IsNullOrEmpty(dto.MaterialNumber))
-            //    query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%"));
-
             if (dto.SubStockId.HasValue)
                 query = query.Where(w => w.detail.SubStockId == dto.SubStockId.Value);
           
@@ -77,13 +83,13 @@ namespace WMS.Web.Repositories
                 Id = s.order.Id,
                 DetailsId = s.detail.Id,
                 BillNo=s.order.BillNo,
-                BoxBillNo = "",
+                BoxBillNo ="",
                 Type = s.order.Type.GetRemark(),
-                Creator = "",
+                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
                 CreateTime =s.order.CreateTime,
-                MaterialName = "",
-                MaterialNumber = "",
-                Specifications = "",
+                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
+                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
+                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
                 Qty = s.detail.Qty,
                 SubStock = "",
                 SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),