From 6ff1b48229c3c8772fcd0b066eda53dbac3aa5a1 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Wed, 1 Feb 2023 17:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A1-VGM?= =?UTF-8?q?=E6=AF=94=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/TaskManageOrderExtMessageInfo.cs | 29 +++++++++++++++++++ .../Dtos/TaskManageOrderMessageMainInfo.cs | 5 ++++ .../TaskManagePlat/TaskManageService.cs | 19 +++++++++++- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderExtMessageInfo.cs diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderExtMessageInfo.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderExtMessageInfo.cs new file mode 100644 index 00000000..6310f465 --- /dev/null +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderExtMessageInfo.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Application +{ + /// + /// 任务扩展报文 + /// + public class TaskManageOrderExtMessageInfo + { + /// + /// 序列化报文 + /// + public string SerialMsg { get; set; } + + /// + /// 序列化报文类型 JSON-JSON序列化 + /// + public string SerialType { get; set; } + + /// + /// 业务类型 + /// + public string BusiType { get; set; } + } +} diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderMessageMainInfo.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderMessageMainInfo.cs index 1d93e803..f9772e5a 100644 --- a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderMessageMainInfo.cs +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageOrderMessageMainInfo.cs @@ -112,5 +112,10 @@ namespace Myshipping.Application /// 单票账单 /// public TaskManageOrderPerBillInfo PerBillInfo { get; set; } + + /// + /// 序列化报文详情 + /// + public TaskManageOrderExtMessageInfo SerialMsgInfo { get; set; } } } diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs index 6b5d95e4..3aec5e1b 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs @@ -377,6 +377,20 @@ namespace Myshipping.Application }); } + if (info.Main.SerialMsgInfo != null) + { + var storeInfo = new TaskStoreMsgInfo + { + PK_ID = IDGen.NextID().ToString(), + TASK_PKID = taskInfo.PK_ID, + MSG_JSON = info.Main.SerialMsgInfo.SerialMsg, + CreatedTime = taskInfo.CreatedTime, + UpdatedTime = taskInfo.CreatedTime, + }; + + await _taskStoreMsgInfoRepository.InsertAsync(storeInfo); + } + result.succ = true; result.msg = "新增任务成功"; } @@ -3035,6 +3049,8 @@ namespace Myshipping.Application TaskVgmCompareDto md = l.Adapt(); + md.compareDiffList = new List(); + if (currInfo != null) { if(l.SEALNO != currInfo.SEAL_NO) @@ -3089,6 +3105,8 @@ namespace Myshipping.Application TaskVgmCompareDto md = l.Adapt(); + md.compareDiffList = new List(); + if (currInfo != null) { if (l.SEAL_NO != currInfo.SEALNO) @@ -3538,7 +3556,6 @@ namespace Myshipping.Application } #endregion - #region 发送截单EDI /// /// 发送截单EDI