From ba2e2dca05c90d92a3c8ffc8d9e6ec4075f3d4a2 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 19 Sep 2024 11:15:11 +0800
Subject: [PATCH] 1

---
 .../JobKanban/WorkOrderProgressController.cs  |  6 +--
 .../IService/IWorkorderProgressService.cs     |  2 +-
 .../JobKanban/WorkorderProgressService.cs     | 46 ++++++++++---------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
index 8179957..7d22345 100644
--- a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
+++ b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
@@ -85,13 +85,13 @@ namespace DOAN.WebApi.Controllers.JobKanban
 
         // 获取今日总任务数 ，剩余任务数
         [HttpGet("get_num_list")]
-        public IActionResult GetKanbanNum(DateTime today, string LineCode)
+        public IActionResult GetKanbanNum(DateTime today, string line_code, string group_code)
         {
-            if (today == DateTime.MinValue || string.IsNullOrEmpty(LineCode))
+            if (today == DateTime.MinValue || string.IsNullOrEmpty(line_code) || string.IsNullOrEmpty(group_code))
             {
                 return SUCCESS(null);
             }
-            var response = workorderProgressService.GetKanbanNum(today, LineCode);
+            var response = workorderProgressService.GetKanbanNum(today, line_code, group_code);
             return SUCCESS(response);
 
         }
diff --git a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
index 066c586..29e0f4e 100644
--- a/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/IService/IWorkorderProgressService.cs
@@ -24,7 +24,7 @@ namespace DOAN.Service.JobKanban.IService
 
         ProWorkorderDto4 GetWorkOrderDetail(string workorder);
 
-        KanbanInfo GetKanbanNum(DateTime today, string LineCode);
+        KanbanInfo GetKanbanNum(DateTime today, string line_code, string group_code);
         int StartWorkOrder(string workorder);
         int FinishWorkOrder(string workorder);
         ProWorkorder GetProductingWorkorder(string group_code, string line_code, DateTime handleDate);
diff --git a/DOAN.Service/JobKanban/WorkorderProgressService.cs b/DOAN.Service/JobKanban/WorkorderProgressService.cs
index 1736cd1..c4cb6b5 100644
--- a/DOAN.Service/JobKanban/WorkorderProgressService.cs
+++ b/DOAN.Service/JobKanban/WorkorderProgressService.cs
@@ -140,47 +140,49 @@ namespace DOAN.Service.JobKanban
 
         }
 
-        public KanbanInfo GetKanbanNum(DateTime today, string LineCode)
+        public KanbanInfo GetKanbanNum(DateTime today, string line_code, string group_code)
         {
             KanbanInfo kanbanInfo = new KanbanInfo();
             today = today.ToLocalTime().Date;
             kanbanInfo.TotalTaskNum = Context.Queryable<ProWorkorder>()
                .Where(it => it.WorkorderDate == today)
-               .Where(it => it.LineCode == LineCode)
+               .Where(it => it.LineCode == line_code)
+               .Where(it => it.GroupCode == group_code)
                .Count();
 
             kanbanInfo.RemainTasKNum = Context.Queryable<ProWorkorder>()
                .Where(it => it.WorkorderDate == today)
-               .Where(it => it.LineCode == LineCode)
+               .Where(it => it.LineCode == line_code)
+                .Where(it => it.GroupCode == group_code)
                .Where(it => it.Status == 1 || it.Status == 2)
                .Count();
 
             return kanbanInfo;
         }
 
-            public int StartWorkOrder(string workorder)
-            {
-                return Context.Updateable<ProWorkorder>().SetColumns(it => it.Status == 2)
-                    .Where(it => it.Workorder == workorder).ExecuteCommand();
-            }
+        public int StartWorkOrder(string workorder)
+        {
+            return Context.Updateable<ProWorkorder>().SetColumns(it => it.Status == 2)
+                .Where(it => it.Workorder == workorder).ExecuteCommand();
+        }
 
-            public int FinishWorkOrder(string workorder)
-            {
-                return Context.Updateable<ProWorkorder>().SetColumns(it => it.Status == 3)
-                   .Where(it => it.Workorder == workorder).ExecuteCommand();
-            }
+        public int FinishWorkOrder(string workorder)
+        {
+            return Context.Updateable<ProWorkorder>().SetColumns(it => it.Status == 3)
+               .Where(it => it.Workorder == workorder).ExecuteCommand();
+        }
 
-            public ProWorkorder GetProductingWorkorder(string group_code, string line_code, DateTime handleDate)
-            {
-                handleDate = handleDate.ToLocalTime().Date;
+        public ProWorkorder GetProductingWorkorder(string group_code, string line_code, DateTime handleDate)
+        {
+            handleDate = handleDate.ToLocalTime().Date;
 
-                return Context.Queryable<ProWorkorder>().Where(it => it.GroupCode == group_code)
-                      .Where(it => it.LineCode == line_code)
-                      .Where(it => it.WorkorderDate == handleDate)
-                      .Where(it => it.Status == 2).First();
+            return Context.Queryable<ProWorkorder>().Where(it => it.GroupCode == group_code)
+                  .Where(it => it.LineCode == line_code)
+                  .Where(it => it.WorkorderDate == handleDate)
+                  .Where(it => it.Status == 2).First();
+
+        }
 
-            }
-        
     }
 
 }