diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 4ba052a4..d6a1470e 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -492,9 +492,9 @@ namespace Myshipping.Application { itconfig.RemoveAll(x => x.ConfigId == ii.ConfigId); } - item.IsVGM=itgoods.Where(x => x.StatusName == "提交VGM").FirstOrDefault()==null?false:true; - item.IsCanDan = itgoods.Where(x => x.StatusName == "已订舱").FirstOrDefault() == null ? false : true; - item.IsZZFX = itgoods.Where(x => x.StatusName == "装载放行").FirstOrDefault() == null ? false : true; + item.IsVGM=itgoods.Where(x => x.StatusName == "提交VGM").FirstOrDefault()==null?null: itgoods.Where(x => x.StatusName == "提交VGM").Select(x=>x.FinishTime).FirstOrDefault(); + item.IsCanDan = itgoods.Where(x => x.StatusName == "已放舱").FirstOrDefault() == null ? null : itgoods.Where(x => x.StatusName == "已放舱").Select(x => x.FinishTime).FirstOrDefault(); + item.IsZZFX = itgoods.Where(x => x.StatusName == "装载放行").FirstOrDefault() == null ? null : itgoods.Where(x => x.StatusName == "装载放行").Select(x => x.FinishTime).FirstOrDefault(); item.GoodsStatusList = itgoods.Union(itconfig).OrderBy(x => x.Sort).ToList(); ////获取提箱返场状态 //var statuslog = statusloglist.Where(x => x.BookingId == item.Id).OrderByDescending(x => x.CreatedTime).ToList(); @@ -506,7 +506,7 @@ namespace Myshipping.Application //} var statusids = statusloglist.Where(x => x.BookingId == item.Id).Select(x => x.Id).ToList(); var dto = statuslogdetaillist.Where(x => statusids.Contains(x.PId)).ToList(); - List CNTRNODtolist =null; + List CNTRNODtolist =new List(); foreach (var d in dto) { var ctn = CNTRNODtolist.Where(x => x.CNTRNO == d.CNTRNO).FirstOrDefault(); @@ -550,7 +550,7 @@ namespace Myshipping.Application } - item.statuslogs = CNTRNODtolist; + item.statuslogs1 = CNTRNODtolist; } return list; @@ -871,9 +871,9 @@ namespace Myshipping.Application { itconfig.RemoveAll(x => x.ConfigId == ii.ConfigId); } - item.IsVGM = itgoods.Where(x => x.StatusName == "提交VGM").FirstOrDefault() == null ? false : true; - item.IsCanDan = itgoods.Where(x => x.StatusName == "已订舱").FirstOrDefault() == null ? false : true; - item.IsZZFX = itgoods.Where(x => x.StatusName == "装载放行").FirstOrDefault() == null ? false : true; + item.IsVGM = itgoods.Where(x => x.StatusName == "提交VGM").FirstOrDefault() == null ? null : itgoods.Where(x => x.StatusName == "提交VGM").Select(x => x.FinishTime).FirstOrDefault(); + item.IsCanDan = itgoods.Where(x => x.StatusName == "已放舱").FirstOrDefault() == null ? null : itgoods.Where(x => x.StatusName == "已放舱").Select(x => x.FinishTime).FirstOrDefault(); + item.IsZZFX = itgoods.Where(x => x.StatusName == "装载放行").FirstOrDefault() == null ? null : itgoods.Where(x => x.StatusName == "装载放行").Select(x => x.FinishTime).FirstOrDefault(); item.GoodsStatusList = itgoods.Union(itconfig).OrderBy(x => x.Sort).ToList(); //获取提箱返场状态 //var statuslog = statusloglist.Where(x => x.BookingId == item.Id).OrderByDescending(x => x.CreatedTime).ToList(); @@ -886,7 +886,7 @@ namespace Myshipping.Application //item.statuslogs = dto; var statusids = statusloglist.Where(x => x.BookingId == item.Id).Select(x => x.Id).ToList(); var dto = statuslogdetaillist.Where(x => statusids.Contains(x.PId)).ToList(); - List CNTRNODtolist = null; + List CNTRNODtolist = new List(); foreach (var d in dto) { var ctn = CNTRNODtolist.Where(x => x.CNTRNO == d.CNTRNO).FirstOrDefault(); @@ -930,7 +930,7 @@ namespace Myshipping.Application } - item.statuslogs = CNTRNODtolist; + item.statuslogs1 = CNTRNODtolist; } return list; diff --git a/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs b/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs index 68d2f91f..3fbeaf8e 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs @@ -814,7 +814,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto public List bookremark { get; set; } - public List statuslogs { get; set; } + public List statuslogs1 { get; set; } public List GoodsStatusList { get; set; } @@ -941,15 +941,15 @@ namespace Myshipping.Application.Service.BookingOrder.Dto /// /// 提交VGM /// - public bool IsVGM { get; set; } + public DateTime? IsVGM { get; set; } /// /// 提单舱单 /// - public bool IsCanDan { get; set; } + public DateTime? IsCanDan { get; set; } /// /// 装载放行 /// - public bool IsZZFX { get; set; } + public DateTime? IsZZFX { get; set; } } }