From 5c8528a05dceef46dfb46308ceedb98a548cfb32 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Thu, 30 Nov 2023 14:55:35 +0800 Subject: [PATCH] test --- src/WMS.Web.Domain/Services/InStockTaskService.cs | 13 ++++++++----- src/WMS.Web.Domain/Services/Public/ErpService.cs | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 603cbbda..a86cec7d 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -1,5 +1,6 @@ using AutoMapper; using Microsoft.EntityFrameworkCore.Storage; +using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; @@ -24,15 +25,17 @@ namespace WMS.Web.Domain.Services public class InStockTaskService : IInStockTaskService { private readonly IMapper _mapper; + private ILogger _logger; private readonly IErpService _erpService; private readonly ILoginService _loginService; private readonly IBasicsRepositories _basicsRepositories; private readonly IInStockRepositories _inStockRepositories; private readonly IInStockTaskRepositories _inStockTaskRepositories; public InStockTaskService(IMapper mapper, IErpService erpService, ILoginService loginService, - IBasicsRepositories basicsRepositories, + IBasicsRepositories basicsRepositories, ILogger logger, IInStockRepositories inStockRepositories, IInStockTaskRepositories inStockTaskRepositories) { + this._logger = logger; _mapper = mapper; _erpService = erpService; _loginService = loginService; @@ -180,14 +183,14 @@ namespace WMS.Web.Domain.Services return Result.ReFailure(erp_result_ass.Message, erp_result_ass.Status); var erp_list_ass = erp_result_ass.Data; erp_list.AddRange(erp_list_ass); - + _logger.LogInformation("组装（成品入库）条数：" + erp_list_ass.Count); //1.1.获取金蝶数据：拆卸子件入库订单数据 var erp_result_disass = await _erpService.BillQueryForAssembledApp_Disassembly(billNos); if (!erp_result_disass.IsSuccess) return Result.ReFailure(erp_result_disass.Message, erp_result_disass.Status); var erp_list_disass = erp_result_disass.Data; erp_list.AddRange(erp_list_disass); - + _logger.LogInformation("拆卸（子件入库）条数：" + erp_list_disass.Count); return await this.SysnData(erp_list, isTransaction); } @@ -312,8 +315,8 @@ namespace WMS.Web.Domain.Services erp_list.RemoveAll(x => x.BillNo == item); } } - - + if (erp_list.GroupBy(x => x.Type).Select(x => x.Key).FirstOrDefault() == (int)InstockType.Assembled) + _logger.LogInformation("组装拆卸单新增条数：" + erp_list.Count); //3.wms任务单的来源单据编号不存在于erp中，那么就新增 if (erp_list.Count != 0) diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 3fc79d4f..5d01f3df 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -650,6 +650,8 @@ namespace WMS.Web.Domain.Services.Public lis.Type = (int)InstockType.Assembled; erp_list.Add(lis); } + + _logger.LogInformation("组装（成品入库）条数：" + erp_list.Count); return ResultList.ReSuccess(erp_list); } catch (Exception ex) @@ -754,6 +756,7 @@ namespace WMS.Web.Domain.Services.Public lis.Type = (int)InstockType.Assembled; erp_list.Add(lis); } + _logger.LogInformation("拆卸（子件入库）条数：" + erp_list.Count); return ResultList.ReSuccess(erp_list); } catch (Exception ex)