列表接口优化

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

@@ -137,7 +137,7 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.BoxBillNo">
             <summary>
-            所属箱号ID
+            所属箱号编码
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Type">
@@ -175,11 +175,21 @@
             数量
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Org">
+            <summary>
+            组织
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.SubStock">
             <summary>
             仓位
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Stock">
+            <summary>
+            仓库
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.SerialNumbers">
             <summary>
             序列号集
@@ -2736,6 +2746,11 @@
             物料规格型号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Org">
+            <summary>
+            组织
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Stock">
             <summary>
             仓库
@@ -2866,6 +2881,11 @@
             类型：1为入库，2为出库
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Org">
+            <summary>
+            组织
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Stock">
             <summary>
             仓库

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

@@ -2580,6 +2580,14 @@
             <param name="orgId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.String)">
+            <summary>
+            获取组织名称
+            </summary>
+            <param name="erpOrgs"></param>
+            <param name="orgCode"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetSupplierName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Supplier.ErpSupplierDto},System.Int32)">
             <summary>
             获取供应商名称
@@ -3875,6 +3883,14 @@
             <param name="orgId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.String)">
+            <summary>
+            获取组织名称
+            </summary>
+            <param name="erpOrgs"></param>
+            <param name="orgCode"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetSupplierName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Supplier.ErpSupplierDto},System.Int32)">
             <summary>
             获取供应商名称

src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs

@@ -25,7 +25,7 @@ namespace WMS.Web.Core.Dto
         public string BillNo { get; set; }
 
         /// <summary>
-        /// 所属箱号ID
+        /// 所属箱号编码
         /// </summary>
         public string BoxBillNo { get; set; }
         /// <summary>
@@ -57,11 +57,22 @@ namespace WMS.Web.Core.Dto
         /// 数量
         /// </summary>
         public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 组织
+        /// </summary>
+        public string Org { get; set; }
+
         /// <summary>
         /// 仓位
         /// </summary>
         public string SubStock { get; set; }
 
+        /// <summary>
+        /// 仓库
+        /// </summary>
+        public string Stock { get; set; }
+
         /// <summary>
         /// 序列号集
         /// </summary>

src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs

@@ -27,6 +27,11 @@ namespace WMS.Web.Core.Dto.Inventory
         /// </summary>
         public string Specifications { get; set; }
 
+        /// <summary>
+        /// 组织
+        /// </summary>
+        public string Org { get; set; }
+
         /// <summary>
         /// 仓库
         /// </summary>

src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs

@@ -32,6 +32,11 @@ namespace WMS.Web.Core.Dto.Inventory
         /// </summary>
         public string Type { get; set; }
 
+        /// <summary>
+        /// 组织
+        /// </summary>
+        public string Org { get; set; }
+
         /// <summary>
         /// 仓库
         /// </summary>

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

@@ -52,6 +52,14 @@ namespace WMS.Web.Domain.IService.Public
         /// <returns></returns>
         string GetOrgName(List<ErpOrgDto> erpOrgs, int orgId);
 
+        /// <summary>
+        /// 获取组织名称
+        /// </summary>
+        /// <param name="erpOrgs"></param>
+        /// <param name="orgCode"></param>
+        /// <returns></returns>
+        string GetOrgName(List<ErpOrgDto> erpOrgs, string orgCode);
+
         /// <summary>
         /// 获取供应商名称
         /// </summary>

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

@@ -90,6 +90,18 @@ namespace WMS.Web.Domain.Services.Public
             return org == null ? "" : org.Name;
         }
 
+        /// <summary>
+        /// 获取组织名称
+        /// </summary>
+        /// <param name="erpOrgs"></param>
+        /// <param name="orgCode"></param>
+        /// <returns></returns>
+        public string GetOrgName(List<ErpOrgDto> erpOrgs, string orgCode)
+        {
+            var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault();
+            return org == null ? "" : org.Name;
+        }
+
         /// <summary>
         /// 获取供应商名称
         /// </summary>

src/WMS.Web.Repositories/BackRecordRepositories.cs

@@ -62,6 +62,12 @@ namespace WMS.Web.Repositories
                 return (new List<BackRecordQueryResponse>(), 0);
             var materials = materials_result.Data.ToList();
 
+            //组织集合
+            var orgs_result = await _erpService.BillQueryForOrg();
+            if (!orgs_result.IsSuccess)
+                return (new List<BackRecordQueryResponse>(), 0);
+            var orgs = orgs_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 })
@@ -91,6 +97,8 @@ namespace WMS.Web.Repositories
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
                 Qty = s.detail.Qty,
+                Org= _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgCode),
+                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId),
                 SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),
             }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -77,7 +77,7 @@ namespace WMS.Web.Repositories
 
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+                materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
 
             var query=_context.InStockDetails
                 .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })

src/WMS.Web.Repositories/InStockTaskRepositories.cs

@@ -79,7 +79,7 @@ namespace WMS.Web.Repositories
 
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+                materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
 
             var query = _context.InStockTaskDetails
                 .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })

src/WMS.Web.Repositories/InventoryDetailsRepositories.cs

@@ -61,7 +61,13 @@ namespace WMS.Web.Repositories
 
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+                materials = materials.Where(w =>w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
+
+            //组织集合
+            var orgs_result = await _erpService.BillQueryForOrg();
+            if (!orgs_result.IsSuccess)
+                return (new List<InventoryDetailsQueryResponse>(), 0);
+            var orgs = orgs_result.Data.ToList();
 
             //
             var query = _context.InventoryDetails
@@ -89,6 +95,7 @@ namespace WMS.Web.Repositories
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
+                Org= _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
                 Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode + s.OrgCode),
                 Qty = s.Qty,
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),

src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs

@@ -60,9 +60,15 @@ namespace WMS.Web.Repositories
                 return (new List<InventoryInOutDetailsQueryResponse>(), 0);
             var materials = materials_result.Data.ToList();
 
+            //组织集合
+            var orgs_result = await _erpService.BillQueryForOrg();
+            if (!orgs_result.IsSuccess)
+                return (new List<InventoryInOutDetailsQueryResponse>(), 0);
+            var orgs = orgs_result.Data.ToList();
+
             //物料集合；模糊查询后的物料集合
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
+                materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
 
             var query = _context.InventoryInOutDetails
                 .Where(adv => 1 == 1);
@@ -96,6 +102,7 @@ namespace WMS.Web.Repositories
                 Type =s.Type.GetRemark(),
                 OrderType=s.OrderType.GetRemark(),
                 OrderBillNo=s.OrderBillNo,
+                Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
                 Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode),
                 Qty = s.Qty,
                 SurplusQty=s.SurplusQty,