|
|
@ -576,6 +576,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
.GroupBy(p => new { p.LU, p.SettleGroupNum }) |
|
|
|
.Select(p => new JIT_UNSETTLED_DETAIL_DTO { LU = p.Key.LU, GroupNum = p.Key.SettleGroupNum, Qty = p.Sum(itm => itm.Qty.Value) }); |
|
|
|
entity.JIT_UNSETTLED_DETAIL = unsettledList.ToList().OrderBy(p => p.GroupNum).ThenBy(p => p.LU).ToList(); |
|
|
|
|
|
|
|
entity.INVOICE_MAP_GROUP =mdtos; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
if (first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO) |
|
|
|
{ |
|
|
@ -739,6 +744,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ |
|
|
|
{ |
|
|
|
_excel.Append(jitunsettle, "未结零件汇总"); |
|
|
|
} |
|
|
|
if (m != null) |
|
|
|
{ |
|
|
|
_excel.Append(m, "发票结算分组对应"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
//jis业务,发票分组对应关系,未结数据,调整数据
|
|
|
|
if (first.BusinessType == EnumBusinessType.JisBBAC || first.BusinessType == EnumBusinessType.JisHBPO || first.BusinessType == EnumBusinessType.ZhiGongJianHBPO) |
|
|
|