18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整下列表显示

Browse Source
This commit is contained in:
tongfei
2023-12-18 14:30:34 +08:00
parent dba406e0e0
commit fbcb24c8c5
6 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/WMS.Web.Repositories/BackRecordRepositories.cs
View File

@@ -9,6 +9,8 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core; using WMS.Web.Core;
using WMS.Web.Core.Dto; using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.Infrastructure;
@@ -60,16 +62,16 @@ namespace WMS.Web.Repositories
public async Task<(List<BackRecordQueryResponse> list,int total)> GetPagedList(BackRecordQueryRequest dto) public async Task<(List<BackRecordQueryResponse> list,int total)> GetPagedList(BackRecordQueryRequest dto)
{ {
//1.获取物料集合和组织集合和供应商的集合 //1.获取物料集合和组织集合和供应商的集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return (new List<BackRecordQueryResponse>(), 0); materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
//组织集合 //组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg(); var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess) if (orgs_result.IsSuccess)
return (new List<BackRecordQueryResponse>(), 0); orgs = orgs_result.Data.ToList();
var orgs = orgs_result.Data.ToList();
List<int> ids = new List<int>(); List<int> ids = new List<int>();
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))

23
src/WMS.Web.Repositories/BoxInventoryRepositories.cs
View File

@@ -6,6 +6,8 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Inventory; using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Entitys;
@@ -55,20 +57,20 @@ namespace WMS.Web.Repositories
public async Task<(List<BoxInventoryQueryResponse> list, int total)> GetPagedList(BoxInventoryQueryRequest dto) public async Task<(List<BoxInventoryQueryResponse> list, int total)> GetPagedList(BoxInventoryQueryRequest dto)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return (new List<BoxInventoryQueryResponse>(), 0); materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList(); materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
//组织集合 //组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg(); var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess) if (orgs_result.IsSuccess)
return (new List<BoxInventoryQueryResponse>(), 0); orgs = orgs_result.Data.ToList();
var orgs = orgs_result.Data.ToList();
var query = _context.BoxInventoryDetails var query = _context.BoxInventoryDetails
.GroupJoin(_context.BoxInventory, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .GroupJoin(_context.BoxInventory, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
@@ -123,12 +125,13 @@ namespace WMS.Web.Repositories
public async Task<BoxInventoryResponse> GetInfoBy(string boxBillNo) public async Task<BoxInventoryResponse> GetInfoBy(string boxBillNo)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return null; materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
var entity=await _context.BoxInventory.Include(x=>x.Details)
var entity =await _context.BoxInventory.Include(x=>x.Details)
.GroupJoin(_context.Box, t => t.BoxId, box => box.Id, (boxinvent, ts) => new { boxinvent, ts }) .GroupJoin(_context.Box, t => t.BoxId, box => box.Id, (boxinvent, ts) => new { boxinvent, ts })
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.boxinvent, box }) .SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.boxinvent, box })
.Where(x => 1 == 1 && x.box.BoxBillNo==boxBillNo).Select(x=>x.boxinvent).FirstOrDefaultAsync(); .Where(x => 1 == 1 && x.box.BoxBillNo==boxBillNo).Select(x=>x.boxinvent).FirstOrDefaultAsync();

23
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -8,6 +8,9 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core; using WMS.Web.Core;
using WMS.Web.Core.Dto; using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Erp.Supplier;
using WMS.Web.Core.Dto.InStock; using WMS.Web.Core.Dto.InStock;
using WMS.Web.Core.Help; using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Results;
@@ -217,22 +220,24 @@ namespace WMS.Web.Repositories
public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto) public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto)
{ {
//1.获取物料集合和组织集合和供应商的集合 //1.获取物料集合和组织集合和供应商的集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return (new List<InStockQueryResponse>(), 0); materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
//组织集合 //组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg(); var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess) if (orgs_result.IsSuccess)
return (new List<InStockQueryResponse>(), 0); orgs = orgs_result.Data.ToList();
var orgs = orgs_result.Data.ToList();
//供应商集合 //供应商集合
var suppliers = new List<ErpSupplierDto>();
var suppliers_result = await _erpService.BillQueryForSupplier(); var suppliers_result = await _erpService.BillQueryForSupplier();
if (!suppliers_result.IsSuccess) if (suppliers_result.IsSuccess)
return (new List<InStockQueryResponse>(), 0); suppliers = suppliers_result.Data.ToList();
var suppliers = suppliers_result.Data.ToList();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))

24
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -9,6 +9,8 @@ using System.Threading.Tasks;
using WMS.Web.Core; using WMS.Web.Core;
using WMS.Web.Core.Dto; using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Erp.Supplier;
using WMS.Web.Core.Dto.InStockTask; using WMS.Web.Core.Dto.InStockTask;
using WMS.Web.Core.Help; using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Results;
@@ -427,22 +429,24 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto) public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合和供应商的集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return (new List<InStockTaskQueryResponse>(), 0); materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
//组织集合 //组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg(); var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess) if (orgs_result.IsSuccess)
return (new List<InStockTaskQueryResponse>(), 0); orgs = orgs_result.Data.ToList();
var orgs = orgs_result.Data.ToList();
//供应商集合 //供应商集合
var suppliers = new List<ErpSupplierDto>();
var suppliers_result = await _erpService.BillQueryForSupplier(); var suppliers_result = await _erpService.BillQueryForSupplier();
if (!suppliers_result.IsSuccess) if (suppliers_result.IsSuccess)
return (new List<InStockTaskQueryResponse>(), 0); suppliers = suppliers_result.Data.ToList();
var suppliers = suppliers_result.Data.ToList();
List<int> ids_Receiver = new List<int>(); List<int> ids_Receiver = new List<int>();
List<int> ids_Operator = new List<int>(); List<int> ids_Operator = new List<int>();

15
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -6,6 +6,8 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Inventory; using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Entitys;
@@ -54,22 +56,21 @@ namespace WMS.Web.Repositories
public async Task<(List<InventoryDetailsQueryResponse> list,int total)> GetPagedList(InventoryDetailsQueryRequest dto) public async Task<(List<InventoryDetailsQueryResponse> list,int total)> GetPagedList(InventoryDetailsQueryRequest dto)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return (new List<InventoryDetailsQueryResponse>(), 0); materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w =>w.MaterialNumber.Contains(dto.MaterialNumber)).ToList(); materials = materials.Where(w =>w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
//组织集合 //组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg(); var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess) if (orgs_result.IsSuccess)
return (new List<InventoryDetailsQueryResponse>(), 0); orgs = orgs_result.Data.ToList();
var orgs = orgs_result.Data.ToList();
//
var query = _context.InventoryDetails var query = _context.InventoryDetails
.Where(adv => 1 == 1); .Where(adv => 1 == 1);

14
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
View File

@@ -7,6 +7,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core; using WMS.Web.Core;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Inventory; using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Entitys;
@@ -55,16 +57,16 @@ namespace WMS.Web.Repositories
public async Task<(List<InventoryInOutDetailsQueryResponse> list, int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto) public async Task<(List<InventoryInOutDetailsQueryResponse> list, int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto)
{ {
//1.获取物料集合和组织集合 //1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return (new List<InventoryInOutDetailsQueryResponse>(), 0); materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
//组织集合 //组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg(); var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess) if (orgs_result.IsSuccess)
return (new List<InventoryInOutDetailsQueryResponse>(), 0); orgs = orgs_result.Data.ToList();
var orgs = orgs_result.Data.ToList();
//物料集合；模糊查询后的物料集合 //物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber)) if (!string.IsNullOrEmpty(dto.MaterialNumber))