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

test

Browse Source
This commit is contained in:
tongfei
2023-11-30 14:55:35 +08:00
parent 0436794d74
commit 5c8528a05d
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
using AutoMapper; using AutoMapper;
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -24,15 +25,17 @@ namespace WMS.Web.Domain.Services
public class InStockTaskService : IInStockTaskService public class InStockTaskService : IInStockTaskService
{ {
private readonly IMapper _mapper; private readonly IMapper _mapper;
private ILogger<InStockTaskService> _logger;
private readonly IErpService _erpService; private readonly IErpService _erpService;
private readonly ILoginService _loginService; private readonly ILoginService _loginService;
private readonly IBasicsRepositories _basicsRepositories; private readonly IBasicsRepositories _basicsRepositories;
private readonly IInStockRepositories _inStockRepositories; private readonly IInStockRepositories _inStockRepositories;
private readonly IInStockTaskRepositories _inStockTaskRepositories; private readonly IInStockTaskRepositories _inStockTaskRepositories;
public InStockTaskService(IMapper mapper, IErpService erpService, ILoginService loginService, public InStockTaskService(IMapper mapper, IErpService erpService, ILoginService loginService,
IBasicsRepositories basicsRepositories, IBasicsRepositories basicsRepositories, ILogger<InStockTaskService> logger,
IInStockRepositories inStockRepositories, IInStockTaskRepositories inStockTaskRepositories) IInStockRepositories inStockRepositories, IInStockTaskRepositories inStockTaskRepositories)
{ {
this._logger = logger;
_mapper = mapper; _mapper = mapper;
_erpService = erpService; _erpService = erpService;
_loginService = loginService; _loginService = loginService;
@@ -180,14 +183,14 @@ namespace WMS.Web.Domain.Services
return Result.ReFailure(erp_result_ass.Message, erp_result_ass.Status); return Result.ReFailure(erp_result_ass.Message, erp_result_ass.Status);
var erp_list_ass = erp_result_ass.Data; var erp_list_ass = erp_result_ass.Data;
erp_list.AddRange(erp_list_ass); erp_list.AddRange(erp_list_ass);
_logger.LogInformation("组装（成品入库）条数：" + erp_list_ass.Count);
//1.1.获取金蝶数据：拆卸子件入库订单数据 //1.1.获取金蝶数据：拆卸子件入库订单数据
var erp_result_disass = await _erpService.BillQueryForAssembledApp_Disassembly(billNos); var erp_result_disass = await _erpService.BillQueryForAssembledApp_Disassembly(billNos);
if (!erp_result_disass.IsSuccess) if (!erp_result_disass.IsSuccess)
return Result.ReFailure(erp_result_disass.Message, erp_result_disass.Status); return Result.ReFailure(erp_result_disass.Message, erp_result_disass.Status);
var erp_list_disass = erp_result_disass.Data; var erp_list_disass = erp_result_disass.Data;
erp_list.AddRange(erp_list_disass); erp_list.AddRange(erp_list_disass);
_logger.LogInformation("拆卸（子件入库）条数：" + erp_list_disass.Count);
return await this.SysnData(erp_list, isTransaction); return await this.SysnData(erp_list, isTransaction);
} }
@@ -312,8 +315,8 @@ namespace WMS.Web.Domain.Services
erp_list.RemoveAll(x => x.BillNo == item); 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中，那么就新增 //3.wms任务单的来源单据编号不存在于erp中，那么就新增
if (erp_list.Count != 0) if (erp_list.Count != 0)

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

@@ -650,6 +650,8 @@ namespace WMS.Web.Domain.Services.Public
lis.Type = (int)InstockType.Assembled; lis.Type = (int)InstockType.Assembled;
erp_list.Add(lis); erp_list.Add(lis);
} }
_logger.LogInformation("组装（成品入库）条数：" + erp_list.Count);
return ResultList<ErpInStockResultDto>.ReSuccess(erp_list); return ResultList<ErpInStockResultDto>.ReSuccess(erp_list);
} }
catch (Exception ex) catch (Exception ex)
@@ -754,6 +756,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Type = (int)InstockType.Assembled; lis.Type = (int)InstockType.Assembled;
erp_list.Add(lis); erp_list.Add(lis);
} }
_logger.LogInformation("拆卸（子件入库）条数：" + erp_list.Count);
return ResultList<ErpInStockResultDto>.ReSuccess(erp_list); return ResultList<ErpInStockResultDto>.ReSuccess(erp_list);
} }
catch (Exception ex) catch (Exception ex)