From f2c8d335235c5e56e97f2df57644d240ad5a45d6 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 6 Jan 2023 17:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ELARA=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Myshipping.Application.xml | 80 +++++++++++++++++++ .../Dtos/LaraPaperRegistPostDto.cs | 59 ++++++++++++++ .../Interface/ITaskManageService.cs | 19 +++++ .../TaskManagePlat/TaskManageService.cs | 65 ++++++++++++++- 4 files changed, 220 insertions(+), 3 deletions(-) create mode 100644 Myshipping.Application/Service/TaskManagePlat/Dtos/LaraPaperRegistPostDto.cs diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml index cf3b89a9..6a829e7e 100644 --- a/Myshipping.Application/Myshipping.Application.xml +++ b/Myshipping.Application/Myshipping.Application.xml @@ -12036,6 +12036,56 @@ 提单用纸数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 我的任务查询 @@ -12965,6 +13015,21 @@ 任务主键数组 返回结果 + + + LARA提单纸登记 + + 任务主键数组 + 返回结果 + + + + 请求提单纸登记 + + 任务主键 + 提单纸登记请求参数 + + 任务管理 @@ -13067,5 +13132,20 @@ 任务主键数组 返回结果 + + + 请求提单纸登记 + + 任务主键 + 提单纸登记请求参数 + + + + + LARA提单纸登记 + + 任务主键数组 + 返回结果 + diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/LaraPaperRegistPostDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/LaraPaperRegistPostDto.cs new file mode 100644 index 00000000..a9b4a101 --- /dev/null +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/LaraPaperRegistPostDto.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// + /// + public class LaraPaperRegistPostDto + { + /// + /// + /// + public string NumberFrom { get; set; } + + /// + /// + /// + public string NumberTo { get; set; } + + /// + /// + /// + public string PageNumbers { get; set; } + + /// + /// + /// + public int PageSum { get; set; } + + /// + /// + /// + public string ORDNO { get; set; } + + /// + /// + /// + public string TaskId { get; set; } + + /// + /// + /// + public string MBLNO { get; set; } + + /// + /// + /// + public DateTime OriginalDownTime { get; set; } = DateTime.MinValue; + + /// + /// + /// + public string ISSUETYPE { get; set; } + } +} diff --git a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs index 66aa4739..b650b940 100644 --- a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs @@ -1,5 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using NPOI.POIFS.Crypt.Dsig; +using NPOI.SS.Formula.Functions; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; @@ -78,5 +81,21 @@ namespace Myshipping.Application /// 返回结果 Task> LaraPaperCalc(string[] PKIds); + /// + /// LARA提单纸登记 + /// + /// 任务主键数组 + /// 返回结果 + Task LaraPaperRegist(string[] PKIds); + + + /// + /// 请求提单纸登记 + /// + /// 任务主键 + /// 提单纸登记请求参数 + /// + Task LaraPaperRegistPost(string taskPKIds, LaraPaperRegistPostDto model); + } } diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs index 2ae7a7d4..87c03251 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs @@ -53,7 +53,9 @@ namespace Myshipping.Application private readonly SqlSugarRepository _taskStatManageInfoRepository; private readonly SqlSugarRepository _taskOriginalDownloadHisInfoRepository; private readonly SqlSugarRepository _taskChargesHisInfoRepository; - + + private readonly SqlSugarRepository _bookingOrderRepository; + private readonly IDjyWebsiteAccountConfigService _webAccountConfig; private readonly ISysCacheService _cache; private readonly ILogger _logger; @@ -72,6 +74,7 @@ namespace Myshipping.Application SqlSugarRepository taskStatManageInfoRepository, SqlSugarRepository taskOriginalDownloadHisInfoRepository, SqlSugarRepository taskChargesHisInfoRepository, + SqlSugarRepository bookingOrderRepository, IDjyWebsiteAccountConfigService webAccountConfig, ISysCacheService cache, ILogger logger) @@ -87,6 +90,7 @@ namespace Myshipping.Application _taskStatManageInfoRepository = taskStatManageInfoRepository; _taskOriginalDownloadHisInfoRepository = taskOriginalDownloadHisInfoRepository; _taskChargesHisInfoRepository = taskChargesHisInfoRepository; + _bookingOrderRepository = bookingOrderRepository; _webAccountConfig = webAccountConfig; _cache = cache; @@ -1099,7 +1103,7 @@ namespace Myshipping.Application } #endregion - + #region 提单纸页数计算 /// /// 提单纸页数计算 /// @@ -1164,12 +1168,67 @@ namespace Myshipping.Application } catch (Exception ex) { - throw Oops.Bah($"完成任务异常,{0}", ex.Message); + throw Oops.Bah($"提单纸页数计算异常,{0}", ex.Message); } return list; } + #endregion + + /// + /// 请求提单纸登记 + /// + /// 任务主键 + /// 提单纸登记请求参数 + /// + public async Task LaraPaperRegistPost(string taskPKIds, LaraPaperRegistPostDto model) + { + TaskManageOrderResultDto result = new TaskManageOrderResultDto(); + + string batchNo = IDGen.NextID().ToString(); + + _logger.LogInformation("批次={no} id={id} LARA提单纸登记开始", batchNo, taskPKIds); + + try + { + + } + catch (Exception ex) + { + throw Oops.Bah($"请求提单纸登记异常,{0}", ex.Message); + } + + return result; + } + + + #region LARA提单纸登记 + /// + /// LARA提单纸登记 + /// + /// 任务主键数组 + /// 返回结果 + public async Task LaraPaperRegist(string[] PKIds) + { + TaskManageOrderResultDto result = new TaskManageOrderResultDto(); + + string batchNo = IDGen.NextID().ToString(); + + _logger.LogInformation("批次={no} ids={ids} LARA提单纸登记开始", batchNo, string.Join(",", PKIds)); + + try + { + + } + catch (Exception ex) + { + throw Oops.Bah($"LARA提单纸登记异常,{0}", ex.Message); + } + + return result; + } + #endregion }