From 1f8d860379df3071e71345992f5009cd40fec443 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 14 May 2024 15:41:42 +0800
Subject: [PATCH] =?UTF-8?q?agv=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/mes/mm/MaterialInputController.cs         | 8 ++++----
 ZR.Model/MES/wms/AGVtask_third.cs                         | 1 +
 ZR.Service/mes/mm/IService/IMaterialInputService.cs       | 2 +-
 ZR.Service/mes/mm/MaterialInputService.cs                 | 4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
index 05a8d69d..40af7115 100644
--- a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs
@@ -133,13 +133,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
         /// <param name="end_point"></param>
         /// <returns></returns>
         [HttpGet("go_workshop")]
-        public IActionResult GoWorkshop(string start_point, string end_point)
+        public IActionResult GoWorkshop(string start_point, string end_point, string agvCode = "1743 ")
         {
             if (string.IsNullOrEmpty(start_point) || string.IsNullOrEmpty(end_point))
             {
                 SUCCESS(null);
             }
-            var response = materialInputService.AGV_schedule(start_point, end_point);
+            var response = materialInputService.AGV_schedule(start_point, end_point, agvCode);
 
             return SUCCESS(response);
         }
@@ -205,13 +205,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
         /// <param name="end_point"></param>
         /// <returns></returns>
         [HttpGet("emptycarreturn")]
-        public  IActionResult  Emptycarreturn(string start_point, string end_point)
+        public  IActionResult  Emptycarreturn(string start_point, string end_point, string agvCode = "1743 ")
         {
             if (string.IsNullOrEmpty(start_point) || string.IsNullOrEmpty(end_point))
             {
                 SUCCESS(null);
             }
-            var response = materialInputService.AGV_schedule(start_point, end_point);
+            var response = materialInputService.AGV_schedule(start_point, end_point,agvCode);
 
             return SUCCESS(response);
         }
diff --git a/ZR.Model/MES/wms/AGVtask_third.cs b/ZR.Model/MES/wms/AGVtask_third.cs
index 79892b1a..55935d21 100644
--- a/ZR.Model/MES/wms/AGVtask_third.cs
+++ b/ZR.Model/MES/wms/AGVtask_third.cs
@@ -18,6 +18,7 @@ namespace ZR.Model.MES.wms
         public List<AGV_location_third> positionCodePath { get; set; }
         public  string podDir { get; set; }
         public  string priority { get; set; }
+        public string agvCode { get; set; }
     }
     public  class AGV_location_third
     {
diff --git a/ZR.Service/mes/mm/IService/IMaterialInputService.cs b/ZR.Service/mes/mm/IService/IMaterialInputService.cs
index e4b6d631..5c2b1880 100644
--- a/ZR.Service/mes/mm/IService/IMaterialInputService.cs
+++ b/ZR.Service/mes/mm/IService/IMaterialInputService.cs
@@ -26,7 +26,7 @@ namespace ZR.Service.mes.mm.IService
 
         string[] Getfabgopoints();
 
-        string AGV_schedule(string start_point, string end_point);
+        string AGV_schedule(string start_point, string end_point,string agvCode);
         string EmergencyStopAgv(string reqCode);
 
         int FinishBatchingTask(string start_point, string end_point, string taskId);
diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs
index 1b869366..5fd017c8 100644
--- a/ZR.Service/mes/mm/MaterialInputService.cs
+++ b/ZR.Service/mes/mm/MaterialInputService.cs
@@ -267,7 +267,7 @@ namespace ZR.Service.mes.mm
         /// <param name="start_point"></param>
         /// <param name="end_point"></param>
         /// <returns></returns>
-        public string AGV_schedule(string start_point, string end_point)
+        public string AGV_schedule(string start_point, string end_point,string agvCode= "1743 ")
         {
             // 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();
@@ -277,12 +277,14 @@ namespace ZR.Service.mes.mm
             AGVtask_third task = new AGVtask_third();
             task.reqCode = SnowFlakeSingle.Instance.NextId().ToString();
             task.taskTyp = "F01";
+            task.agvCode = agvCode;
             // MmAgvLocation start_object = Context.Queryable<MmAgvLocation>().Where(it => it.Coordinate == start_point).First();
             // MmAgvLocation end_object = Context.Queryable<MmAgvLocation>().Where(it => it.Coordinate == end_point).First();
             //判断是否跨楼层
             if (end_point == "R1" || start_point == "R1")
             {
                 task.taskTyp = "KLC";
+               
             }
 
             task.positionCodePath = new List<AGV_location_third>