修改下货纸比对

ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs

@@ -2,6 +2,7 @@
 using DS.WMS.Core.TaskPlat.Entity;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
+using static Org.BouncyCastle.Math.EC.ECCurve;
 
 namespace DS.WMS.Core.TaskPlat.Dtos.Mapper
 {
@@ -392,6 +393,47 @@ namespace DS.WMS.Core.TaskPlat.Dtos.Mapper
                 //.Map(dest => dest.Remark, src => src.REMARK);
             }
 
+            {
+                TypeAdapterConfig<SeaExport, TaskMessageMain>.NewConfig().TwoWays()
+                .Map(dest => dest.BookingNo, src => src.BookingNo)
+                //.Map(dest => dest.TenantId, src => src.TenantId)
+                //.Map(dest => dest.TenantName, src => src.TenantName)
+                //.Map(dest => dest.YardCode, src => src.YARDID)
+                .Map(dest => dest.YardCName, src => src.Yard)
+                .Map(dest => dest.VesselName, src => src.Vessel)
+                .Map(dest => dest.VoyNo, src => src.Voyno)
+                .Map(dest => dest.MasterBlNo, src => src.MBLNO)
+                .Map(dest => dest.HouseBlNo, src => src.HBLNO)
+                //.Map(dest => dest.PortLoadId, src => src.PORTLOADID)
+                .Map(dest => dest.PortLoad, src => src.LoadPort)
+                //.Map(dest => dest.PortDischargeId, src => src.dich)
+                .Map(dest => dest.PortDischarge, src => src.DischargePort)
+                .Map(dest => dest.TransportId, src => src.TransPortCode)
+                .Map(dest => dest.Transport, src => src.TransPort)
+                //.Map(dest => dest.PlaceDeliveryId, src => src.DeliveryPlaceId)
+                .Map(dest => dest.PlaceDelivery, src => src.DeliveryPlace)
+                //.Map(dest => dest.DestinationId, src => src.DESTINATIONID)
+                .Map(dest => dest.Destination, src => src.Destination)
+                .Map(dest => dest.PKGs, src => src.PKGS)
+                .Map(dest => dest.KGs, src => src.KGS)
+                .Map(dest => dest.CBM, src => src.CBM)
+                .Map(dest => dest.GoodsDescription, src => src.Destination);
+                //.Map(dest => dest.CarrierCode, src => src.carr);
+            }
+
+            {
+                TypeAdapterConfig<OpCtn, TaskMessageCtnInfo>.NewConfig().TwoWays()
+                .Map(dest => dest.ContaType, src => src.CtnCode)
+                .Map(dest => dest.ContaTypeName, src => src.CtnAll)
+                .Map(dest => dest.ContaNo, src => src.CntrNo)
+                .Map(dest => dest.SealNo, src => src.SealNo)
+                .Map(dest => dest.KindPKGs, src => src.KindPkgs)
+                .Map(dest => dest.TareWeight, src => src.TareWeight)
+                .Map(dest => dest.PKGs, src => src.PKGS)
+                .Map(dest => dest.KGs, src => src.KGS)
+                .Map(dest => dest.CBM, src => src.CBM)
+                .Map(dest => dest.CtnNum, src => src.CtnNum);
+            }
         }
     }
 }

ds-wms-service/DS.WMS.TaskApi/Controllers/TaskShippingOrderCompareController.cs

@@ -0,0 +1,59 @@
+using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.TaskPlat.Interface;
+using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula.Functions;
+
+namespace DS.WMS.TaskApi.Controllers
+{
+    /// <summary>
+    /// 下货纸比对
+    /// </summary>
+    public class TaskShippingOrderCompareController : ApiController
+    {
+        private readonly ITaskShippingOrderCompareService _taskShippingOrderCompareService;
+
+        public TaskShippingOrderCompareController(ITaskShippingOrderCompareService taskShippingOrderCompareService)
+        {
+            _taskShippingOrderCompareService = taskShippingOrderCompareService;
+        }
+
+        #region 执行下货纸比对
+        /// <summary>
+        /// 执行下货纸比对
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        [HttpGet("ExcuteShippingOrderCompare")]
+        public async Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareAsync(string bookingId)
+        {
+            return await _taskShippingOrderCompareService.ExcuteShippingOrderCompareAsync(bookingId);
+        }
+        #endregion
+
+        #region 批量执行下货纸比对
+        /// <summary>
+        /// 批量执行下货纸比对
+        /// </summary>
+        /// <param name="bookingIds">订舱主键组</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("ExcuteShippingOrderCompareBatch")]
+        public async Task<TaskManageExcuteResultDto> ExcuteShippingOrderCompareBatchAsync([FromBody] string[] bookingIds)
+        {
+            return await _taskShippingOrderCompareService.ExcuteShippingOrderCompareBatchAsync(bookingIds);
+        }
+        #endregion
+
+        #region 获取下货纸比对结果
+        /// <summary>
+        /// 获取下货纸比对结果
+        /// </summary>
+        /// <param name="bookingId">订舱主键</param>
+        /// <returns>返回回执</returns>
+        [HttpGet("GetShippingOrderCompareResult")]
+        public async Task<TaskManageExcuteResultDto> GetShippingOrderCompareResult(long bookingId)
+        {
+            return await _taskShippingOrderCompareService.GetShippingOrderCompareResult(bookingId);
+        }
+        #endregion
+    }
+}