|
@ -581,8 +581,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
SettleGroupNum = p.FirstOrDefault().SettleGroupNum, |
|
|
SettleGroupNum = p.FirstOrDefault().SettleGroupNum, |
|
|
} |
|
|
} |
|
|
); |
|
|
); |
|
|
if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC)//BBAC直供未结
|
|
|
if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC || first.BusinessType==EnumBusinessType.YinDuJian)//BBAC直供未结
|
|
|
{ |
|
|
{ |
|
|
|
|
|
entity.INVOICE_MAP_GROUP = mdtos; |
|
|
//var all = entity.INVOICE_NOT_SETTLE.Select(p => p.SettleGroupNum).Distinct().ToList();//全部分组号
|
|
|
//var all = entity.INVOICE_NOT_SETTLE.Select(p => p.SettleGroupNum).Distinct().ToList();//全部分组号
|
|
|
//var part = mquery.ToList().Select(p => p.SettleGroupNum).Distinct().ToList();//发票对应分组号
|
|
|
//var part = mquery.ToList().Select(p => p.SettleGroupNum).Distinct().ToList();//发票对应分组号
|
|
|
//var unsettled = all.Where(p => !part.Contains(p));//排除发票对应分组号,都为不可结
|
|
|
//var unsettled = all.Where(p => !part.Contains(p));//排除发票对应分组号,都为不可结
|
|
@ -747,12 +748,16 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
_excel.Append(hbpounsettle, "未结零件汇总"); |
|
|
_excel.Append(hbpounsettle, "未结零件汇总"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC) |
|
|
if (first.BusinessType == EnumBusinessType.ZhiGongJianBBAC || first.BusinessType== EnumBusinessType.YinDuJian) |
|
|
{ |
|
|
{ |
|
|
if (jitunsettle != null) |
|
|
if (jitunsettle != null) |
|
|
{ |
|
|
{ |
|
|
_excel.Append(jitunsettle, "未结零件汇总"); |
|
|
_excel.Append(jitunsettle, "未结零件汇总"); |
|
|
} |
|
|
} |
|
|
|
|
|
if (m != null) |
|
|
|
|
|
{ |
|
|
|
|
|
_excel.Append(m, "发票结算分组对应");//发票分组对应结算号
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
//jis业务,发票分组对应关系,未结数据,调整数据
|
|
|
//jis业务,发票分组对应关系,未结数据,调整数据
|
|
|
if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO) |
|
|
if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO) |
|
|