首末巡检自动自检报废 设备相关报表

QcMgr/Tnb.QcMgr/QcCheckPlanService.cs

@@ -6,6 +6,7 @@ using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.FriendlyException;
 using JNPF.JsonSerialization;
+using JNPF.Logging;
 using JNPF.Systems.Entitys.System;
 using JNPF.Systems.Interfaces.System;
 using JNPF.TaskScheduler;
@@ -446,6 +447,12 @@ namespace Tnb.QcMgr
             {
                 throw Oops.Bah($"{entity.triggerevent.ToString()}找到多个质检方案");
             }
+
+            if (list[0].status == "0")
+            {
+                Log.Error($"{list[0].id}已停用");
+                return;
+            }
             
             // List<string> removes = new();
             // foreach (QcCheckPlanH data in list)

QcMgr/Tnb.QcMgr/QcCheckTaskService.cs

@@ -393,12 +393,33 @@ namespace Tnb.QcMgr
                     {
                         PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x=>x.mo_task_code==QcCheckExecH.mo_task_code && x.id!=null).FirstAsync();
                         string pauseReason = QcCheckExecH.checktype == WmsWareHouseConst.XUNJIAN_ID ? "巡检不合格" : QcCheckExecH.checktype == WmsWareHouseConst.SHOUJIAN_ID ? "首检不合格" : "末检不合格";
-                         await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
+                        await _prdMoTaskService.PrdTaskRelease2(new PrdTaskReleaseUpInput()
                         {
                             TaskIds = NPOI.Util.Arrays.AsList(prdMoTask.id),
                             Behavior = "Pause",
                             PauseReeson = pauseReason
                         },db);
+                        await _prdMoTaskService.SelfTestScrapped2(new SelfTestScrappedInput()
+                        {
+                            mo_task_id = prdMoTask.id,
+                            scrap_qty = rqty,
+                            remark = "抽样不合格报废",
+                            categoryItems = new List<SelfTestScrappedInputItem>()
+                            {
+                                new SelfTestScrappedInputItem()
+                                {
+                                    category_id = "25574005966629",
+                                    items = new List<defectItem>()
+                                    {
+                                        new defectItem()
+                                        {
+                                            defective_item = "抽样不合格报废",
+                                            defective_item_qty = rqty
+                                        }
+                                    }
+                                }
+                            }
+                        },db);
                         List<string> carryCodes = await db.Queryable<PrdReport>().Where(x=>x.mo_task_id==prdMoTask.id).Select(x=>x.material_box_code).Distinct().ToListAsync();
                         await db.Updateable<WmsCarryH>()
                             .SetColumns(x => x.is_check == ((int)EnumCheckConclusion.暂控).ToString())