From 63182d725d4e56186fc0681f629fe4baecde05b5 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 7 Nov 2024 13:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E7=8F=AD=E7=BB=84=E4=BA=A7?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/Console/ConsoleController.cs          |  9 +++-
 DOAN.Service/MES/Console_/ConsoleService.cs   | 51 +++++++++++++++++--
 .../MES/Console_/IService/IConsoleService.cs  |  3 ++
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs b/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs
index f10069a..a256c7c 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs
@@ -31,7 +31,7 @@ public class ConsoleController : BaseController
         return SUCCESS(response);
 
     }
-    //TODO  线   任务数/工单数  
+    //TODO  产线   工单数/任务数  
     [HttpGet("get_moudel02")]
 
     public IActionResult GetLineOfTaskNumAndWorkorder()
@@ -41,5 +41,12 @@ public class ConsoleController : BaseController
         return SUCCESS(response);
     }
 
+    //TODO 班组工单数 今日班组产能
+    public IActionResult GetGroupWorkOrderNum()
+    {
+        var response = consoleService.GetGroupWorkOrderNum();
+        return SUCCESS(response);
+    }
+
     
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/Console_/ConsoleService.cs b/DOAN.Service/MES/Console_/ConsoleService.cs
index 702626c..5bcfd1a 100644
--- a/DOAN.Service/MES/Console_/ConsoleService.cs
+++ b/DOAN.Service/MES/Console_/ConsoleService.cs
@@ -64,7 +64,7 @@ public class ConsoleService : BaseService<ProWorkorder>, IConsoleService
 
 
     /// <summary>
-    /// 获取线   任务数/工单数 
+    /// 获取线   工单数/任务数 
     /// </summary>
     /// <returns></returns>
     public EchartsOptions GetLineOfTaskNumAndWorkorder()
@@ -94,7 +94,7 @@ public class ConsoleService : BaseService<ProWorkorder>, IConsoleService
      
         List<EchartsSeriesData> EchartsSeriesDataList = Context.Queryable<BaseWorkRoute>().LeftJoin<ProWorkorder>((r, w) => r.Code == w.LineCode)
             .Where((r,w)=>w.WorkorderDate == DateTime.Now.Date)
-            .OrderBy((r, w) => r.Code)
+            .OrderBy((r, w) => r.Id)
             .GroupBy((r, w) => r.Name)
             .Select((r, w) => new EchartsSeriesData { 
                 Name=r.Name,
@@ -110,7 +110,7 @@ public class ConsoleService : BaseService<ProWorkorder>, IConsoleService
 
         List<EchartsSeriesData> EchartsSeriesDataList02 = Context.Queryable<BaseWorkRoute>().LeftJoin<MmPreparationTaskLine>((r, w) => r.Code == w.LineCode)
             .Where((r, w) => w.TaskDate == DateTime.Now.Date)
-            .OrderBy((r, w) => r.Code)
+            .OrderBy((r, w) => r.Id)
             .GroupBy((r, w) => r.Name)
             .Select((r, w) => new EchartsSeriesData
             {
@@ -126,4 +126,49 @@ public class ConsoleService : BaseService<ProWorkorder>, IConsoleService
 
         return echartsOptions;
     }
+
+
+    /// <summary>
+    /// 班组工单数今日班组产能
+    /// </summary>
+    /// <returns></returns>
+    public EchartsOptions GetGroupWorkOrderNum()
+    {
+        EchartsOptions echartsOptions = new EchartsOptions();
+
+        EchartsTitle Title = new EchartsTitle();
+        Title.Text = "今日班组产能";
+        Title.SubText = "今日班组产能详情";
+        echartsOptions.Title = Title;
+        EchartsXAxis XAxis = new EchartsXAxis();
+
+        XAxis.Type = "category";
+
+        XAxis.Data = Context.Queryable<BaseWorkRoute>().OrderBy(it => it.Code).Select(it => it.Name).ToList();
+        echartsOptions.XAxis = XAxis;
+
+        EchartsYAxis YAxis = new EchartsYAxis();
+        YAxis.Type = "value";
+        echartsOptions.YAxis = YAxis;
+
+        List<EchartsSeries> Series = new List<EchartsSeries>();
+        EchartsSeries serie01 = new EchartsSeries();
+        serie01.Name = "工单数";
+        serie01.Type = "bar";
+
+        List<EchartsSeriesData> EchartsSeriesDataList = Context.Queryable<BaseGroup>().LeftJoin<ProWorkorder>((r, w) => r.GroupCode == w.GroupCode)
+            .Where((r, w) => w.WorkorderDate == DateTime.Now.Date)
+            .OrderBy((r, w) => r.Id)
+            .GroupBy((r, w) => r.GroupCode)
+            .Select((r, w) => new EchartsSeriesData
+            {
+                Name = r.GroupName,
+                Value = SqlFunc.AggregateCount(w)
+
+            }).ToList();
+        serie01.Data = EchartsSeriesDataList;
+        Series.Add(serie01);
+        echartsOptions.Series = Series;
+        return echartsOptions;
+    }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/Console_/IService/IConsoleService.cs b/DOAN.Service/MES/Console_/IService/IConsoleService.cs
index e666fcf..6d5fa0a 100644
--- a/DOAN.Service/MES/Console_/IService/IConsoleService.cs
+++ b/DOAN.Service/MES/Console_/IService/IConsoleService.cs
@@ -13,4 +13,7 @@ public interface IConsoleService : IBaseService<ProWorkorder>
 
 
     EchartsOptions GetLineOfTaskNumAndWorkorder();
+
+
+    EchartsOptions GetGroupWorkOrderNum();
 }
\ No newline at end of file