|
|
@ -348,16 +348,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
} |
|
|
|
if (first.BusinessType == EnumBusinessType.MaiDanJianHBPO) |
|
|
|
{ |
|
|
|
List<MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO> maidan = new List<MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO>(); |
|
|
|
foreach (var itm in m) |
|
|
|
//List<MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO> maidan = new List<MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO>();
|
|
|
|
|
|
|
|
var maiquery = from itm in m |
|
|
|
join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum |
|
|
|
select |
|
|
|
new MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO() |
|
|
|
{ |
|
|
|
maidan.Add(new MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO() { |
|
|
|
Extend1=itm.Extend1, |
|
|
|
InvGroupNum=itm.InvGroupNum, |
|
|
|
SettleGroupNum=itm.SettleGroupNum |
|
|
|
}); |
|
|
|
} |
|
|
|
entity.MAIDAN_HBPO_INVOICE_MAP_GROUP = maidan; |
|
|
|
Extend1 = itm.Extend1, |
|
|
|
InvGroupNum = itm.InvGroupNum, |
|
|
|
SettleGroupNum = itm.SettleGroupNum, |
|
|
|
InvbillNum = itm.InvbillNum, |
|
|
|
RealInvBillNum = itm1.RealnvBillNum |
|
|
|
}; |
|
|
|
|
|
|
|
entity.MAIDAN_HBPO_INVOICE_MAP_GROUP = maiquery.ToList(); |
|
|
|
List<MAIDAN_HBPO_UNSETTLED_DETAIL_DTO> unsettle = new List<MAIDAN_HBPO_UNSETTLED_DETAIL_DTO>(); |
|
|
|
foreach (var itm in notquery.ToList()) |
|
|
|
{ |
|
|
@ -368,6 +373,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
entity.MAIDAN_HBPO_UNSETTLED_DETAIL = unsettle; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
@ -434,6 +440,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
var unsettle = invdetail.UNSETTLED_DETAIL;//全部未结明细
|
|
|
|
var hbpom = invdetail.MAIDAN_HBPO_INVOICE_MAP_GROUP;//买单HBPO分组对应
|
|
|
|
var hbpounsettle = invdetail.MAIDAN_HBPO_UNSETTLED_DETAIL;//买单HBPO未结
|
|
|
|
var jitunsettle = invdetail.JIT_UNSETTLED_DETAIL;//买单HBPO未结
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -466,14 +474,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
{ |
|
|
|
_excel.Append(hbpom, "发票结算分组对应"); |
|
|
|
} |
|
|
|
if (unsettle != null) |
|
|
|
if (hbpounsettle != null) |
|
|
|
{ |
|
|
|
_excel.Append(unsettle, "未结零件汇总"); |
|
|
|
_excel.Append(hbpounsettle, "未结零件汇总"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC) |
|
|
|
{ |
|
|
|
_excel.Append(unsettle, "未结零件结算汇总"); |
|
|
|
_excel.Append(unsettle, "未结零件汇总"); |
|
|
|
} |
|
|
|
//jis业务,发票分组对应关系,未结数据,调整数据
|
|
|
|
if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO) |
|
|
|