1

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -2176,8 +2176,9 @@ namespace Tnb.ProductionMgr
                 .LeftJoin<EqpEquipment>((a, b, c, d) => a.eqp_id == d.id)
                 .LeftJoin<DictionaryDataEntity>((a,b,c,d,e)=>e.EnCode==a.mo_task_status && e.DictionaryTypeId==DictConst.PrdTaskStatusTypeId)
                 .LeftJoin<BasProcess>((a,b,c,d,e,f)=>a.process_id==f.id)
+                .LeftJoin<OrganizeEntity>((a,b,c,d,e,f,g)=>a.workstation_id==g.Id)
                 .Where((a, b, c, d) => a.id == id)
-                .Select((a, b, c, d,e,f) => new
+                .Select((a, b, c, d,e,f,g) => new
                 {
                     id = a.id,
                     mo_task_code = a.mo_task_code,
@@ -2191,11 +2192,14 @@ namespace Tnb.ProductionMgr
                     schedule_type = a.schedule_type,
                     equip_code = d.code,
                     equip_name = d.name,
+                    workstation_id = a.workstation_id,
+                    workstation_code = g.EnCode,
+                    workstation_name = g.FullName,
                     scheduled_qty = a.scheduled_qty,
                     reported_work_qty = a.reported_work_qty,
                     scrap_qty = a.scrap_qty,
-                    process_id_id = a.process_id,
-                    process_id = f.process_name,
+                    process_id = a.process_id,
+                    process_name = f.process_name,
                 }).FirstAsync();
 
         }