diff --git a/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs b/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs index d9b6eec1..5c210423 100644 --- a/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs +++ b/src/WMS.Web.Domain/QuartzJob/InStockOrderQuartzJob.cs @@ -48,20 +48,20 @@ namespace WMS.Web.Domain.QuartzJob { try { - - ////1.记录:开始时间 - //var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); - //_logger.LogInformation($"同步金蝶入库单数据:执行开始时间->{begindatetime}"); - ////2.同步数据 - //var result = await _inStockTaskService.Sysn(); - //if (!result.IsSuccess) - //{ - // _logger.LogInformation($"同步金蝶入库单数据:执行失败->{result.Message}"); - //} - - ////3.记录:结束时间 - //var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); - //_logger.LogInformation($"同步金蝶入库单数据:执行结束时间->{begindatetime}"); + + //1.记录:开始时间 + var begindatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); + _logger.LogInformation($"同步金蝶入库单数据:执行开始时间->{begindatetime}"); + //2.同步数据 + var result = await _inStockTaskService.Sysn(); + if (!result.IsSuccess) + { + _logger.LogInformation($"同步金蝶入库单数据:执行失败->{result.Message}"); + } + + //3.记录:结束时间 + var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); + _logger.LogInformation($"同步金蝶入库单数据:执行结束时间->{begindatetime}"); } catch (Exception ex) diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 55482ef6..11439a55 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -261,7 +261,7 @@ namespace WMS.Web.Domain.Services public async Task SysnData(List erp_list, bool isTransaction) { //1.通过单据编号找到wms系统现有的任务单;并修改 - var erp_removeList = new List(); + var erp_remove_billNo = new List(); var SourceBillNo_list = erp_list.GroupBy(x => x.BillNo).Select(x => x.Key).ToList(); var data_list = await _inStockTaskRepositories.GetListBy(SourceBillNo_list); if (data_list.Count != 0) @@ -279,7 +279,7 @@ namespace WMS.Web.Domain.Services //2.1.2修改数量 item.AccruedQty = erp_data.Qty; item.DeliveredQty = erp_data.DeliveredQty; - erp_removeList.Add(erp_data); + erp_remove_billNo.Add(data.SourceBillNo); } } @@ -288,13 +288,18 @@ namespace WMS.Web.Domain.Services if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); + + //要剔除的来源单据编号:去重 + erp_remove_billNo= erp_remove_billNo.GroupBy(x => x).Select(x => x.Key).ToList(); //2.3剔除:已修改的单据 - foreach (var item in erp_removeList) + foreach (var item in erp_remove_billNo) { - erp_list.Remove(item); + erp_list.RemoveAll(x => x.BillNo == item); } } + + //3.wms任务单的来源单据编号不存在于erp中,那么就新增 if (erp_list.Count != 0) {