1

ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs

@@ -173,8 +173,13 @@ namespace Tnb.ProductionMgr
             {
                 var moTask = await db.Queryable<PrdMoTask>().FirstAsync(x => x.id == input.mo_task_id);
                 var parentMoTask = await db.Queryable<PrdMoTask>().FirstAsync(x => x.id == moTask.parent_id);
+                string worklineId = moTask.workline_id;
+                if (parentMoTask != null && !string.IsNullOrEmpty(parentMoTask.workline_id))
+                {
+                    worklineId = parentMoTask.workline_id;
+                }
                 var carry = await db.Queryable<WmsCarryH>().SingleAsync(x => x.carry_code == input.carry_code);
-                var workline = await db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == parentMoTask.workline_id);
+                var workline = await db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == worklineId);
                 var workshop = await db.Queryable<OrganizeEntity>().SingleAsync(x=>x.Id==workline.ParentId);
                 var inputMaterials = await db.Queryable<BasMbomInput>()
                     .Where(x => x.mbom_id == moTask.bom_id && x.mbom_process_id == moTask.mbom_process_id)

system/Tnb.Systems/Permission/DepartmentService.cs

@@ -687,6 +687,27 @@ public class DepartmentService : IDepartmentService, IDynamicApiController, ITra
         return null;
 
     }
+    
+    /// <summary>
+    /// 根据工位id获取车间信息
+    /// </summary>
+    /// <param name="dic"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<dynamic> GetWorkshopByWorkstationId(Dictionary<string, string> dic)
+    {
+        string id = dic["id"];
+        var db = _repository.AsSugarClient();
+        OrganizeEntity organizeEntity = await db.Queryable<OrganizeEntity>().SingleAsync(x => x.Id == id);
+        if (organizeEntity != null && !string.IsNullOrEmpty(organizeEntity.OrganizeIdTree))
+        {
+            string[] arr = organizeEntity.OrganizeIdTree.Split(",");
+            return await db.Queryable<OrganizeEntity>().SingleAsync(x => arr.Contains(x.Id) && x.Category == DictConst.RegionCategoryWorkshopCode);
+        }
+
+        return null;
+
+    }
 
     #endregion
 

system/Tnb.Systems/System/DataInterfaceService.cs

@@ -39,6 +39,7 @@ using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SqlSugar;
 
@@ -559,7 +560,17 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
     {
         try
         {
-            return (await Preview(id, input)).ToObject<List<Dictionary<string, object>>>().FirstOrDefault().Keys.ToList();
+            //modifyby zhoukeda 20230803
+            var result = await Preview(id, input);
+            if (result is DataTable)
+            {
+                List<Dictionary<string,Object>> list = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(JsonConvert.SerializeObject(result));
+                return list.FirstOrDefault()?.Keys.ToList() ?? Enumerable.Empty<string>();
+            }
+            else
+            {
+                return result.ToObject<List<Dictionary<string, object>>>().FirstOrDefault().Keys.ToList();
+            }
         }
         catch (Exception e)
         {