diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs index d9046d82..a6bbcfb0 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Dtos/Mapper/AddTaskPlatMapsterSetup.cs +++ b/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.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.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); + } } } } diff --git a/ds-wms-service/DS.WMS.TaskApi/Controllers/TaskShippingOrderCompareController.cs b/ds-wms-service/DS.WMS.TaskApi/Controllers/TaskShippingOrderCompareController.cs new file mode 100644 index 00000000..6a02ddfd --- /dev/null +++ b/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 +{ + /// + /// 下货纸比对 + /// + public class TaskShippingOrderCompareController : ApiController + { + private readonly ITaskShippingOrderCompareService _taskShippingOrderCompareService; + + public TaskShippingOrderCompareController(ITaskShippingOrderCompareService taskShippingOrderCompareService) + { + _taskShippingOrderCompareService = taskShippingOrderCompareService; + } + + #region 执行下货纸比对 + /// + /// 执行下货纸比对 + /// + /// 订舱主键 + /// 返回回执 + [HttpGet("ExcuteShippingOrderCompare")] + public async Task ExcuteShippingOrderCompareAsync(string bookingId) + { + return await _taskShippingOrderCompareService.ExcuteShippingOrderCompareAsync(bookingId); + } + #endregion + + #region 批量执行下货纸比对 + /// + /// 批量执行下货纸比对 + /// + /// 订舱主键组 + /// 返回回执 + [HttpPost("ExcuteShippingOrderCompareBatch")] + public async Task ExcuteShippingOrderCompareBatchAsync([FromBody] string[] bookingIds) + { + return await _taskShippingOrderCompareService.ExcuteShippingOrderCompareBatchAsync(bookingIds); + } + #endregion + + #region 获取下货纸比对结果 + /// + /// 获取下货纸比对结果 + /// + /// 订舱主键 + /// 返回回执 + [HttpGet("GetShippingOrderCompareResult")] + public async Task GetShippingOrderCompareResult(long bookingId) + { + return await _taskShippingOrderCompareService.GetShippingOrderCompareResult(bookingId); + } + #endregion + } +}