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

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -23,10 +23,13 @@ namespace WMS.Web.Api.Controllers
     {
         private readonly ILoginService _loginService;
         private readonly IBasicsRepositories _basicsRepositories;
-        public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories)
+        private readonly IBoxRepositories _boxRepositories;
+        public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories,
+            IBoxRepositories boxRepositories)
         {
             _loginService = loginService;
             _basicsRepositories = basicsRepositories;
+            _boxRepositories = boxRepositories;
         }
 
         /// <summary>
@@ -99,5 +102,24 @@ namespace WMS.Web.Api.Controllers
             var r = await _basicsRepositories.GetSubUcStockAsync(id, name);
             return Result<List<UcStockResponse>>.ReSuccess(r);
         }
+
+        /// <summary>
+        /// 根据箱号获取箱信息
+        /// </summary>
+        /// <param name="billNo">必填</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetBoxDetails")]
+        public async Task<ResultList<BoxDetailResponse>> GetBoxDetails([FromQuery] string billNo)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultList<BoxDetailResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+            if(string.IsNullOrEmpty(billNo))
+                return ResultList<BoxDetailResponse>.ReSuccess(new List<BoxDetailResponse>());
+
+            var r = await _boxRepositories.GetDetails(billNo);
+            return ResultList<BoxDetailResponse>.ReSuccess(r);
+        }
     }
 }

src/WMS.Web.Core/Dto/BoxDetailResponse.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto
+{
+    /// <summary>
+    /// 根据箱号获取物料信息
+    /// </summary>
+   public class BoxDetailResponse
+    {
+        /// <summary>
+        /// 单据头ID
+        /// </summary>
+        public int Fid { get; set; }
+        /// <summary>
+        /// 箱Id
+        /// </summary>
+        public int BoxId { get; set; }
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        public int MaterialId { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialName { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MaterialNumber { get; set; }
+        /// <summary>
+        /// 物料规格型号
+        /// </summary>
+        public string Specifications { get; set; }
+        /// <summary>
+        /// 供应商ID
+        /// </summary>
+        public int SupplierId { get; set; }
+        /// <summary>
+        /// 数量（装箱数量）
+        /// </summary>
+        public decimal Qty { get; set; }
+        /// <summary>
+        /// 序列号集
+        /// </summary>
+        public string SerialNumbers { get; set; }
+    }
+}

src/WMS.Web.Domain/Entitys/Box.cs

@@ -31,12 +31,11 @@ namespace WMS.Web.Domain.Entitys
         /// <summary>
         /// 创建时间（对应老OPS的创建时间）
         /// </summary>
-        public DateTime CreateTime { get; set; }
+        public DateTime CreateTime { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 明细
         /// </summary>
-        [NotMapped]
         public List<BoxDetails> Details = new List<BoxDetails>();
     }
 }

src/WMS.Web.Domain/Infrastructure/IBoxRepositories.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
+using WMS.Web.Domain.Entitys;
+
+namespace WMS.Web.Domain.Infrastructure
+{
+    /// <summary>
+    /// 老ops箱信息
+    /// </summary>
+   public interface IBoxRepositories
+    {
+        Task<Box> Get(string BoxBillNo);
+        //根据箱号查询物料信息
+        Task<List<BoxDetailResponse>> GetDetails(string BoxBillNo);
+    }
+}

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>();