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-11-09 16:12:29 +08:00
parent db9a3d25a3
commit d386e4aa41
10 changed files with 161 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WMS.Web.Domain/IService/IInStockTaskService.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.InStockTask;
using WMS.Web.Core.Internal.Results;
namespace WMS.Web.Domain.IService
@@ -11,11 +12,17 @@ namespace WMS.Web.Domain.IService
/// </summary>
public interface IInStockTaskService
{
/// <summary>
/// 来源单-编号模糊查询-pad
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
Task<ResultList<InStockTaskBillNoQueryResponse>> GetPurchaseInstockTask(string sourceBillNo);
/// <summary>
/// 同步：采购入库类型单据
/// </summary>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SsynPurchaseInStock(bool isTransaction);
Task<Result> SsynPurchaseInStock(List<string> billNos = null, bool isTransaction=true);
}
}

2
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -19,7 +19,7 @@ namespace WMS.Web.Domain.IService.Public
/// erp:单据查询-采购入库单
/// </summary>
/// <returns></returns>
Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo="", List<string> sourceBillNos = null);
Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null);
/// <summary>
/// erp:单据查询-出库单
/// </summary>

9
src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
View File

@@ -57,12 +57,19 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<List<InStockTask>> GetListBy(List<string> sourceBillNos);
/// <summary>
/// 列表-根据来源单号模糊搜索
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
Task<List<InStockTask>> GetListBy(string sourceBillNos);
/// <summary>
/// 列表-根据来源单号模糊
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
Task<List<InStockTaskBillNoQueryResponse>> GetListBy(string sourceBillNo, InstockType? type=null);
Task<List<InStockTaskBillNoQueryResponse>> GetListBy(InStockTaskBillNoQueryRequest dto);
/// <summary>
/// 批量添加

40
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -1,10 +1,12 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore.Storage;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Erp.Purchase;
using WMS.Web.Core.Dto.InStockTask;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
@@ -37,16 +39,49 @@ namespace WMS.Web.Domain.Services
_inStockTaskRepositories = inStockTaskRepositories;
}
/// <summary>
/// 来源单-编号模糊查询-pad
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
public async Task<ResultList<InStockTaskBillNoQueryResponse>> GetPurchaseInstockTask(string sourceBillNo)
{
//1.事务
IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
bool isRollback = false;
bool isTransaction = false;
//2.查看是否有入库任务单
var tasks= await _inStockTaskRepositories.GetListBy(sourceBillNo);
if (tasks == null || tasks.Count == 0)
return ResultList < InStockTaskBillNoQueryResponse > .ReFailure(ResultCodes.OrderNoData);
//3.有的话就同步一下金蝶的数据
var billNos = tasks.Select(x => x.SourceBillNo).ToList();
var result=await this.SsynPurchaseInStock(billNos, isTransaction);
if (!result.IsSuccess) isRollback = true;
//4.提交事务
var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return ResultList < InStockTaskBillNoQueryResponse > .ReFailure(result.Message, result.Status);
//5.再一次查询新的数据：并返回最后的结果
var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo };
var list = await _inStockTaskRepositories.GetListBy(request);
return ResultList<InStockTaskBillNoQueryResponse>.ReSuccess(list);
}
/// <summary>
/// 同步：采购入库类型单据
/// </summary>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SsynPurchaseInStock(bool isTransaction)
public async Task<Result> SsynPurchaseInStock(List<string> billNos=null,bool isTransaction=true)
{
//1.获取金蝶数据：采购订单数据
var erp_result= await _erpService.BillQueryForPurchaseInStock();
var erp_result= await _erpService.BillQueryForPurchaseInStock(billNos);
if (!erp_result.IsSuccess)
return Result.ReFailure(erp_result.Message,erp_result.Status);
var erp_list = erp_result.Data;
@@ -69,6 +104,7 @@ namespace WMS.Web.Domain.Services
{
//2.1.2修改数量
item.AccruedQty = erp_data.FQty;
item.DeliveredQty = erp_data.FStockInQty;
erp_removeList.Add(erp_data);
}
}

9
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -89,10 +89,9 @@ namespace WMS.Web.Domain.Services.Public
/// <summary>
/// erp:单据查询-采购入库单
/// </summary>
/// <param name="billNo">模糊搜索</param>
/// <param name="sourceBillNos">单据编号集合精确查找</param>
/// <returns></returns>
public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo="", List<string> sourceBillNos = null)
public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null)
{
try
{
@@ -137,12 +136,6 @@ namespace WMS.Web.Domain.Services.Public
}
param.FilterString = param.FilterString + str + ")";
//单据编号模糊查询
if (!string.IsNullOrEmpty(billNo))
{
param.FilterString = param.FilterString + " and FBillNo like '%"+billNo+"%'";
}
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
{