|
|
@ -200,6 +200,7 @@ namespace Myshipping.Application
|
|
|
|
result.extra = compareResult.extra;
|
|
|
|
result.extra = compareResult.extra;
|
|
|
|
result.extra2 = compareResult.extra2;
|
|
|
|
result.extra2 = compareResult.extra2;
|
|
|
|
result.total = compareResult.total;
|
|
|
|
result.total = compareResult.total;
|
|
|
|
|
|
|
|
result.yardStatInfo = compareResult.yardStatInfo;
|
|
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation("批次={no} 请求下货纸比对返回结果{msg}", batchNo, JSON.Serialize(compareResult));
|
|
|
|
_logger.LogInformation("批次={no} 请求下货纸比对返回结果{msg}", batchNo, JSON.Serialize(compareResult));
|
|
|
|
|
|
|
|
|
|
|
@ -443,5 +444,31 @@ namespace Myshipping.Application
|
|
|
|
return model;
|
|
|
|
return model;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#region 自动执行下货纸比对
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// 自动执行下货纸比对
|
|
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
/// <param name="bookingId">订舱主键</param>
|
|
|
|
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
|
|
|
|
[AllowAnonymous, HttpPost("/TaskShippingOrderCompare/ExcuteAutoShippingOrderCompare"), ApiUser(ApiCode = "ExcuteAutoShippingOrderCompare")]
|
|
|
|
|
|
|
|
public async Task<TaskManageExcuteResultDto> ExcuteAutoShippingOrderCompareAsync(string bookingId)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
string batchNo = IDGen.NextID().ToString();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_logger.LogInformation("批次={no}获取订舱数据请求规则 {id}", batchNo, bookingId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
处理逻辑
|
|
|
|
|
|
|
|
1、台账触发单票下货纸比对
|
|
|
|
|
|
|
|
2、调取订舱的详情。
|
|
|
|
|
|
|
|
3、对应请求报文。
|
|
|
|
|
|
|
|
4、请求比对接口。
|
|
|
|
|
|
|
|
5、返回回执。
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return await InnerExcuteShippingOrderCompareAsync(bookingId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|