Browse Source

更新版本

master
学 赵 1 year ago
parent
commit
6e6624d512
  1. 15
      code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
  2. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs
  3. 32
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  4. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs

15
code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs

@ -652,18 +652,31 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
public class MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO
{
/// <summary>
///发票分组号
/// </summary>
[Display(Name = "发票分组号")]
public string InvGroupNum { get; set; }
[Display(Name = "金税发票")]
public string RealInvBillNum { get; set; }
[Display(Name = "发票日期")]
public DateTime? InvDate { set; get; }
/// <summary>
///发票号
/// </summary>
[Display(Name = "发票号")]
public string InvbillNum { get; set; }
/// <summary>
///结算分组号
/// </summary>
[Display(Name = "五联单号")]
public string SettleGroupNum { get; set; }
[Display(Name = "现生产码")]
[Display(Name = "现产品生产码")]
public string Extend1 { get; set; }
}

3
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs

@ -337,7 +337,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{
return new JsonResult(new { Code = 400, Message = "请下载错误模版", fileName = result });
}
var invBilllist = new List<INVOICE_WAIT_DETAIL_DTO>();
var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
if (adjlist == null && adjlist.Count == 0)
@ -398,7 +397,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
));
}
}
var entitys = bbaclist;//合并库存调整单和发票可结算明细数据
var entitys = bbaclist;//合并库存调整单和发票可结算明细数据
var gNumList = entitys.Select(p => p.GroupNum).Distinct().ToList();
var priceList = _priceRepository.ToList();//价格单

32
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs

@ -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)

3
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs

@ -25,7 +25,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
PUB_NOT_SA_DETAIL_EXP_DTO>
{
private readonly PUB_NOT_SA_MNG _pubNotMng;
public PUB_NOT_SA_SERVICE(IExcelImportAppService excelImportService,
ISnowflakeIdGenerator snowflakeIdGenerator,
ICommonManager commonManager,
@ -57,9 +56,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errorlist).ConfigureAwait(false) });
}
}
return new JsonResult(new { Code = 200, Message = "生成成功" });
}
}

Loading…
Cancel
Save