From f6fadc36f64857ee7606554d4804c9d8714f26d9 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 7 Nov 2024 11:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=8D=95=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=89=AB=E6=8F=8F=E6=9D=A1=E7=A0=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JobKanban/WorkOrderProgressController.cs  | 13 +++++++++++
 .../IService/IWorkorderProgressService.cs     |  2 ++
 .../JobKanban/WorkorderProgressService.cs     | 22 ++++++++++++++++---
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
index eb7b9b3..de11d11 100644
--- a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
+++ b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
@@ -195,4 +195,17 @@ public class WorkOrderProgressController : BaseController
         var response = workorderProgressService.GetWorkOrderTime(workorder);
         return SUCCESS(response);
     }
+
+
+    //TODO  查询工单下的扫描条码信息
+    [HttpGet("get_san_code_info)")]
+    public  IActionResult  GetWorkOrderScanCodeInfo(string workorder)
+    {
+        if (string.IsNullOrEmpty(workorder)) throw new CustomException("workorder is null");
+        var response = workorderProgressService.GetWorkOrderScanCodeInfo(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 9c98255..9bd30e8 100644
--- a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
@@ -37,5 +37,7 @@ namespace DOAN.Service.JobKanban.IService
 
         (int ,int) GetWorkOrderProgress(string workorder);
         (DateTime, float) GetWorkOrderTime(string workorder);
+
+        List<ProReportworkDetail> GetWorkOrderScanCodeInfo(string workorder);
     }
 }
diff --git a/DOAN.Service/JobKanban/WorkorderProgressService.cs b/DOAN.Service/JobKanban/WorkorderProgressService.cs
index c499ad6..1c2abd3 100644
--- a/DOAN.Service/JobKanban/WorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/WorkorderProgressService.cs
@@ -5,6 +5,7 @@ using DOAN.Model.MES.product;
 using DOAN.Model.MES.product.Dto;
 using DOAN.Service.JobKanban.IService;
 using Infrastructure.Attribute;
+using Mapster;
 using SqlSugar.SplitTableExtensions;
 
 namespace DOAN.Service.JobKanban;
@@ -25,13 +26,20 @@ public class WorkorderProgressService : BaseService<ProWorkorder>, IWorkorderPro
 
     public List<ProReportwork> GetReportWorkRecord(string group_code, string line_code, DateTime handleDate)
     {
-        handleDate = handleDate.ToLocalTime().Date;
+
         return Context.Queryable<ProWorkorder>().LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder)
               .Where((w, r) => w.GroupCode == group_code)
               .Where((w, r) => w.LineCode == line_code)
               .Where((w, r) => w.WorkorderDate == handleDate)
-              .Select((w, r) => r)
-              .ToList();
+              .Select((w, r) => new
+              {
+                  FkWorkorder = w.Workorder,
+                  DispatchNum = w.DeliveryNum,
+                  FinishedNum = r.FinishedNum,
+
+
+              })
+              .ToList().Adapt<List<ProReportwork>>();
 
 
     }
@@ -292,4 +300,12 @@ public class WorkorderProgressService : BaseService<ProWorkorder>, IWorkorderPro
 
         return progress;
     }
+
+
+
+    //查询工单下的扫描条码信息
+    public List<ProReportworkDetail> GetWorkOrderScanCodeInfo(string workorder)
+    {
+        return Context.Queryable<ProReportworkDetail>().Where(it => it.Workorder == workorder).ToList();
+    }
 }
\ No newline at end of file