Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Repositories/BoxRepositories.cs

@@ -0,0 +1,69 @@
+using AutoMapper;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
+using WMS.Web.Domain.Entitys;
+using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
+using WMS.Web.Repositories.Configuration;
+
+namespace WMS.Web.Repositories
+{
+    /// <summary>
+    /// 老ops箱信息
+    /// </summary>
+    public class BoxRepositories : IBoxRepositories
+    {
+        private readonly IMapper _mapper;
+        private readonly IServiceProvider _serviceProvider;
+        private readonly RepositoryDbContext _context;
+        private readonly ISingleDataService _singleDataService;
+        private readonly ILoginRepositories _loginRepositories;
+        private readonly IBasicsRepositories _basicsRepositories;
+
+        public BoxRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
+            ISingleDataService singleDataService, ILoginRepositories loginRepositories, IBasicsRepositories basicsRepositories)
+        {
+            _context = context;
+            _mapper = mapper;
+            _serviceProvider = serviceProvider;
+            _singleDataService = singleDataService;
+            _loginRepositories = loginRepositories;
+            _basicsRepositories = basicsRepositories;
+        }
+        public async Task<Box> Get(string BoxBillNo)
+        {
+            return await _context.Box.Include(x => x.Details)
+                  .FirstOrDefaultAsync(f => f.BoxBillNo.Equals(BoxBillNo));
+        }
+        /// <summary>
+        /// 根据箱号查询物料信息
+        /// </summary>
+        /// <param name="BoxBillNo"></param>
+        /// <returns></returns>
+        public async Task<List<BoxDetailResponse>> GetDetails(string BoxBillNo)
+        {
+            return await _context.BoxDetails
+                  .GroupJoin(_context.Box, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
+                  .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
+                  .Where(w => w.order.BoxBillNo.Equals(BoxBillNo))
+                  .Select(s => new BoxDetailResponse()
+                  {
+                      Fid = s.detail.Fid,
+                      BoxId = s.order.OpsBoxId,
+                      MaterialId = s.detail.MaterialId,
+                      MaterialName = "",
+                      MaterialNumber = "",
+                      Specifications = "",
+                      SerialNumbers = s.detail.SerialNumbers,
+                      SupplierId = s.detail.SupplierId,
+                      Qty = s.detail.Qty
+                  })
+                  .ToListAsync();
+        }
+    }
+}

src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs

@@ -33,6 +33,7 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddHttpContextAccessor();
             services.AddScoped<ILoginRepositories, LoginRepositories>();
             services.AddScoped<IBasicsRepositories, BasicsRepositories>();
+            services.AddScoped<IBoxRepositories, BoxRepositories>();
             
             services.AddTransient<ITransactionRepositories, TransactionRepositories>();