产成品入库

QcMgr/Tnb.QcMgr/QcCheckTaskService.cs

@@ -110,6 +110,9 @@ namespace Tnb.QcMgr
                     material_standard = b.material_standard,
                     material_specification = b.material_specification,
                     equip_name = h.name,
+                    extras = h.name,
+                    f_flowid = b.material_standard,
+                    f_flowtaskid = b.material_specification,
                 }).OrderByDescending(a => DateTime.Parse(a.tasktime)).ToPagedListAsync(input.currentPage, input.pageSize);
             foreach (QcCheckExecHOut? item in result.list)
             {
@@ -406,14 +409,33 @@ namespace Tnb.QcMgr
             List<QcErrorCause> QcErrorCauses = await db.Queryable<QcErrorCause>().ToListAsync();
             List<QcErrorLevel> QcErrorLevels = await db.Queryable<QcErrorLevel>().ToListAsync();
 
-            Result Result = new()
-            {
-                mainid = id,
-                checknum = QcCheckExecH.checknum!,
-                status = QcCheckExecH.status!,
-                checktypes = new List<List<Checktype>>(),
-                result = QcCheckExecH.result
-            };
+            Result Result = await db.Queryable<QcCheckExecH>().LeftJoin<BasMaterial>((a, b) => a.materialid == b.id)
+                .LeftJoin<BasProcess>((a, b, c) => a.processid == c.id)
+                .LeftJoin<OrganizeEntity>((a, b, c, d) => a.workid == d.Id)
+                .LeftJoin<UserEntity>((a, b, c, d, e) => a.execuser == e.Id)
+                .LeftJoin<PrdReport>((a, b, c, d, e, f) => a.report_id == f.id)
+                .LeftJoin<PrdMoTask>((a, b, c, d, e, f, g) => a.mo_task_code == g.mo_task_code)
+                .LeftJoin<EqpEquipment>((a, b, c, d, e, f, g, h) => g.eqp_id == h.id)
+                .Where((a, b, c, d, e) => a.id==id)
+                .Select((a, b, c, d, e, f, g, h) => new Result
+                {
+                    mainid = a.id,
+                    material_name = b.name,
+                    material_code = b.code,
+                    material_standard = b.material_standard,
+                    material_specification = b.material_specification,
+                    checknum = a.checknum,
+                    status = a.status,
+                    result = a.result,
+                    exectime = a.exectime ?? "",
+                    execuser = e.RealName ?? "",
+                    mo_task_code = a.mo_task_code,
+                    batch = a.batch,
+                    qty = a.qty,
+                    equip_name = h.name,
+                    checktypes = new List<List<Checktype>>(),
+                }).FirstAsync();
+            Result.checktypes = new List<List<Checktype>>();
             if (!string.IsNullOrEmpty(QcCheckExecH.carry_code))
             {
                 WmsCarryH carryH = await db.Queryable<WmsCarryH>().FirstAsync(x => x.carry_code == QcCheckExecH.carry_code);