仓库获取的优化

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

@@ -4956,6 +4956,11 @@
             仓位集合
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.Single.SingleAction.StocksJoinOrgCode">
+            <summary>
+            仓库：编码与组织编码结合
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.Single.SingleControllerType">
             <summary>
             单点-控制器枚举

src/WMS.Web.Repositories/BackRecordRepositories.cs

@@ -65,6 +65,8 @@ namespace WMS.Web.Repositories
             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 })
+                .GroupJoin(_context.Box, p => p.detail.BoxId, ts => ts.Id, (p, ts) => new { p.detail, p.order, ts })
+                .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order,box })
                 .Where(adv => 1 == 1);
 
             if (dto.SubStockId.HasValue)
@@ -81,7 +83,7 @@ namespace WMS.Web.Repositories
                 Id = s.order.Id,
                 DetailsId = s.detail.Id,
                 BillNo=s.order.BillNo,
-                BoxBillNo ="",
+                BoxBillNo = s.box.BoxBillNo,
                 Type = s.order.Type.GetRemark(),
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
                 CreateTime =s.order.CreateTime,
@@ -89,7 +91,7 @@ namespace WMS.Web.Repositories
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
                 Qty = s.detail.Qty,
-                SubStock = "",
+                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/BoxInventoryRepositories.cs

@@ -89,7 +89,7 @@ namespace WMS.Web.Repositories
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
-                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode),
+                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId),
                 Qty = s.detail.Qty,
             }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -115,7 +115,7 @@ namespace WMS.Web.Repositories
                         .Where(x => 1 == 1 && x.box.BoxBillNo==boxBillNo).Select(x=>x.boxinvent).FirstOrDefaultAsync();
 
             var response = _mapper.Map<BoxInventoryResponse>(entity);
-            response.Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode);
+            response.Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, response.StockCode+response.OrgCode);
             response.SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, response.SubStockId);
             response.Details = _mapper.Map<List<BoxInventoryDetailsResponse>>(entity.Details);
           

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -125,7 +125,7 @@ namespace WMS.Web.Repositories
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
-                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
+                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode),
                 Qty =s.detail.Qty,
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
                 CreateTime =s.order.CreateTime,

src/WMS.Web.Repositories/InStockTaskRepositories.cs

@@ -137,9 +137,9 @@ namespace WMS.Web.Repositories
                 AccruedQty = s.detail.AccruedQty,
                 ReceiveQty = s.detail.ReceiveQty,
                 RealityQty = s.detail.RealityQty,
-                Receiver = "",
+                Receiver = s.order.ReceiverId.HasValue? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ReceiverId.Value):"",
                 ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-                Shelfer = "",
+                Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "",
                 ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
             }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -282,7 +282,7 @@ namespace WMS.Web.Repositories
                 SourceBillNo=s.order.SourceBillNo,
                 MaterialId=s.detail.MaterialId,
                 StockCode=s.detail.StockCode,
-                StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode),
+                StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode),
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),

src/WMS.Web.Repositories/InventoryDetailsRepositories.cs

@@ -89,7 +89,7 @@ namespace WMS.Web.Repositories
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
-                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
+                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode + s.OrgCode),
                 Qty = s.Qty,
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId),
                 Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),

src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs

@@ -96,7 +96,7 @@ namespace WMS.Web.Repositories
                 Type =s.Type.GetRemark(),
                 OrderType=s.OrderType.GetRemark(),
                 OrderBillNo=s.OrderBillNo,
-                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
+                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode),
                 Qty = s.Qty,
                 SurplusQty=s.SurplusQty,
                 CreateTime = s.CreateTime