From 98823bd6e816b3f48e0ece88443b6ab69ea6bb59 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Sat, 16 Nov 2024 10:08:51 +0800
Subject: [PATCH] 1

---
 .../JobKanban/WorkOrderProgressController.cs  |  2 +-
 .../MES/product/ProReportworkService.cs       | 24 ++++++++++++++++---
 .../TaskScheduler/Job_MovSlow_Execute.cs      |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
index 3b280ef..c68e171 100644
--- a/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
+++ b/DOAN.Admin.WebApi/Controllers/JobKanban/WorkOrderProgressController.cs
@@ -77,7 +77,7 @@ public class WorkOrderProgressController : BaseController
         return SUCCESS(response);
     }
 
-    //TODO 获取不同状态的工单  (PDA用)
+    //TODO 获取不同状态的工单  (PDA用) (废弃)
     //TODO 根据班组，日期
     [HttpGet("get_workorder_status_list")]
     public IActionResult GetWorkOrderStatusList(string group_code,int status, DateTime handleDate)
diff --git a/DOAN.Service/MES/product/ProReportworkService.cs b/DOAN.Service/MES/product/ProReportworkService.cs
index 46dad65..6c8b9ec 100644
--- a/DOAN.Service/MES/product/ProReportworkService.cs
+++ b/DOAN.Service/MES/product/ProReportworkService.cs
@@ -134,9 +134,27 @@ namespace DOAN.Service.MES.product
             return Context.Queryable<ProWorkorder>()
                 .LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder)
                 .Where((w, r) => w.WorkorderDate == handleDate)
-                .Select((w, r) => r)
-                .ToList()
-                .Adapt<List<ProReportworkDto>>();
+                .Select((w, r) => new ProReportworkDto()
+                {
+                    Id = r.Id,
+                    ProductionCode=w.ProductionCode,
+                    ProductionName=w.ProductionName,
+                    Specification=w.Specification,
+                    QualifiedNumber = r.QualifiedNumber,
+                    UnqualifiedNumber = r.UnqualifiedNumber,
+                    ReworkNumber = r.ReworkNumber,
+                    ScrapNumber=r.ScrapNumber,
+                    Remark=r.Remark,
+                    Difference = r.QualifiedNumber-r.FinishedNum??0,
+                    FkWorkorder =w.Workorder,
+                    GroupCode = w.GroupCode,
+                    LineCode = w.LineCode,
+                    DispatchNum=w.DeliveryNum??0,
+                    Priority = w.Priority,
+                    Status = w.Status,
+                    Beat = w.Beat
+
+                }).ToList();
 
 
         }
diff --git a/DOAN.Tasks/TaskScheduler/Job_MovSlow_Execute.cs b/DOAN.Tasks/TaskScheduler/Job_MovSlow_Execute.cs
index ebda345..b73fe89 100644
--- a/DOAN.Tasks/TaskScheduler/Job_MovSlow_Execute.cs
+++ b/DOAN.Tasks/TaskScheduler/Job_MovSlow_Execute.cs
@@ -45,7 +45,7 @@ namespace DOAN.Tasks.TaskScheduler
                 throw new CustomException($"任务{trigger?.JobName}呆滞品任务调度请求执行失败，任务不存在");
             }
 
-            bool result = MmSlowMoveMaterialService.GenerateShopFloorSluggishProducts(DateTime.Today, "任务调度");
+            bool result = MmSlowMoveMaterialService.GenerateShopFloorSluggishProducts(DateTime.Today.AddDays(-1), "任务调度");
             logger.Info($"（job）任务【{info.Name}】设备管理调度请求执行结果=" + result);
 
         }