From bf07a7538f898c1ab945aa821ed56643476105e1 Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Fri, 8 Mar 2024 14:32:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=A5=E9=94=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Kittings/DTOs/KittingDTO.cs               | 19 +++++++++++
 .../Kittings/KittingAppService.cs             | 34 ++++++++++++++-----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs
index 919062672..766c2706d 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs
@@ -20,3 +20,22 @@ public class KittingDTO : EntityDto<Guid>, IHasCode, IHasName
     [Display(Name = "明细")]
     public List<KittingDetailDTO> Details { set; get; }= new List<KittingDetailDTO>();
 }
+
+public class KittingErrorDto
+{
+
+    [Display(Name = "Kitting编号")]
+    public string Code { get; set; }
+
+
+    [Display(Name = "零件代码")]
+    public string PartCode { get; set; }
+
+
+    [Display(Name = "错误信息")]
+    public string Content { get; set; }
+
+
+
+}
+
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs
index 5a68489e2..bd3f3bde9 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs
@@ -152,7 +152,21 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
         var inputFileBytes = ms.GetAllBytes();
         var importList= _excelService.Import<KittingImportInput>(inputFileBytes).ToList();
         var checklist=importList.GroupBy(p => new { p.Code, p.PartCode }).Where(g => g.Count() > 1).Select(p => new { Code = p.Key.Code, PartCode = p.Key.PartCode });//导入重复报错
-        //检测是否导入重复
+                                                                                                                                                                      //检测是否导入重复
+
+
+        List<KittingErrorDto> errors = new List<KittingErrorDto>();
+        if (checklist.Any())
+        {
+          
+            foreach (var error in checklist) {
+
+                errors.Add(new KittingErrorDto() { Code=error.Code,PartCode=error.PartCode, Content="记录有重复!" });
+            }
+           
+
+            
+        }
 
 
 
@@ -179,6 +193,7 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
                 var first = newDetail.FirstOrDefault();
                 var kitting = new KittingEditInput();
                 kitting.InjectFrom(first);
+               // kitting.Code = $"Q{kitting.Code}";
                 foreach (var detail in newDetail)
                 {
                     var inputdetail = new KittingDetailInput();
@@ -210,8 +225,8 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
         {
             var existKittingList = importList.Where(p => existCodeList.Contains(p.Code)).ToList();//新Kitting
             List<KittingEditInput> existKittingInputList = new List<KittingEditInput>();
-            List<KittingDetail> existKittingDetailList = new List<KittingDetail>();
-            List<KittingDetail> newKittingDetailList = new List<KittingDetail>();
+            //List<KittingDetail> existKittingDetailList = new List<KittingDetail>();
+            //List<KittingDetail> newKittingDetailList = new List<KittingDetail>();
             foreach (var include in includeList)
             {
                 var newDetail = existKittingList.Where(p => p.Code == include.Code).ToList();
@@ -334,12 +349,15 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
 
         }
 
+        if (errors.Count > 0)
+        {
+           var fileContent= _excelService.Export(errors);
+           return new TestResult(fileContent.FileContents, ExportImportService.ContentType) { FileDownloadName="错误信息" };
+        }
 
-        return new JsonResult(new { Code = 200, Message = "" });
-
-
-       
-
+        var fileContent1 = _excelService.Export(importList);
+        new TestResult(fileContent1.FileContents, ExportImportService.ContentType) { FileDownloadName = "导入文件" };
+        return new JsonResult(new { Code = 200, FileDownloadName="" });
     }