我的配料修改

ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs

@@ -160,7 +160,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
         }
 
         /// <summary>
-        /// 
+        /// agv完成任务
         /// </summary>
         /// <returns></returns>
         [HttpPost("agv_final_task")]
@@ -169,5 +169,31 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
             return null;
         }
 
+        /// <summary>
+        /// 完成配料任务
+        /// 1.更改站点托盘
+        /// 2.完成的配料任务不可见
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("finishBatchingTask")]
+        public IActionResult FinishBatchingTask(string start_point, string end_point, string taskId)
+        {
+            if (string.IsNullOrEmpty(start_point))
+            {
+                return SUCCESS(null);
+            }
+            if (string.IsNullOrEmpty(end_point))
+            {
+                return SUCCESS(null);
+            }
+            if (string.IsNullOrEmpty(taskId))
+            {
+                return SUCCESS(null);
+            }
+
+            var response = materialInputService.FinishBatchingTask(start_point, end_point, taskId);
+            return SUCCESS(response);
+        }
+
     }
 }

ZR.Model/MES/mm/MmIngredientTask.cs

@@ -50,6 +50,10 @@ namespace ZR.Model.MES.mm
         /// </summary>
         public int? PreviousNumbered { get; set; }
 
+
+
+        public  int?   Isfinal { get; set; }
+
         /// <summary>
         /// 创建人 
         /// </summary>

ZR.Service/mes/mm/IService/IMaterialInputService.cs

@@ -29,5 +29,7 @@ namespace ZR.Service.mes.mm.IService
         string AGV_schedule(string start_point, string end_point);
         string EmergencyStopAgv(string reqCode);
 
+        int FinishBatchingTask(string start_point, string end_point, string taskId);
+
     }
 }

ZR.Service/mes/mm/MaterialInputService.cs

@@ -160,6 +160,7 @@ namespace ZR.Service.mes.mm
                 ingredientTask.TaskId = taskid.ToString();
                 ingredientTask.Workorder = item.workorder;
                 ingredientTask.Partnumber = item.partnumber;
+                ingredientTask.Isfinal = 0;
                 ingredientTask.PreviousNumber = item.previousNumber;
                 ingredientTask.PreviousNumbered = item.previousNumbered;
                 ingredientTask.CreatedBy = name;
@@ -189,6 +190,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)
                  .GroupBy(it => it.TaskId)
                  .Select(it => new MmIngredientTask()
                  {
@@ -285,6 +287,25 @@ namespace ZR.Service.mes.mm
 
 
         }
+
+
+        /// <summary>
+        /// 完成配料任务
+        /// 1.更改站点托盘
+        /// 2.完成的配料任务不可见
+        /// </summary>
+        /// <returns></returns>
+        public int FinishBatchingTask(string start_point, string end_point, string taskId)
+        {
+            int result = 0;
+            UseTran2(() =>
+            {
+                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();
+            });
+          return result;
+        }
     }
 }