Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

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>

WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs

@@ -365,7 +365,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>();