From b04c1f14aae6aede38281ee2e3fd2fecdad6ac12 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Tue, 23 Apr 2024 11:36:38 +0800
Subject: [PATCH] =?UTF-8?q?bom=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96parentid?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Win_in.Sfs.Basedata.Application/Boms/BomAppService.cs  | 2 +-
 .../src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs      | 7 +++----
 .../src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs     | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Boms/BomAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Boms/BomAppService.cs
index 0a25e7940..51c67e03c 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Boms/BomAppService.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Boms/BomAppService.cs
@@ -108,7 +108,7 @@ public class BomAppService :
     [HttpGet("get-bom-tree-by-code")]
     public virtual async Task<List<BomDTO>> GetBomTreeByCodeAsync(string productCode)
     {
-        var entities = await _bomManager.GetAllItemByCode(productCode).ConfigureAwait(false);
+        var entities = await _bomManager.GetAllItemByCode(productCode,GuidGenerator.Create()).ConfigureAwait(false);
 
         var dtos = ObjectMapper.Map<List<Bom>, List<BomDTO>>(entities);
 
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs
index 743b96932..57f0475b5 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/BomManager.cs
@@ -379,16 +379,15 @@ public class BomManager : DomainService, IBomManager
     /// </summary>
     /// <param name="productCode"></param>
     /// <returns></returns>
-    public virtual async Task<List<Bom>> GetAllItemByCode(string productCode)
+    public virtual async Task<List<Bom>> GetAllItemByCode(string productCode,Guid id)
     {
         List<Bom> boms = new List<Bom>();
         var lst = await _repository.GetListAsync(p => p.Product == productCode).ConfigureAwait(false);
-        var parentitem = await _repository.FindAsync(p => p.Component == productCode).ConfigureAwait(false);
         foreach (var bom in lst)
         {
-            bom.Remark = parentitem?.Id.ToString();
+            bom.Remark = id.ToString();
             boms.Add(bom);
-            var results=  await GetAllItemByCode(bom.Component).ConfigureAwait(false);
+            var results=  await GetAllItemByCode(bom.Component,bom.Id).ConfigureAwait(false);
             boms.AddRange(results);
         }
         return boms;
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs
index 2004cf8c2..b58ebea14 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Boms/IBomManager.cs
@@ -42,7 +42,7 @@ public interface IBomManager : IDomainService, IBulkImportService<Bom>
     /// <param name="productNum">总成数量</param>
     /// <returns></returns>
     Task<List<Bom>> GetMaterialTotalQtyAsync(string productCode, int productNum);
-    Task<List<Bom>> GetAllItemByCode(string productCode);
 
     Task<List<BomComponent>> GetSubcomponentsRecursiveList(List<BomComponent> p_lst, EnumBomSelectedType p_type);
+    Task<List<Bom>> GetAllItemByCode(string productCode, Guid id);
 }