修改了报表

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

@@ -6330,6 +6330,26 @@
              库存量
             </summary> 
         </member>
+        <member name="P:WMS.Web.Core.Dto.ProductInventory.ProductInventoryQueryResponse.FProductLines1FName">
+            <summary>
+            产品线(1级)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.ProductInventory.ProductInventoryQueryResponse.FProductCATs1FName">
+            <summary>
+            产品分类(2级)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.ProductInventory.ProductInventoryQueryResponse.FMaterialGroupFName">
+            <summary>
+            产品分组(3级)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.ProductInventory.ProductInventoryQueryResponse.F_Product">
+            <summary>
+            SPU
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.SendDataDto.CustomerCode">
             <summary>
             客户编码

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

@@ -4177,6 +4177,38 @@
             <param name="erpMaterials"></param>
             <param name="materialNumber"></param>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialFProductLines1FName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料产品1级
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialFProductCATs1FName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料产品2级
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialFMaterialGroupFName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料产品3级
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialF_Product(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料spu
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialSpecifications(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
             <summary>
             获取物料规格型号
@@ -6115,6 +6147,38 @@
             <param name="materialNumber"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialFProductLines1FName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料产品线(1级)
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialFProductCATs1FName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料产品分类(2级)
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialFMaterialGroupFName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料产品分组(3级)
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialF_Product(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
+            <summary>
+            获取物料SPU
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialNumber"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialSpecifications(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.String)">
             <summary>
             获取物料编码

src/WMS.Web.Core/Dto/ProductInventory/ProductInventoryQueryResponse.cs

@@ -65,5 +65,23 @@ namespace WMS.Web.Core.Dto.ProductInventory
         ///</summary> 
         [Column("库存量")]
         public decimal BeforeQty { get; set; } = 0;
+        /// <summary>
+        /// 产品线(1级)
+        /// </summary>
+        public string FProductLines1FName { get; set; }
+        /// <summary>
+        /// 产品分类(2级)
+        /// </summary>
+        public string FProductCATs1FName { get; set; }
+        /// <summary>
+        /// 产品分组(3级)
+        /// </summary>
+        public string FMaterialGroupFName { get; set; }
+        /// <summary>
+        /// SPU
+        /// </summary>
+        public string F_Product { get; set; }
+
+
     }
 }

src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs

@@ -44,6 +44,40 @@ namespace WMS.Web.Domain.IService.Public
         /// <param name="materialNumber"></param>
         string GetMaterialName(List<ErpMaterialDto> erpMaterials, string materialNumber);
 
+        /// <summary>
+        /// 获取物料产品1级
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialFProductLines1FName(List<ErpMaterialDto> erpMaterials, string materialNumber);
+        /// <summary>
+        /// 获取物料产品2级
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialFProductCATs1FName(List<ErpMaterialDto> erpMaterials, string materialNumber);
+
+        /// <summary>
+        /// 获取物料产品3级
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialFMaterialGroupFName(List<ErpMaterialDto> erpMaterials, string materialNumber);
+
+        /// <summary>
+        /// 获取物料spu
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialF_Product(List<ErpMaterialDto> erpMaterials, string materialNumber);
+
+
+
+
         /// <summary>
         /// 获取物料规格型号
         /// </summary>

src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs

@@ -120,6 +120,100 @@ namespace WMS.Web.Domain.Services.Public
             }
             return mat.MaterialName;
         }
+
+
+        /// <summary>
+        /// 获取物料产品线(1级)
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialFProductLines1FName(List<ErpMaterialDto> erpMaterials, string materialNumber)
+        {
+            if (erpMaterials == null || erpMaterials.Count == 0)
+                return "";
+
+            var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+            if (mat == null)
+            {
+                var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+                if (!result.IsSuccess)
+                    return "";
+                return result.Data == null ? "" : result.Data.FProductLines1FName;
+            }
+            return mat.FProductLines1FName;
+        }
+        /// <summary>
+        /// 获取物料产品分类(2级)
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialFProductCATs1FName(List<ErpMaterialDto> erpMaterials, string materialNumber)
+        {
+            if (erpMaterials == null || erpMaterials.Count == 0)
+                return "";
+
+            var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+            if (mat == null)
+            {
+                var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+                if (!result.IsSuccess)
+                    return "";
+                return result.Data == null ? "" : result.Data.FProductCATs1FName;
+            }
+            return mat.FProductCATs1FName;
+        }
+
+        /// <summary>
+        /// 获取物料产品分组(3级)
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialFMaterialGroupFName(List<ErpMaterialDto> erpMaterials, string materialNumber)
+        {
+            if (erpMaterials == null || erpMaterials.Count == 0)
+                return "";
+
+            var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+            if (mat == null)
+            {
+                var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+                if (!result.IsSuccess)
+                    return "";
+                return result.Data == null ? "" : result.Data.FMaterialGroupFName;
+            }
+            return mat.FMaterialGroupFName;
+        }
+
+        /// <summary>
+        /// 获取物料SPU
+        /// </summary>
+        /// <param name="erpMaterials"></param>
+        /// <param name="materialNumber"></param>
+        /// <returns></returns>
+        public string GetMaterialF_Product(List<ErpMaterialDto> erpMaterials, string materialNumber)
+        {
+            if (erpMaterials == null || erpMaterials.Count == 0)
+                return "";
+
+            var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
+            if (mat == null)
+            {
+                var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
+
+                if (!result.IsSuccess)
+                    return "";
+                return result.Data == null ? "" : result.Data.F_Product;
+            }
+            return mat.F_Product;
+        }
+
+
         /// <summary>
         /// 获取物料编码
         /// </summary>

src/WMS.Web.Repositories/ProductInventoryRepositories.cs

@@ -136,6 +136,7 @@ namespace WMS.Web.Repositories
             #endregion
 
             var query = _context.ProductInventory
+               
                .OrderByDescending(o => o.Id)
                .Where(adv => 1 == 1 && (adv.Qty > 0 || adv.BeforeQty > 0));
 
@@ -169,7 +170,12 @@ namespace WMS.Web.Repositories
                 Batch = s.Batch,
                 Customer = s.Customer,
                 Qty = s.Qty,
-                BeforeQty = s.BeforeQty
+                BeforeQty = s.BeforeQty,
+                FProductLines1FName=_erpBasicDataExtendService.GetMaterialFProductLines1FName(materials, s.MaterialNumber),
+                FProductCATs1FName = _erpBasicDataExtendService.GetMaterialFProductCATs1FName(materials, s.MaterialNumber),
+                FMaterialGroupFName = _erpBasicDataExtendService.GetMaterialFMaterialGroupFName(materials, s.MaterialNumber),
+                F_Product = _erpBasicDataExtendService.GetMaterialF_Product(materials, s.MaterialNumber),
+
                 #endregion
 
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();