|
|
|
@ -547,9 +547,8 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
{
|
|
|
|
@ -599,7 +598,21 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
var withDispatchList =
|
|
|
|
|
_taskRollingNominationInfoRepository.AsQueryable().Filter(null, true)
|
|
|
|
|
.InnerJoin<TaskRollingNominationDetailInfo>((nom,detail)=> nom.PK_ID == detail.NOM_ID)
|
|
|
|
|
.LeftJoin<TaskRollingNominationDispatchInfo>((nom,detail, dispatch) =>
|
|
|
|
|
detail.PK_ID == dispatch.DETAIL_ID && dispatch.IsDeleted == false)
|
|
|
|
|
.Where((nom,detail, dispatch) =>
|
|
|
|
|
nom.TASK_ID == taskPkId && detail.IsDeleted == false && string.IsNullOrWhiteSpace(dispatch.TASK_ID))
|
|
|
|
|
.Select((nom, detail, dispatch) => new { Detail = detail}).ToList();
|
|
|
|
|
|
|
|
|
|
if (withDispatchList.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
result.ext = withDispatchList.Select(a => a.Detail.Adapt<TaskRollingNominationShipDetailShowDto>()).ToList();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result.succ = true;
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
{
|
|
|
|
|