From 1868c95db51620fe963a7cf45359379e471f7c55 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Mon, 26 Aug 2024 09:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.ProductionMgr/PrdMoTaskService.cs     | 37 ++++++++++++++++---
 QcMgr/Tnb.QcMgr/QcCheckPlanService.cs         |  2 +-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index f86433ac..f35df649 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -1156,9 +1156,28 @@ namespace Tnb.ProductionMgr
                     {
                         foreach(PrdMoTask item in list)
                         {
-                            if (string.IsNullOrEmpty(item.worker_id))
+                            // if (string.IsNullOrEmpty(item.worker_id))
+                            // {
+                            //     throw Oops.Bah("请先分配员工");
+                            // }
+
+                            if (item.scheduling_class_type == "1")
                             {
-                                throw Oops.Bah("请先分配员工");
+                                if (string.IsNullOrEmpty(item.dayshift_worker_id) ||
+                                    string.IsNullOrEmpty(item.nightshift_worker_id))
+                                {
+                                    throw Oops.Bah("请先分配员工");
+                                }
+                            }else if (item.scheduling_class_type == "2")
+                            {
+                                if (string.IsNullOrEmpty(item.dayshift_worker_id) ||
+                                    string.IsNullOrEmpty(item.nightshift_worker_id) ||
+                                    string.IsNullOrEmpty(item.dayshiftafter_worker_id) ||
+                                    string.IsNullOrEmpty(item.nightshiftafter_worker_id) 
+                                    )
+                                {
+                                    throw Oops.Bah("请先分配员工");
+                                }
                             }
                         }
                     }
@@ -1214,6 +1233,7 @@ namespace Tnb.ProductionMgr
                         {
                             foreach (PrdMoTask? task in prdTaskList.Where(p => p.mo_task_status == "ToBeStarted").ToList())
                             {
+                                ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x=>x.id==task.mold_id);
                                 TriggerPlanEntity entity = new()
                                 {
                                     materialid = task.material_id,
@@ -1221,6 +1241,8 @@ namespace Tnb.ProductionMgr
                                     workid = task.workstation_id,
                                     triggerevent = EnumTriggerEvent.开工首件检,
                                     plan_check_type = WmsWareHouseConst.SHOUJIAN_ID,
+                                    mo_task_code = task.mo_task_code,
+                                    newpronum = toolMolds?.mold_cavity
                                 };
                                 await _qcCheckPlanService.CreateTask(entity);
                             }
@@ -1921,11 +1943,12 @@ namespace Tnb.ProductionMgr
                     
                     isCheckFlag = true;
                     
-                }else if (wmsCarryH.is_check==EnumCheckConclusion.检验中.ParseToInt().ToString())
-                {
-                    return "检验中,请稍后提报";
                 }
-                
+
+                if ( wmsCarryH.is_check != EnumCheckConclusion.待检.ParseToInt().ToString())
+                {
+                    throw Oops.Bah("提交失败,载具状态不是待检");
+                }
                 
                 #endregion
                 _ = prdMoTask.reported_work_qty == null
@@ -3808,6 +3831,7 @@ namespace Tnb.ProductionMgr
                     .Where(x => x.id == moTaskId)
                     .ExecuteCommandAsync();
                 
+                ToolMolds toolMolds = await _db.Queryable<ToolMolds>().SingleAsync(x=>x.id==task.mold_id);
                 TriggerPlanEntity entity = new()
                 {
                     materialid = task.material_id,
@@ -3815,6 +3839,7 @@ namespace Tnb.ProductionMgr
                     workid = task.workstation_id,
                     triggerevent = EnumTriggerEvent.末检质检方案,
                     mo_task_code = task.mo_task_code,
+                    newpronum = toolMolds?.mold_cavity
                 };
                 
                 await _qcCheckPlanService.CreateTask(entity);
diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
index 55410eee..0e267cb0 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
@@ -617,7 +617,7 @@ namespace Tnb.QcMgr
                     check_type = entity.check_type,
                     batch = entity.batch
                 };
-                if (entity.triggerevent == EnumTriggerEvent.零部件最终检验)
+                if (entity.triggerevent == EnumTriggerEvent.零部件最终检验 || entity.triggerevent == EnumTriggerEvent.开工首件检 || entity.triggerevent==EnumTriggerEvent.末检质检方案 )
                 {
                     qcCheckExecH.checknum = entity.newpronum.ToString();
                 }