增加单据号

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -335,6 +335,11 @@
             改箱列表
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.MaterialName">
             <summary>
             物料名称
@@ -2565,6 +2570,11 @@
             物料规格型号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Box">
             <summary>
             箱号

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -235,6 +235,11 @@
             主键 订单编号
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.MaterialId">
             <summary>
             物料ID  
@@ -683,6 +688,11 @@
             主键 订单编号
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.BoxId">
             <summary>
             箱号ID

src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs

@@ -9,6 +9,10 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
     /// </summary>
    public class ChangeBoxRecordQueryInfoResponse
     {
+        /// <summary>
+        /// 单据编号
+        /// </summary>
+        public string BillNo { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>

src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryInfoResponse.cs

@@ -6,6 +6,10 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
 {
    public class MoveBoxRecordQueryInfoResponse
     {
+        /// <summary>
+        /// 单据编号
+        /// </summary>
+        public string BillNo { get; set; }
         /// <summary>
         /// 箱号
         /// </summary>

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

@@ -20,6 +20,11 @@ namespace WMS.Web.Domain.Entitys
         [Column("Id")]
         public override int Id { get; set; }
         /// <summary>
+        /// 单据编号
+        /// </summary>
+        [Column("BillNo")]
+        public string BillNo { get; set; }
+        /// <summary>
         /// 物料ID  
         /// </summary>
         [Column("MaterialId")]

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

@@ -21,6 +21,11 @@ namespace WMS.Web.Domain.Entitys
         [Column("Id")]
         public override int Id { get; set; }
         /// <summary>
+        /// 单据编号
+        /// </summary>
+        [Column("BillNo")]
+        public string BillNo { get; set; }
+        /// <summary>
         /// 箱号ID
         /// </summary>
         [Column("BoxId")]

src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs

@@ -26,9 +26,12 @@ namespace WMS.Web.Repositories
         private readonly ISingleDataService _singleDataService;
         private readonly ILoginRepositories _loginRepositories;
         private readonly IBasicsRepositories _basicsRepositories;
+        private readonly IErpService _erpService;
+        private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
 
         public ChangeBoxRecordRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider,
-            ISingleDataService singleDataService, ILoginRepositories loginRepositories, IBasicsRepositories basicsRepositories)
+            ISingleDataService singleDataService, ILoginRepositories loginRepositories, IBasicsRepositories basicsRepositories,
+            IErpService erpService, IErpBasicDataExtendService erpBasicDataExtendService)
         {
             _context = context;
             _mapper = mapper;
@@ -36,6 +39,8 @@ namespace WMS.Web.Repositories
             _singleDataService = singleDataService;
             _loginRepositories = loginRepositories;
             _basicsRepositories = basicsRepositories;
+            _erpService = erpService;
+            _erpBasicDataExtendService = erpBasicDataExtendService;
         }
         /// <summary>
         /// 新增
@@ -113,6 +118,11 @@ namespace WMS.Web.Repositories
                 ids = staffList.Where(w => EF.Functions.Like(w.Name, "%" + dto.Creator + "%")).Select(s => s.Id).ToList();
             }
 
+            var materials_result = await _erpService.BillQueryForMaterial();
+            if (!materials_result.IsSuccess)
+                return (new List<ChangeBoxRecordQueryInfoResponse>(), 0);
+            var materials = materials_result.Data.ToList();
+
             var query = _context.ChangeBoxRecord
                  .GroupJoin(_context.Box, changeBox => changeBox.SrcBoxId, srcBox => srcBox.Id, (changeBox, srcBox) => new { changeBox, srcBox })
                 .SelectMany(x => x.srcBox.DefaultIfEmpty(), (d, srcBox) => new { d.changeBox, srcBox })
@@ -140,9 +150,10 @@ namespace WMS.Web.Repositories
             var list = await query.Select(s => new ChangeBoxRecordQueryInfoResponse()
             {
                 #region dto组装
-                MaterialName = "",
+                BillNo=s.changeBox.BillNo,
-                MaterialNumber = "",
+                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.changeBox.MaterialId),
-                Specifications = "",
+                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId),
+                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId),
                 //Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.changeBox.StockId),
                 SerialNumbers = JsonConvert.SerializeObject(s.changeBox.SerialNumbers),
                 SrcBox = s.srcBox.BoxBillNo,

src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs

@@ -110,6 +110,7 @@ namespace WMS.Web.Repositories
             var list = await query.Select(s => new MoveBoxRecordQueryInfoResponse()
             {
                 #region dto组装
+                BillNo=s.moveBox.BillNo,
                 Box = s.box.BoxBillNo,
                 SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.SrcSubStockId),
                 DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.moveBox.DestSubStockId),