From 8b8de3e8838fcedab6da1021061010863647e2d6 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Sat, 11 May 2024 14:22:15 +0800
Subject: [PATCH] update

---
 .../mes/mm/MaterialInputController.cs            |  3 ++-
 ZR.Service/mes/mm/MaterialInputService.cs        | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
index d661ae99..23cbac1c 100644
--- a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
@@ -172,8 +172,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
 
         /// <summary>
         /// 完成配料任务
-        /// 1.更改站点托盘
+        /// 1.更改站点托盘 ？？
         /// 2.完成的配料任务不可见
+        /// 3.生产上线
         /// </summary>
         /// <returns></returns>
         [HttpGet("finishBatchingTask")]
diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs
index f14962cd..d2c07f47 100644
--- a/ZR.Service/mes/mm/MaterialInputService.cs
+++ b/ZR.Service/mes/mm/MaterialInputService.cs
@@ -23,6 +23,7 @@ using System.Text.Json;
 using Infrastructure;
 using ZR.Repository;
 using System.Numerics;
+using ZR.Model.mes.pro;
 
 namespace ZR.Service.mes.mm
 {
@@ -213,7 +214,7 @@ namespace ZR.Service.mes.mm
             DateTime endOfDay = startOfDay.AddDays(1).AddTicks(-1);
             return Context.Queryable<MmIngredientTask>()
                  .Where(it => it.CreatedTime > startOfDay && it.CreatedTime < endOfDay)
-                 //.Where(it => it.Isfinal == 0)
+                 .Where(it => it.Isfinal == 0)
                  .GroupBy(it => it.TaskId)
                  .Select(it => new MmIngredientTask()
                  {
@@ -344,8 +345,19 @@ namespace ZR.Service.mes.mm
             {
                // Context.Updateable<MmAgvLocation>().Where(it => it.Coordinate == start_point).SetColumns(it => it.Status == 0).ExecuteCommand();
               //  Context.Updateable<MmAgvLocation>().Where(it => it.Coordinate == end_point).SetColumns(it => it.Status == 1).ExecuteCommand();
-                result = Context.Updateable<MmIngredientTask>().Where(it => it.TaskId.Equals(taskId)).SetColumns(it => it.Isfinal == 1).ExecuteCommand();
+                  result = Context.Updateable<MmIngredientTask>().Where(it => it.TaskId.Equals(taskId)).SetColumns(it => it.Isfinal == 1).ExecuteCommand();
+                  List<MmIngredientTask>  tasks= Context.Queryable<MmIngredientTask>().Where(it => it.TaskId.Equals(taskId)).ToList();
+                for(int i=0; i<tasks.Count; i++)
+                {
+                    if (!string.IsNullOrEmpty(tasks[i].Workorder))
+                    {
+                        Context.Updateable<ProWorkorder_v2>().Where(it=>it.ClientWorkorder== tasks[i].Workorder).SetColumns(it => it.Status == 1).ExecuteCommand();
+                    }
+                }
+
             });
+
+
             return result;
         }