|
|
@ -2,6 +2,7 @@
|
|
|
|
using Furion.FriendlyException;
|
|
|
|
using Furion.FriendlyException;
|
|
|
|
using Mapster;
|
|
|
|
using Mapster;
|
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
|
|
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
|
|
using Myshipping.Application.Entity;
|
|
|
|
using Myshipping.Application.Entity;
|
|
|
|
using Myshipping.Application.Service.TaskManagePlat.Interface;
|
|
|
|
using Myshipping.Application.Service.TaskManagePlat.Interface;
|
|
|
|
using Myshipping.Core;
|
|
|
|
using Myshipping.Core;
|
|
|
@ -40,7 +41,7 @@ namespace Myshipping.Application
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="pkId">BC主键</param>
|
|
|
|
/// <param name="pkId">BC主键</param>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
[HttpGet("/BookingMSKAPI/GetVGMSubmissionInfo")]
|
|
|
|
[HttpGet("/TaskManageVGM/GetVGMSubmissionInfo")]
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMSubmissionInfo(string pkId)
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMSubmissionInfo(string pkId)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
@ -78,7 +79,7 @@ namespace Myshipping.Application
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="taskPkId">VGM任务主键</param>
|
|
|
|
/// <param name="taskPkId">VGM任务主键</param>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
[HttpGet("/BookingMSKAPI/GetVGMSubmissionInfoByTaskId")]
|
|
|
|
[HttpGet("/TaskManageVGM/GetVGMSubmissionInfoByTaskId")]
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMSubmissionInfoByTaskId(string taskPkId)
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMSubmissionInfoByTaskId(string taskPkId)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
@ -121,7 +122,7 @@ namespace Myshipping.Application
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="pkId">BC主键</param>
|
|
|
|
/// <param name="pkId">BC主键</param>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
[HttpGet("/BookingMSKAPI/GetVGMMissingInfo")]
|
|
|
|
[HttpGet("/TaskManageVGM/GetVGMMissingInfo")]
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMMissingInfo(string pkId)
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMMissingInfo(string pkId)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
@ -134,7 +135,7 @@ namespace Myshipping.Application
|
|
|
|
var CtnList = _taskVGMCtnInfoRepository.AsQueryable()
|
|
|
|
var CtnList = _taskVGMCtnInfoRepository.AsQueryable()
|
|
|
|
.Where(a => a.P_ID == pkId).ToList();
|
|
|
|
.Where(a => a.P_ID == pkId).ToList();
|
|
|
|
|
|
|
|
|
|
|
|
if (CtnList.Count == 0)
|
|
|
|
if (CtnList.Count > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
list = CtnList.OrderBy(p => p.P_ID).ThenBy(p => p.CNTRNO).Select(p =>
|
|
|
|
list = CtnList.OrderBy(p => p.P_ID).ThenBy(p => p.CNTRNO).Select(p =>
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -159,7 +160,7 @@ namespace Myshipping.Application
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="taskPkId">VGM任务主键</param>
|
|
|
|
/// <param name="taskPkId">VGM任务主键</param>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
/// <returns>返回回执</returns>
|
|
|
|
[HttpGet("/BookingMSKAPI/GetVGMMissingInfoByTaskId")]
|
|
|
|
[HttpGet("/TaskManageVGM/GetVGMMissingInfoByTaskId")]
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMMissingInfoByTaskId(string taskPkId)
|
|
|
|
public async Task<List<TaskVGMShowDto>> GetVGMMissingInfoByTaskId(string taskPkId)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
|
List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
|
|
|
@ -200,5 +201,16 @@ namespace Myshipping.Application
|
|
|
|
return list;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
|
|
/// 发送VGM未提交通知(钉钉消息、邮件通知)
|
|
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
/// <param name="taskPkId"></param>
|
|
|
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
|
|
|
[HttpGet("/TaskManageVGM/SendVGMMissingNotice")]
|
|
|
|
|
|
|
|
public async Task<TaskManageOrderResultDto> SendVGMMissingNotice(string taskPkId)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|