From 81d640ee8b82c785766992217c45c5b863484a56 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 19 Sep 2024 14:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A5=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JobKanban/WorkOrderProgressController.cs  | 19 ++++++++
 .../IService/IWorkorderProgressService.cs     |  3 ++
 .../JobKanban/WorkorderProgressService.cs     | 43 +++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
index 12151aa..4f5c7cb 100644
--- a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
+++ b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
@@ -2,6 +2,8 @@
 using DOAN.Admin.WebApi.Filters;
 using DOAN.Service.JobKanban.IService;
 using DOAN.Service.JobKanban;
+using DOAN.Model.MES.product.Dto;
+using DOAN.Model.MES.product;
 namespace DOAN.WebApi.Controllers.JobKanban
 {
     /// <summary>
@@ -147,6 +149,23 @@ namespace DOAN.WebApi.Controllers.JobKanban
             return SUCCESS(response);
         }
 
+        /// <summary>
+        /// TODO 完成 工单和报工 (启用)
+        /// </summary>
+        /// <param name="workorder"></param>
+        /// <returns></returns>
+        [HttpPost("finish_workorder2")]
+        public IActionResult FinishWorkOrder2([FromBody] ProReportworkDto3 reportWorkDto)
+        {
+            if (reportWorkDto == null)
+            {
+                return SUCCESS(null);
+            }
+            ProReportwork reportWork = reportWorkDto.Adapt<ProReportwork>();
+            reportWork.ToCreate(HttpContext);
+            var response = workorderProgressService.FinishWorkOrder(reportWork);
+            return SUCCESS(response);
+        }
 
 
     }
diff --git a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
index a9d8a19..0936c67 100644
--- a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
@@ -32,5 +32,8 @@ namespace DOAN.Service.JobKanban.IService
 
        int  LabelWorkOrderMatch(string LabelContext, string workOrder);
 
+
+        int FinishWorkOrder(ProReportwork reportWorkDto);
+
     }
 }
diff --git a/DOAN.Service/JobKanban/WorkorderProgressService.cs b/DOAN.Service/JobKanban/WorkorderProgressService.cs
index a1b1081..7881d78 100644
--- a/DOAN.Service/JobKanban/WorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/WorkorderProgressService.cs
@@ -194,6 +194,49 @@ namespace DOAN.Service.JobKanban
                 .ExecuteCommand();
         }
 
+        /// <summary>
+        /// 完成工单和报工
+        /// </summary>
+        /// <param name="workorder"></param>
+        /// <param name="num">完成数量</param>
+        /// <returns></returns>
+        public int FinishWorkOrder(ProReportwork reportWorkDto)
+        {
+
+            int result = 0;
+
+            int DispatchNum = Context.Queryable<ProWorkorder>()
+                    .Where(it => it.Workorder == reportWorkDto.FkWorkorder)
+                    .Select(it => it.DeliveryNum.Value).First();
+            UseTran2(() =>
+            {
+                result = Context.Updateable<ProWorkorder>()
+                .Where(it => it.Workorder == reportWorkDto.FkWorkorder)
+                .SetColumns(it => it.Status == 3)
+                .ExecuteCommand();
+
+
+                reportWorkDto.Id = XueHua;
+                reportWorkDto.DispatchNum = DispatchNum;
+                Context.Storageable(reportWorkDto)
+                      .WhereColumns(it => it.FkWorkorder)
+                      .ExecuteCommand();
+            });
+            //ProReportwork reportWork = new ProReportwork();
+            //reportWork.Id = XueHua;
+            //reportWork.FkWorkorder = reportWorkDto.FkWorkorder;
+            //reportWork.DispatchNum = DispatchNum;
+            //reportWork.FinishedNum = reportWorkDto.FinishedNum;
+            //reportWork.GroupCode = reportWorkDto.GroupCode;
+            //reportWork.LineCode = reportWorkDto.LineCode;
+            //reportWork.GroupLeader = reportWorkDto.GroupLeader;
+            //reportWork.CreatedTime = DateTime.Now;
+            //reportWork.CreatedBy = reportWorkDto.CreatedBy;
+
+            return result;
+        }
+
+
     }
 
 }