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

code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs

@@ -529,7 +529,19 @@ namespace Win.Sfs.SettleAccount.Bases
 
 
 
+        protected async Task<List<ERR_EXP_DTO>> CheckRepeat(List<PUB_ADJ_DETAIL_DTO> p_list)
+        {
+            var errorlist = p_list.GroupBy(p => new { p.PN, p.LU }).Where(p => p.Count() > 1).Select(p => new { p.Key.PN, p.Key.LU }).ToList();
+
+            List<ERR_EXP_DTO> errors = new List<ERR_EXP_DTO>();
+
+            foreach (var itm in errorlist)
+            {
+                errors.Add(new ERR_EXP_DTO() { Message = $"零件号{itm.LU},标识号(生产码){itm.PN}有重复数据!" });
+            }
 
+            return errors;
+        }
 
 
 

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

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.EntityFrameworkCore;
+using NetTaste;
 using NPOI.HPSF;
 using SettleAccount.Domain.BQ;
 using System;
@@ -225,18 +226,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// <returns></returns>
         public  virtual  async Task<IActionResult> ReissueInvoiceExtend(List<PUB_ADJ_DETAIL_DTO> p_list)
         {
-            var errorlist= p_list.GroupBy(p => new { p.PN, p.LU }).Where(p => p.Count() > 1).Select(p => new { p.Key.PN, p.Key.LU }).ToList();
 
-            List<ERR_EXP_DTO> errors = new List<ERR_EXP_DTO>();
 
-            foreach (var itm in errorlist)
+            var errorlist = await CheckRepeat(p_list);
+            if (errorlist.Count > 0)
             {
-                errors.Add(new ERR_EXP_DTO() { Message=$"零件号{itm.LU},标识号(生产码){itm.PN}有重复数据!" });   
-            }
                
-            if (errors.Count > 0)
+                return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errorlist) });
-            {
-                return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errors) });
                 
             }
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs

@@ -82,9 +82,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-       
-        [HttpPost]
         [UnitOfWork(false)]
+        [HttpPost]
+      
         public async  Task<IActionResult> GenerateInvoice([FromBody] string invbillNum)
         {
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs

@@ -183,20 +183,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// <returns></returns>
         public virtual async Task<IActionResult> ReissueInvoiceExtend(List<PUB_ADJ_DETAIL_DTO> p_list)
         {
-            var errorlist = p_list.GroupBy(p => new { p.PN, p.LU }).Where(p => p.Count() > 1).Select(p => new { p.Key.PN, p.Key.LU }).ToList();
+            var errorlist = await CheckRepeat(p_list);
-
+            if (errorlist.Count > 0)
-            List<ERR_EXP_DTO> errors = new List<ERR_EXP_DTO>();
-
-            foreach (var itm in errorlist)
-            {
-                errors.Add(new ERR_EXP_DTO() { Message = $"零件号{itm.LU},标识号(生产码){itm.PN}有重复数据!" });
-            }
-
-            if (errors.Count > 0)
             {
-                return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errors) });
+                return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errorlist) });
             }
-
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count == 0)
             {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs

@@ -60,6 +60,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         [UnitOfWork(false)]
         public virtual async Task<IActionResult> ReissueInvoiceExtend(List<PUB_ADJ_DETAIL_DTO> p_list)
         {
+            var errorlist = await CheckRepeat(p_list);
+            if (errorlist.Count > 0)
+            {
+
+                return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errorlist) });
+
+            }
+
             var first = p_list.FirstOrDefault();
             var invbillnum = first.InvBillNum;
 
@@ -173,11 +181,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     if (invbillnum.Substring(0, 3) == "INV")//一次开票重开
                     {
                         await ReissueFirstInvoice(publist, adjlist, dtos, version, invbillnum);
-
-
-
-
-
                     }
                     else//二次开票
                     {