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

接口优化2

Browse Source
This commit is contained in:
tongfei
2023-11-09 16:17:09 +08:00
parent 9e0635f20d
commit a931f74f5a
5 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -76,7 +76,7 @@ namespace WMS.Web.Api.Controllers
bool isTransaction = false; bool isTransaction = false;
//3.同步数据 //3.同步数据
var result = await _inStockTaskService.SsynPurchaseInStock(isTransaction); var result = await _inStockTaskService.SsynPurchaseInStock(null,isTransaction);
if (!result.IsSuccess) isRollback = true; if (!result.IsSuccess) isRollback = true;
//4.提交事务 //4.提交事务

31
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1358,7 +1358,14 @@
<param name="sourceBillNos"></param> <param name="sourceBillNos"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetListBy(System.String,System.Nullable{WMS.Web.Domain.Values.InstockType})"> <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetListBy(System.String)">
<summary>
列表-根据来源单号模糊搜索
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetListBy(WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest)">
<summary> <summary>
列表-根据来源单号模糊 列表-根据来源单号模糊
</summary> </summary>
@@ -1604,7 +1611,14 @@
入库任务单-服务接口 入库任务单-服务接口
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SsynPurchaseInStock(System.Boolean)"> <member name="M:WMS.Web.Domain.IService.IInStockTaskService.GetPurchaseInstockTask(System.String)">
<summary>
来源单-编号模糊查询-pad
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SsynPurchaseInStock(System.Collections.Generic.List{System.String},System.Boolean)">
<summary> <summary>
同步：采购入库类型单据 同步：采购入库类型单据
</summary> </summary>
@@ -1705,7 +1719,7 @@
<param name="stockId"></param> <param name="stockId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock(System.String,System.Collections.Generic.List{System.String})"> <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock(System.Collections.Generic.List{System.String})">
<summary> <summary>
erp:单据查询-采购入库单 erp:单据查询-采购入库单
</summary> </summary>
@@ -2443,7 +2457,14 @@
入库任务单-服务 入库任务单-服务
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SsynPurchaseInStock(System.Boolean)"> <member name="M:WMS.Web.Domain.Services.InStockTaskService.GetPurchaseInstockTask(System.String)">
<summary>
来源单-编号模糊查询-pad
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.SsynPurchaseInStock(System.Collections.Generic.List{System.String},System.Boolean)">
<summary> <summary>
同步：采购入库类型单据 同步：采购入库类型单据
</summary> </summary>
@@ -2639,7 +2660,7 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForPurchaseInStock(System.String,System.Collections.Generic.List{System.String})"> <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForPurchaseInStock(System.Collections.Generic.List{System.String})">
<summary> <summary>
erp:单据查询-采购入库单 erp:单据查询-采购入库单
</summary> </summary>

2
src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs
View File

@@ -55,7 +55,7 @@ namespace WMS.Web.Domain.QuartzJob
var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
_logger.LogInformation($"同步金蝶入库单数据：执行开始时间->{begindatetime}"); _logger.LogInformation($"同步金蝶入库单数据：执行开始时间->{begindatetime}");
//3.同步数据 //3.同步数据
var result = await _inStockTaskService.SsynPurchaseInStock(isTransaction); var result = await _inStockTaskService.SsynPurchaseInStock(null,isTransaction);
if (!result.IsSuccess) isRollback = true; if (!result.IsSuccess) isRollback = true;
//4.提交事务 //4.提交事务

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

@@ -125,8 +125,8 @@ namespace WMS.Web.Domain.Services
if (erp_list.Count != 0) if (erp_list.Count != 0)
{ {
var add_entitys = new List<InStockTask>(); var add_entitys = new List<InStockTask>();
var billNos = erp_list.GroupBy(x => x.FBillNo).Select(x => x.Key).ToList(); var current_billNos = erp_list.GroupBy(x => x.FBillNo).Select(x => x.Key).ToList();
foreach (var item in billNos) foreach (var item in current_billNos)
{ {
var dto = new InStockTask(); var dto = new InStockTask();
dto.SourceBillNo = item; dto.SourceBillNo = item;

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

@@ -92,7 +92,7 @@ namespace WMS.Web.Domain.Services.Public
/// <param name="billNo">模糊搜索</param> /// <param name="billNo">模糊搜索</param>
/// <param name="sourceBillNos">单据编号集合精确查找</param> /// <param name="sourceBillNos">单据编号集合精确查找</param>
/// <returns></returns> /// <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 try
{ {
@@ -137,12 +137,6 @@ namespace WMS.Web.Domain.Services.Public
} }
param.FilterString = param.FilterString + str + ")"; param.FilterString = param.FilterString + str + ")";
//单据编号模糊查询
if (!string.IsNullOrEmpty(billNo))
{
param.FilterString = param.FilterString + " and FBillNo like '%" + billNo + "%'";
}
//根据原订单号查询 //根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0) if (sourceBillNos != null && sourceBillNos.Count() > 0)
{ {