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

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

@@ -162,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 if (errorList.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(errorList) });
 
                 }
                 var dto1s = ObjectMapper.Map<List<BBAC_CAN_SA_DETAIL>, List<BBAC_CAN_SA_DETAIL_DTO>>(entitys);
@@ -225,6 +225,21 @@ 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)
+            {
+                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) });
+
+            }
+
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count == 0)
             {
@@ -291,7 +306,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     //var errorList =await CheckInvoiceGenerationRules(entitys, priceList, inv.BusinessType);
                     //if (errorList.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(errorList) });
                     //}
                 var dto1s = ObjectMapper.Map<List<BBAC_CAN_SA_DETAIL>, List<BBAC_CAN_SA_DETAIL_DTO>>(entitys);
                     var q = from d in dto1s

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

@@ -101,7 +101,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var errorList = await CheckInvoiceGenerationRules(entitys,main.Site,priceList, main.BusinessType);//校验生成规则
                 if (errorList.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(errorList) });
                 }
                 if (await _bbacMng.SetForwardState(main, SettleBillState.已开票))
                 { 

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

@@ -61,7 +61,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     {
                         errorlist.Add(new ERR_EXP_DTO() { Message = itm });
                     }
-                    return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = await ExportErrorReportAsync(errorlist) });
+                    return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errorlist) });
                 }
             }
             return  new JsonResult(new { Code = 200, Message = "生成成功" }); 

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

@@ -181,7 +181,7 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message= "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message= "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 

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

@@ -22,6 +22,7 @@ using Win.Sfs.SettleAccount.Entities.BQ.Managers;
 using Win.Sfs.SettleAccount.Entities.BQ.Temp;
 using Win.Sfs.SettleAccount.Entities.Prices;
 using Win.Sfs.SettleAccount.Entities.TaskJobs;
+using Win.Sfs.SettleAccount.ExportReports;
 using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
@@ -118,7 +119,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     if (errorList.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(errorList) });
 
                     ;
                     }
@@ -182,6 +183,19 @@ 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)
+            {
+                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) });
+            }
 
             var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
             if (adjlist == null && adjlist.Count == 0)
@@ -248,7 +262,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var errorList = await CheckInvoiceGenerationRules(entitys, priceList, inv.BusinessType);
                 if (errorList.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(errorList) });
                 }
                 //  var dto1s = ObjectMapper.Map<List<HBPO_CAN_SA_DETAIL>, List<HBPO_CAN_SA_DETAIL_DTO>>(entitys);
                 var q = from d in entitys

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

@@ -94,7 +94,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var errorList = await CheckInvoiceGenerationRules(entitys,main.Site,priceList, main.BusinessType);//校验生成规则
                 if (errorList.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(errorList) });
                 }
 
                 if (await _hbpoMng.SetForwardState(main, SettleBillState.已开票))

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

@@ -65,7 +65,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     {
                         errorlist.Add(new ERR_EXP_DTO() { Message = itm });
                     }
-                    return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = await ExportErrorReportAsync(errorlist) });
+                    return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errorlist) });
                 }
             }
             return new JsonResult(new { Code = 200, Message = "生成成功" });

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

@@ -230,7 +230,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 
@@ -269,7 +269,7 @@ public class HBPO_SA_SERVICE : SettleAccountApplicationBase<HBPO_SA>
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 

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

@@ -113,7 +113,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 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(errors) });
                 }
             }
             await _invMng.SetForwardState(p_invs, SettleBillState.财务已审核);

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

@@ -140,7 +140,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var errorList = await CheckInvoiceGenerationRules(entitys, priceList, inv.BusinessType);
                 if (errorList.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(errorList) });
                 }
                 //  var dto1s = ObjectMapper.Map<List<HBPO_CAN_SA_DETAIL>, List<HBPO_CAN_SA_DETAIL_DTO>>(entitys);
                 var q = from d in entitys
@@ -264,7 +264,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     var errorList = await CheckInvoiceGenerationRules(entitys, priceList, inv.BusinessType);
                     if (errorList.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(errorList) });
                 }
                     //  var dto1s = ObjectMapper.Map<List<HBPO_CAN_SA_DETAIL>, List<HBPO_CAN_SA_DETAIL_DTO>>(entitys);
                     var q = from d in entitys

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

@@ -97,7 +97,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 var errorList = await CheckInvoiceGenerationRules(entitys,main.Site,priceList, main.BusinessType);//校验生成规则
                 if (errorList.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(errorList) });
                 }
                 if (await _pubMng.SetForwardState(main, SettleBillState.已开票))
                 {

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

@@ -61,7 +61,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     {
                         errorlist.Add(new ERR_EXP_DTO() { Message = itm });
                     }
-                    return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = await ExportErrorReportAsync(errorlist) });
+                    return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errorlist) });
                 }
             }
 

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

@@ -246,7 +246,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 
@@ -283,7 +283,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 
@@ -313,7 +313,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 
@@ -344,7 +344,7 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         #endregion
 

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

@@ -73,7 +73,7 @@ public class PURCHASE_PRICE_SERVICE : SettleAccountApplicationBase<PURCHASE_PRIC
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         foreach (var itm in _ls)
         {

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

@@ -91,7 +91,7 @@ public class TB_RePartsRelationship_SERVICE : SettleAccountApplicationBase<TB_Re
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         foreach (var itm in _ls)
         {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs

@@ -75,7 +75,7 @@ public class MaterialRelationshipAppService : SettleAccountApplicationBase<Mater
         if (checkList.Count > 0)
         {
             string fileName = await ExportErrorReportAsync(checkList).ConfigureAwait(false);
-            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "请下载错误信息", fileName = fileName });
+            return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = fileName });
         }
         foreach (var itm in _ls)
         {