Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/Para/ParaService.cs

@@ -612,6 +612,7 @@ namespace Myshipping.Application
                     info.LANE_CODE = model.LaneCode?.Trim();
                     info.LANE_CNAME = model.LaneCName?.Trim();
                     info.POD_CODE = model.PODCode?.Trim();
+                    info.CARRIER_CODE = model.CarrierCode?.Trim();
 
                     await _paraContractNoInfoRepository.AsUpdateable(info).IgnoreColumns(it => new
                     {

Myshipping.Application/Service/TaskManagePlat/Dtos/ShippingOrderCompareCallBackInfo.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    /// <summary>
+    /// 下货纸比对回写
+    /// </summary>
+    public class ShippingOrderCompareCallBackInfo
+    {
+        /// <summary>
+        /// 请求主键
+        /// </summary>
+        public string reqBusiId { get; set; }
+
+        /// <summary>
+        /// 比对ID
+        /// </summary>
+        public string compareId { get; set; }
+
+        /// <summary>
+        /// 下货纸比对方式  MANUAL-手动 AUTO-自动
+        /// </summary>
+        public string compareMode { get; set; } = "AUTO";
+
+        /// <summary>
+        /// 比对结果代码
+        /// </summary>
+        public string compareRltCode { get; set; }
+
+        /// <summary>
+        /// 比对结果名称
+        /// </summary>
+        public string compareRltName { get; set; }
+
+        /// <summary>
+        /// 比对日期
+        /// </summary>
+        public DateTime compareDate { get; set; }
+
+        /// <summary>
+        /// 比对详情
+        /// </summary>
+        public List<CompareResultDetailInfo> compareDetailList { get; set; }
+    }
+}

Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs

@@ -26,12 +26,11 @@ namespace Myshipping.Application
         /// <returns>返回回执</returns>
         Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareBatchAsync(string[] bookingIds);
 
-
         /// <summary>
-        /// 批量执行下货纸比对
+        /// 下货纸自动比对回写状态
         /// </summary>
-        /// <param name="bookingIds">订舱主键组</param>
+        /// <param name="model">比对回写详情</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync(string[] bookingIds);
+        Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync(ShippingOrderCompareCallBackInfo model);
     }
 }

Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs

@@ -6,12 +6,15 @@ using Furion.FriendlyException;
 using Furion.JsonSerialization;
 using Furion.RemoteRequest.Extensions;
 using Mapster;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Myshipping.Application.Entity;
 using Myshipping.Core;
 using Myshipping.Core.Entity;
 using Myshipping.Core.Service;
+using Org.BouncyCastle.Asn1.X9;
+using StackExchange.Profiling.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -278,14 +281,69 @@ namespace Myshipping.Application
 
 
         /// <summary>
-        /// 批量执行下货纸比对
+        /// 下货纸自动比对回写状态
         /// </summary>
-        /// <param name="bookingIds">订舱主键组</param>
+        /// <param name="model">比对回写详情</param>
         /// <returns>返回回执</returns>
-        public async Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync(string[] bookingIds)
+        [AllowAnonymous, HttpPost("/TaskShippingOrderCompare/AutoTaskShippingOrderCompareCallBack")]
+        public async Task<TaskManageExcuteResultDto> AutoTaskShippingOrderCompareCallBackAsync([FromBody] ShippingOrderCompareCallBackInfo model)
         {
-            return new TaskManageExcuteResultDto();
+            TaskManageExcuteResultDto result = new TaskManageExcuteResultDto();
+
+            try
+            {
+                if(string.IsNullOrWhiteSpace(model.reqBusiId))
+                    throw Oops.Oh($"订舱主键{model.reqBusiId}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareId))
+                    throw Oops.Oh($"比对ID{model.compareId}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareMode))
+                    throw Oops.Oh($"下货纸比对方式不能为空{model.compareMode}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareRltCode))
+                    throw Oops.Oh($"比对结果代码{model.compareRltCode}不能为空");
+
+                if (string.IsNullOrWhiteSpace(model.compareRltName))
+                    throw Oops.Oh($"比对结果名称{model.compareId}不能为空");
+
+                var bookingOrder = await _bookingOrderRepository.AsQueryable()
+                    .FirstAsync(a => a.Id == long.Parse(model.reqBusiId));
+
+                if (bookingOrder == null)
+                {
+                    throw Oops.Oh($"订舱信息检索失败，ID={model.reqBusiId}");
+                }
+
+                bookingOrder.LstShipOrderCompareId = model.compareId;
+                bookingOrder.LstShipOrderCompareDate = model.compareDate;
+                bookingOrder.LstShipOrderCompareRlt = model.compareRltCode;
+                bookingOrder.LstShipOrderCompareRltName = model.compareRltName;
+                bookingOrder.LstShipOrderCompareMode = model.compareMode;
+
+                //更新
+                await _bookingOrderRepository.AsUpdateable(bookingOrder).UpdateColumns(it => new
+                {
+                    it.LstShipOrderCompareId,
+                    it.LstShipOrderCompareDate,
+                    it.LstShipOrderCompareRlt,
+                    it.LstShipOrderCompareRltName,
+                    it.LstShipOrderCompareMode,
+                }).ExecuteCommandAsync();
+
+                result.succ = true;
+                result.msg = "更新完成";
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"下货纸自动比对回写状态失败,{ex.Message}";
+            }
+
+            return result;
         }
+
+
         /// <summary>
         /// 生成请求规则报文
         /// </summary>