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

调整获取时间

Browse Source
This commit is contained in:
18942506660
2024-03-05 14:52:24 +08:00
parent ce7fc68ce3
commit 65ccc41d1b
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Api/Controllers/OutStockTaskController.cs
View File

@@ -196,8 +196,12 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
DateTime begin = DateTime.Now.AddDays(-3);//默认拉去三天以内的数据
var res = await _repositories.GetEntityList(dto.Ids);
return await _outStockTaskService.Sync(res.Select(s => s.BillNo).ToList());
//先刷新选中的数据
await _outStockTaskService.Sync(res.Select(s => s.BillNo).ToList());
//再刷新3天内所有的
return await _outStockTaskService.Sync(null, begin);
}
}
}

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

@@ -3445,6 +3445,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSalOutStock(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-销售出库单
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForSalOutStock(System.String)">
<summary>
erp:查询销售出库单信息
@@ -3602,11 +3608,18 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IOutStockTaskService.Sync(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IOutStockTaskService.BillQueryForSalOutStock(System.Boolean,System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
采购发货通知单
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IOutStockTaskService.Sync(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
同步金蝶数据 不传源订单号则更新所有
</summary>
<param name="billNos"></param>
<param name="begin"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.Public.ISingleDataService">
@@ -4693,7 +4706,16 @@
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.OutStockTaskService.Sync(System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.OutStockTaskService.BillQueryForSalOutStock(System.Boolean,System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
销售出库单
</summary>
<param name="isTransaction"></param>
<param name="sourceBillNos"></param>
<param name="beginTime"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.OutStockTaskService.Sync(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
同步金蝶数据 不传源订单号则更新所有
</summary>
@@ -5037,6 +5059,14 @@
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForSalOutStock(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
销售出库单
</summary>
<param name="sourceBillNos"></param>
<param name="beginTime"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.HttpClientService.GetAsync``1(System.String,System.Int32)">
<summary>
Get方法

3
src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs
View File

@@ -53,7 +53,8 @@ namespace WMS.Web.Domain.IService.Public
/// 同步金蝶数据 不传源订单号则更新所有
/// </summary>
/// <param name="billNos"></param>
/// <param name="begin"></param>
/// <returns></returns>
Task<Result> Sync(List<string> billNos = null);
Task<Result> Sync(List<string> billNos = null,DateTime? begin=null);
}
}

4
src/WMS.Web.Domain/QuartzJob/OutStockOrderQuartzJob.cs
View File

@@ -47,8 +47,10 @@ namespace WMS.Web.Domain.QuartzJob
//2.记录：开始时间
var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
_logger.LogInformation($"出库单-同步金蝶出库单数据：执行开始时间->{begindatetime}");
DateTime begin = DateTime.Now.AddDays(-1);//默认拉去一天以内的数据
//3.同步数据
var result = await _outStockTaskService.Sync(null);
var result = await _outStockTaskService.Sync(null, begin);
//5.记录：结束时间
var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
_logger.LogInformation($"出库单-同步金蝶出库单数据：执行结束时间->{begindatetime}");

5
src/WMS.Web.Domain/Services/OutStockTaskService.cs
View File

@@ -285,7 +285,7 @@ namespace WMS.Web.Domain.Services
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
public async Task<Result> Sync(List<string> billNos = null)
public async Task<Result> Sync(List<string> billNos = null, DateTime? begin = null)
{
//1.事务
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
@@ -296,8 +296,7 @@ namespace WMS.Web.Domain.Services
if (billNos == null)
{
//DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.OutStock);
DateTime begin = Convert.ToDateTime("2024-03-01 00:00:00");//正式环境 从3月1好开始
if (DateTime.Now > Convert.ToDateTime("2024-03-04 00:00:00"))
if (begin == null)
begin = DateTime.Now.AddDays(-3);//默认拉去三天以内的数据
//更新时间范围内所有
result = await BillQueryForSalOutStock(false, null, begin);