From 89ea2d7ff8baebdf0fb2ae002c578abcd462c3d8 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Wed, 14 Aug 2024 16:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8F=AD=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base => JobKanban}/BaseGroupController.cs |  6 +++---
 .../JobKanban/LoginOrSetController.cs         | 21 +++++++++++++++++++
 .../JobKanban/IService/ILoginOrSetService.cs  |  8 ++++++-
 DOAN.Service/JobKanban/LoginOrSetService.cs   |  6 ++++++
 4 files changed, 37 insertions(+), 4 deletions(-)
 rename DOAN.Admin.WebApi/Controllers/{MES/base => JobKanban}/BaseGroupController.cs (98%)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/base/BaseGroupController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/BaseGroupController.cs
similarity index 98%
rename from DOAN.Admin.WebApi/Controllers/MES/base/BaseGroupController.cs
rename to DOAN.Admin.WebApi/Controllers/JobKanban/BaseGroupController.cs
index 8e0bb4c..5a094a8 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/base/BaseGroupController.cs
+++ b/DOAN.Admin.WebApi/Controllers/JobKanban/BaseGroupController.cs
@@ -7,10 +7,10 @@ using DOAN.Admin.WebApi.Filters;
 
 
 //创建时间：2024-07-22
-namespace DOAN.Admin.WebApi.Controllers
+namespace DOAN.WebApi.Controllers.JobKanban
 {
     /// <summary>
-    /// 
+    /// 废弃
     /// </summary>
     [Verify]
     [Route("mes/baseManagement/BaseGroup")]
@@ -50,7 +50,7 @@ namespace DOAN.Admin.WebApi.Controllers
         public IActionResult GetBaseGroup(int Id)
         {
             var response = _BaseGroupService.GetInfo(Id);
-            
+
             var info = response.Adapt<BaseGroup>();
             return SUCCESS(info);
         }
diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs
index b78cd0f..10af9ea 100644
--- a/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs
+++ b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs
@@ -7,6 +7,8 @@ using Aliyun.OSS;
 using NPOI.SS.Formula.Functions;
 using DOAN.Model.MES.product;
 using DOAN.Model.MES.product.Dto;
+using DOAN.Model.MES.group.Dto;
+using DOAN.Service.group.IService;
 
 //创建时间：2024-07-08
 namespace DOAN.Admin.WebApi.Controllers.JobKanban
@@ -26,10 +28,12 @@ namespace DOAN.Admin.WebApi.Controllers.JobKanban
         public LoginOrSetController(ILoginOrSetService LoginOrSetService)
         {
             _LoginOrSetService = LoginOrSetService;
+           
         }
 
 
 
+
         /// <summary>
         /// 获取组
         /// </summary>
@@ -167,7 +171,24 @@ namespace DOAN.Admin.WebApi.Controllers.JobKanban
         //}
 
 
+        /// <summary>
+        /// TODO 根据日期获取班组
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        [HttpGet("list_by_date")]
+        public IActionResult ListGroupByDate(DateTime date)
+        {
+            if (date == DateTime.MinValue)
+            {
+                return SUCCESS(null);
+            }
+            var response = _LoginOrSetService.ListGroupByDate(date.Date);
 
+            return SUCCESS(response);
+
+
+        }
 
 
 
diff --git a/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs b/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs
index 1fd99fc..d907510 100644
--- a/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs
+++ b/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs
@@ -1,5 +1,6 @@
 using DOAN.Model.JobKanban;
 using DOAN.Model.MES.base_;
+using DOAN.Model.MES.group;
 using DOAN.Model.MES.product;
 using DOAN.Model.MES.product.Dto;
 using NPOI.SS.Formula.Functions;
@@ -8,6 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace DOAN.Service.JobKanban.IService
 {
@@ -27,7 +29,11 @@ namespace DOAN.Service.JobKanban.IService
         int FinishWorkOrder(ProReportwork reportWorkDto);
 
         KanbanInfo GetKanbanNum(DateTime today, string LineCode);
-     
+
+        List<GroupSchedule> ListGroupByDate(DateTime date);
+
+
+
 
 
     }
diff --git a/DOAN.Service/JobKanban/LoginOrSetService.cs b/DOAN.Service/JobKanban/LoginOrSetService.cs
index 551cf97..6753227 100644
--- a/DOAN.Service/JobKanban/LoginOrSetService.cs
+++ b/DOAN.Service/JobKanban/LoginOrSetService.cs
@@ -8,6 +8,7 @@ using DOAN.Model.JobKanban;
 using DOAN.Model.MES.andon;
 using DOAN.Model.MES.base_;
 using DOAN.Model.MES.base_.Dto;
+using DOAN.Model.MES.group;
 using DOAN.Model.MES.product;
 using DOAN.Model.MES.product.Dto;
 using DOAN.Service.JobKanban.IService;
@@ -201,7 +202,12 @@ namespace DOAN.Service.JobKanban
         }
 
 
+        public List<GroupSchedule> ListGroupByDate(DateTime date)
+        {
 
+           return Context.Queryable<GroupSchedule>().Where(it=>it.ScheduleDate == date)
+                .ToList();
+        }
 
     }