Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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<Guid>
     {
 
-        
+    
+
         [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 string ContractDocID { set; get; }
+
+
         /// <summary>
         /// 版本
         /// </summary>
@@ -84,10 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// 金额
         /// </summary>
         public decimal Amt { get; set; }
-        /// <summary>
-        /// 合同号
-        /// </summary>
-        public string ContractDocID { set; get; }
+   
    
 
     }
@@ -129,6 +132,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [ExporterHeader(DisplayName = "版本号")]
         public int Version { get; set; }
+        [ExporterHeader(DisplayName = "合同号")]
+        public int ContractDocID { set; get; }
 
     }
     //public class BBAC_CAN_SA_EXP_DTO

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
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
+        [UnitOfWork(false)]
         //[Route("generateinvoice")]
         public async override Task<IActionResult> GenerateInvoice([FromBody] string invbillnum)
         {
@@ -161,11 +163,5 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             return  new JsonResult(new { Code = 200, Message = "生成成功" });
         }
-
-
-       
-
-
-
     }
 }