Commit 8507948b authored by liudong1993's avatar liudong1993

1

parent d70cd14b
...@@ -5090,7 +5090,7 @@ namespace REBORN.Module.SellModule ...@@ -5090,7 +5090,7 @@ namespace REBORN.Module.SellModule
var invoiceApplyList = invoiceApplyRepository.GetList(new RB_Travel_InvoiceApply_Extend { QOrderIds = orderIds, InvoiceApplyType = Common.Enum.Dmc.InvoiceApplyTypeEnum.SingleTicket }); var invoiceApplyList = invoiceApplyRepository.GetList(new RB_Travel_InvoiceApply_Extend { QOrderIds = orderIds, InvoiceApplyType = Common.Enum.Dmc.InvoiceApplyTypeEnum.SingleTicket });
//出境合同 //出境合同
var contractList = contractRepository.GetContractListRepository("", orderIds); //var contractList = contractRepository.GetContractListRepository("", orderIds);
List<RB_Travel_Guest_Extend> guestlist = new List<RB_Travel_Guest_Extend>(); List<RB_Travel_Guest_Extend> guestlist = new List<RB_Travel_Guest_Extend>();
RB_Travel_Guest_Extend guestmodel = new RB_Travel_Guest_Extend() RB_Travel_Guest_Extend guestmodel = new RB_Travel_Guest_Extend()
{ {
...@@ -5142,7 +5142,8 @@ namespace REBORN.Module.SellModule ...@@ -5142,7 +5142,8 @@ namespace REBORN.Module.SellModule
} }
item.InvoiceApplyList = invoiceApplyList?.Where(x => x.OrderId == item.OrderId).ToList() ?? new List<RB_Travel_InvoiceApply_Extend>(); item.InvoiceApplyList = invoiceApplyList?.Where(x => x.OrderId == item.OrderId).ToList() ?? new List<RB_Travel_InvoiceApply_Extend>();
item.LossList = lossList.Where(x => x.OrderId == item.OrderId).ToList(); item.LossList = lossList.Where(x => x.OrderId == item.OrderId).ToList();
item.ContractNum = contractList?.Where(qitem => qitem.OrderId == item.OrderId)?.ToList() ?? new List<RB_Contract_Extend>(); //item.ContractNum = contractList?.Where(qitem => qitem.OrderId == item.OrderId)?.ToList() ?? new List<RB_Contract_Extend>();
item.ContractNum = new List<RB_Contract_Extend>();
item.SupplierModel = item.SupplierId > 0 ? (supplierList?.FirstOrDefault(x => x.ID == item.SupplierId) ?? new RB_Supplier_Extend()) : new RB_Supplier_Extend(); item.SupplierModel = item.SupplierId > 0 ? (supplierList?.FirstOrDefault(x => x.ID == item.SupplierId) ?? new RB_Supplier_Extend()) : new RB_Supplier_Extend();
item.AppointOPList = appointOPList.Where(x => x.OrderId == item.OrderId)?.ToList() ?? new List<RB_Appoint_OP_Extend>(); item.AppointOPList = appointOPList.Where(x => x.OrderId == item.OrderId)?.ToList() ?? new List<RB_Appoint_OP_Extend>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment