From 6e6624d51230f0b4ab6be17ffcdddeb36a2558d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 19 Sep 2023 15:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Dtos/INVOICE_GRP_DTO.cs | 15 +++++++- .../Entities/BQ/BBAC_BA_SERVICE.cs | 3 +- .../Entities/BQ/INVOICE_SERVICE.cs | 36 +++++++++++-------- .../Entities/BQ/PUB_NOT_SA_SERVICE.cs | 3 -- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs index 9c373a32..543ce7a4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs +++ b/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 { + /// ///发票分组号 /// [Display(Name = "发票分组号")] public string InvGroupNum { get; set; } + + [Display(Name = "金税发票")] + public string RealInvBillNum { get; set; } + + [Display(Name = "发票日期")] + public DateTime? InvDate { set; get; } + + /// + ///发票号 + /// + [Display(Name = "发票号")] + public string InvbillNum { get; set; } /// ///结算分组号 /// [Display(Name = "五联单号")] public string SettleGroupNum { get; set; } - [Display(Name = "现生产码")] + [Display(Name = "现产品生产码")] public string Extend1 { get; set; } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 079b9452..763d66f0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/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(); var adjlist = ObjectMapper.Map, List>(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();//价格单 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 8731ecdb..9b68ff22 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/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 = new List(); - foreach (var itm in m) - { - 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; + //List maidan = new List(); + + var maiquery = from itm in m + join itm1 in invs on itm.InvbillNum equals itm1.InvbillNum + select + new MAIDAN_HBPO_INVOICE_MAP_GROUP_DTO() + { + Extend1 = itm.Extend1, + InvGroupNum = itm.InvGroupNum, + SettleGroupNum = itm.SettleGroupNum, + InvbillNum = itm.InvbillNum, + RealInvBillNum = itm1.RealnvBillNum + }; + + entity.MAIDAN_HBPO_INVOICE_MAP_GROUP = maiquery.ToList(); List unsettle = new List(); foreach (var itm in notquery.ToList()) { @@ -368,6 +373,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ }); } + entity.MAIDAN_HBPO_UNSETTLED_DETAIL = unsettle; } @@ -434,7 +440,9 @@ 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未结 + + var classDisplayName = typeof(INVOICE_GRP_DTO).GetCustomAttribute()?.Name ?? typeof(INVOICE_GRP_DTO).Name; @@ -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) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs index 64eb7291..db1e986f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs +++ b/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 = "生成成功" }); - } }