From 42e4fa098c3d6382e22aab42df4dd10ff437f49e Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Tue, 23 Apr 2024 11:44:07 +0800
Subject: [PATCH] 1

---
 .../KittingPackagingNoteAppService.cs             | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs
index 8a583d7bc..e493af73d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/KittingPackagingNotes/KittingPackagingNoteAppService.cs
@@ -66,22 +66,25 @@ public class KittingPackagingNoteAppService
         chassisItemCode=chassisItemCode.Distinct().ToList();
         //获取kitting中维护的零件号
         var kittingDto=await _kittingAppService.GetByCodeAsync(input.KittingCode).ConfigureAwait(false);
-        var kittingItemCodeList= kittingDto.Details.Select(p => p.PartCode);
+        var kittingItemCodeList= kittingDto.Details.Select(p => p.ItemCode);
         //取出交集得到KittingCode中的零件
         var hasItemCode= kittingItemCodeList.Intersect(chassisItemCode).ToList();
+        if (hasItemCode == null || hasItemCode.Count < 1)
+        {
+            throw new UserFriendlyException($"请检查Bom和Kitting代码【{input.KittingCode}】中的Kitting物品关系是否一致");
+        }
 
         foreach (var itemCode in hasItemCode)
         {
             var detailInput = new KittingPackagingNoteDetailInput();
 
-            var itemBase=kittingDto.Details.First(p => p.PartCode == itemCode);
+            var itemBase=kittingDto.Details.First(p => p.ItemCode == itemCode);
 
             detailInput.KittingCode = input.KittingCode;
             detailInput.ItemCode = itemCode;
-            detailInput.ItemDesc1 = itemBase.Desc1;
-            detailInput.ItemDesc2= itemBase.Desc2;
-            //todo 等待赵新宇加完字段
-            //kittingPackagingNoteDetail.ItemName=itemBase.ItemName
+            detailInput.ItemDesc1 = itemBase.ItemDesc1;
+            detailInput.ItemDesc2= itemBase.ItemDesc2;
+            detailInput.ItemName = itemBase.ItemName;
             detailInput.Qty= itemBase.Qty;
 
             input.Details.Add(detailInput);