From 5496b801248219f4abf3f7a9fb8ec2767e779dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 31 Aug 2023 08:48:17 +0800 Subject: [PATCH 1/2] =?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/BBAC_CAN_SA_DTO.cs | 10 ++++++++-- .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs index dd566463..40af1fa0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs @@ -42,7 +42,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public class BBAC_CAN_SA_DETAIL_DTO : EntityDto { - + + [ExporterHeader(DisplayName = "关联结算单号")] //全部业务都有显示 public string SettleBillNum { get; set; } [ExporterHeader(DisplayName = "发票分组号")] //全部业务都显示 （默认） @@ -63,10 +64,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public decimal Qty { get; set; } [ExporterHeader(DisplayName = "结算分组号")] //全部业务都显示 （查询条件） public string GroupNum { get; set; } - [ExporterHeader(DisplayName = "工厂地点")] //HBPO-JIS业务显示 + [ExporterHeader(DisplayName = "工厂地点")] //HBPO-JIS业务显示 public string Site { get; set; } [ExporterHeader(DisplayName = "是否退货")] //BBAC-JIS显示 其他没有这个字段 public string IsReturn { get; set; } + + [ExporterHeader(DisplayName = "合同号")] + public int ContractDocID { set; get; } + + /// /// 版本 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs index a7581ef0..2c1146fb 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs @@ -15,6 +15,7 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.ObjectMapping; +using Volo.Abp.Uow; using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Bases; @@ -74,6 +75,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// [HttpPost] + [UnitOfWork(false)] //[Route("generateinvoice")] public async override Task GenerateInvoice([FromBody] string invbillnum) { From 310b5cd57d8159499558d1ddda845238beae4c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 31 Aug 2023 08:56:19 +0800 Subject: [PATCH 2/2] =?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/BBAC_CAN_SA_DTO.cs | 9 ++++----- .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs | 6 ------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs index 40af1fa0..7cb2156e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs @@ -70,7 +70,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos public string IsReturn { get; set; } [ExporterHeader(DisplayName = "合同号")] - public int ContractDocID { set; get; } + public string ContractDocID { set; get; } /// @@ -90,10 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// 金额 /// public decimal Amt { get; set; } - /// - /// 合同号 - /// - public string ContractDocID { set; get; } + } @@ -135,6 +132,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// [ExporterHeader(DisplayName = "版本号")] public int Version { get; set; } + [ExporterHeader(DisplayName = "合同号")] + public int ContractDocID { set; get; } } //public class BBAC_CAN_SA_EXP_DTO diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs index 2c1146fb..4fa5467e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs @@ -163,11 +163,5 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } return new JsonResult(new { Code = 200, Message = "生成成功" }); } - - - - - - } }