diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageExcuteResultDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageExcuteResultDto.cs index 6760c36a..742e92c1 100644 --- a/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageExcuteResultDto.cs +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageExcuteResultDto.cs @@ -50,6 +50,11 @@ namespace Myshipping.Application /// 扩展值 /// public object extra3 { get; set; } + + /// + /// 场站统计详情 + /// + public YardStatInfo yardStatInfo { get; set; } } public class CompareResultInfo @@ -217,4 +222,25 @@ namespace Myshipping.Application /// public object extra3 { get; set; } } + + /// + /// 下货纸场站箱信息统计 + /// + public class YardStatInfo + { + /// + /// 总箱数 + /// + public int ContaNum { get; set; } + + /// + /// 最新返场日期 + /// + public Nullable LstReturnYardDate { get; set; } + + /// + /// 有返场日期箱数 + /// + public int ExistsReturnYardDateCtnNum { get; set; } + } } diff --git a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs index f89c26e9..0322deb9 100644 --- a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskShippingOrderCompareService.cs @@ -32,5 +32,12 @@ namespace Myshipping.Application /// 比对回写详情 /// 返回回执 Task AutoTaskShippingOrderCompareCallBackAsync(ShippingOrderCompareCallBackInfo model); + + /// + /// 自动执行下货纸比对 + /// + /// 订舱主键 + /// 返回回执 + Task ExcuteAutoShippingOrderCompareAsync(string bookingId); } } diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs index 5cbd65ce..77ecc6b8 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskShippingOrderCompareService.cs @@ -200,6 +200,7 @@ namespace Myshipping.Application result.extra = compareResult.extra; result.extra2 = compareResult.extra2; result.total = compareResult.total; + result.yardStatInfo = compareResult.yardStatInfo; _logger.LogInformation("批次={no} 请求下货纸比对返回结果{msg}", batchNo, JSON.Serialize(compareResult)); @@ -443,5 +444,31 @@ namespace Myshipping.Application return model; } #endregion + + #region 自动执行下货纸比对 + /// + /// 自动执行下货纸比对 + /// + /// 订舱主键 + /// 返回回执 + [AllowAnonymous, HttpPost("/TaskShippingOrderCompare/ExcuteAutoShippingOrderCompare"), ApiUser(ApiCode = "ExcuteAutoShippingOrderCompare")] + public async Task ExcuteAutoShippingOrderCompareAsync(string bookingId) + { + string batchNo = IDGen.NextID().ToString(); + + _logger.LogInformation("批次={no}获取订舱数据请求规则 {id}", batchNo, bookingId); + + /* + 处理逻辑 + 1、台账触发单票下货纸比对 + 2、调取订舱的详情。 + 3、对应请求报文。 + 4、请求比对接口。 + 5、返回回执。 + */ + + return await InnerExcuteShippingOrderCompareAsync(bookingId); + } + #endregion } }