From e086247d50bf1ac74bed909e9a87ae4a92202e36 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Thu, 12 Sep 2024 10:12:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7bom=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BasicData/Tnb.BasicData/BasMbomService.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/BasicData/Tnb.BasicData/BasMbomService.cs b/BasicData/Tnb.BasicData/BasMbomService.cs
index a2413c4c..b4f8c260 100644
--- a/BasicData/Tnb.BasicData/BasMbomService.cs
+++ b/BasicData/Tnb.BasicData/BasMbomService.cs
@@ -134,6 +134,23 @@ namespace Tnb.BasicData
             return mbomDataOutput;
         }
         
+        /// <summary>
+        /// 获取编辑信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<dynamic> GetEbomInfo(string id)
+        {
+            ISqlSugarClient db = _repository.AsSugarClient();
+            BasEbomH basEbomH = await db.Queryable<BasEbomH>().SingleAsync(x => x.id == id);
+            List<BasEbomD> basEbomDs = await db.Queryable<BasEbomD>().Where(x => x.ebom_id == id).ToListAsync();
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("main",basEbomH);
+            result.Add("detail",basEbomDs);
+            return result;
+        }
+        
         /// <summary>
         /// 复制生产bom
         /// </summary>

From 447c490ecddd7d0d2e77289b9242342493f282f0 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Fri, 13 Sep 2024 11:54:31 +0800
Subject: [PATCH 2/2] bug

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
index 398a62ca..35d30db1 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs
@@ -366,7 +366,7 @@ namespace Tnb.WarehouseMgr
                     .Select((x, y) => y)
                     .ToListAsync();
                 List<WmsErpWarehouserelaH> erpWarehouserelaHs = await _db.Queryable<WmsErpWarehouserelaH>().Where(x=>x.id!=null).ToListAsync();
-                string userId = instock?.create_id ?? WmsWareHouseConst.AdministratorUserId;
+                string userId = prdReport?.create_id ?? WmsWareHouseConst.AdministratorUserId;
                 
                 string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID;
                 List<string> tableIds = new List<string>();