From dc32c4202dd04bf331cd992ef2387307b1d82573 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 10 Apr 2025 16:51:14 +0800
Subject: [PATCH] qihuangondganjiaoyan

---
 .../JobKanban/WorkOrderProgressController.cs       | 11 +++++++++++
 .../IService/IWorkorderProgressService.cs          |  2 ++
 DOAN.Service/JobKanban/WorkorderProgressService.cs | 14 ++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
index d4c2237..502dbc9 100644
--- a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
+++ b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
@@ -218,4 +218,15 @@ public class WorkOrderProgressController : BaseController
         var response = workorderProgressService.GetWorkOrderScanCodeInfo(workorder);
         return SUCCESS(response);
     }
+
+
+    //TODO  切换工单时校验，前工单的末标签是否校验成功通过
+
+    [HttpGet("switch_workorder_checkLabel")]
+    public IActionResult SwitchWorkOrderCheckLabel(string pre_workorder)
+    {
+        if (string.IsNullOrEmpty(pre_workorder)) throw new CustomException("workorder is null");
+        var response = workorderProgressService.SwitchWorkOrderCheckLabel(pre_workorder);
+        return SUCCESS(response);
+    }
 }
\ No newline at end of file
diff --git a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
index 934b269..d753dea 100644
--- a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
@@ -42,5 +42,7 @@ namespace DOAN.Service.JobKanban.IService
         (DateTime, float) GetWorkOrderTime(string workorder);
 
         List<ProReportworkDetail> GetWorkOrderScanCodeInfo(string workorder);
+
+        bool SwitchWorkOrderCheckLabel(string pre_workorder);
     }
 }
diff --git a/DOAN.Service/JobKanban/WorkorderProgressService.cs b/DOAN.Service/JobKanban/WorkorderProgressService.cs
index 978ef8b..0478fc9 100644
--- a/DOAN.Service/JobKanban/WorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/WorkorderProgressService.cs
@@ -3,6 +3,7 @@ using DOAN.Model.MES.base_;
 using DOAN.Model.MES.mm;
 using DOAN.Model.MES.product;
 using DOAN.Model.MES.product.Dto;
+using DOAN.Model.Mobile;
 using DOAN.Service.JobKanban.IService;
 using DOAN.Service.MES.mm.line;
 using Infrastructure.Attribute;
@@ -353,4 +354,17 @@ public class WorkorderProgressService : BaseService<ProWorkorder>, IWorkorderPro
 
         return progress;
     }
+    public bool SwitchWorkOrderCheckLabel(string pre_workorder)
+    {
+        var result = Context.Queryable<ProInspectionLabel>().Where(it => it.Workorder == pre_workorder)
+            .Select(it => it.EndLabel).First();
+        if (!string.IsNullOrEmpty(result) )
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
 }
\ No newline at end of file