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

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/ReportRecordListOutput.cs

@@ -15,6 +15,8 @@ namespace Tnb.ProductionMgr.Entities.Dto
         public string? plan_start_date { get; set; } = string.Empty;
         public int? reported_work_qty { get; set; }
         public string? status { get; set; } = string.Empty;
+        
+        public string mo_code { get; set; }
 
         public List<ReportRecordListChildrenOutput>? tablefield107 { get; set; } = new List<ReportRecordListChildrenOutput>();
 

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefectRecord.cs

@@ -82,5 +82,10 @@ public partial class PrdMoTaskDefectRecord : BaseEntity<string>
     /// 任务类型
     /// </summary>
     public string mo_task_type { get; set; }
+    /// <summary>
+    /// 工单号
+    /// </summary>
+    public string? mo_code { get; set; }
+
 
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReportRecord.cs

@@ -69,4 +69,10 @@ public partial class PrdReportRecord : BaseEntity<string>
     /// 已报工数量
     /// </summary>
     public int reported_work_qty { get; set; }
+    
+    /// <summary>
+    /// 工单号
+    /// </summary>
+    public string? mo_code { get; set; }
+
 }

ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs

@@ -1287,6 +1287,7 @@ namespace Tnb.ProductionMgr
                             record.mo_task_type = mo?.mo_type;
                             record.status = taskInfo.mo_task_status;
                             record.mo_task_id = taskInfo.id;
+                            record.mo_code = mo?.mo_code ?? "";
                             //record.completed_qty = (await db.Queryable<PrdReport>().Where(it => it.mo_task_code == taskInfo.mo_task_code).SumAsync(it => it.reported_work_qty)).Value;
                             prdReportLogs.Add(record);
 
@@ -1307,7 +1308,8 @@ namespace Tnb.ProductionMgr
                                 create_time = DateTime.Now,
                                 mo_task_id = taskInfo.id,
                                 mo_task_code = taskInfo.mo_task_code,
-                                mo_task_type = mo?.mo_type
+                                mo_task_type = mo?.mo_type,
+                                mo_code = mo?.mo_code ?? "",
                             };
                             sacipRecord.status = taskInfo.mo_task_status;
                             prdTaskDefectLogs.Add(sacipRecord);

ProductionMgr/Tnb.ProductionMgr/ProductionReportRecordService.cs

@@ -98,6 +98,7 @@ namespace Tnb.ProductionMgr
                 {
                     id = a.id,
                     masterial_code = a.masterial_code,
+                    mo_code = a.mo_code,
                     masterial_name = a.masterial_name,
                     mo_task_code = a.mo_task_code,
                     mo_task_id = a.mo_task_code,