From 40c500ef7f72c10ec2ab126738a111db921b0024 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 17 May 2024 10:32:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E5=AD=90=E6=90=AC=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/mm/MmFinishedwarehouseController.cs       | 15 ++++++++++++++-
 .../mm/IService/IMmFinishedwarehouseService.cs    |  1 +
 ZR.Service/mes/mm/MmFinishedwarehouseService.cs   | 13 +++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/mm/MmFinishedwarehouseController.cs b/ZR.Admin.WebApi/Controllers/mes/mm/MmFinishedwarehouseController.cs
index c496278a..4fbc3b5d 100644
--- a/ZR.Admin.WebApi/Controllers/mes/mm/MmFinishedwarehouseController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/mm/MmFinishedwarehouseController.cs
@@ -33,7 +33,20 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm
 
         }
 
-      
+        /// <summary>
+        /// 包装箱字位置
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("finish_point_pack")]
+        public IActionResult Finish_point_pack()
+        {
+            string[] response = finishedwarehouseService.Finish_point_pack();
+
+            return SUCCESS(response);
+
+        }
+
+
 
     }
 }
diff --git a/ZR.Service/mes/mm/IService/IMmFinishedwarehouseService.cs b/ZR.Service/mes/mm/IService/IMmFinishedwarehouseService.cs
index 2aca3e73..76f5131e 100644
--- a/ZR.Service/mes/mm/IService/IMmFinishedwarehouseService.cs
+++ b/ZR.Service/mes/mm/IService/IMmFinishedwarehouseService.cs
@@ -9,5 +9,6 @@ namespace ZR.Service.mes.mm.IService
     public interface IMmFinishedwarehouseService
     {
         string[] Finish_point();
+        string[] Finish_point_pack();
      }
 }
diff --git a/ZR.Service/mes/mm/MmFinishedwarehouseService.cs b/ZR.Service/mes/mm/MmFinishedwarehouseService.cs
index 4283d41e..c7fe57c6 100644
--- a/ZR.Service/mes/mm/MmFinishedwarehouseService.cs
+++ b/ZR.Service/mes/mm/MmFinishedwarehouseService.cs
@@ -27,5 +27,18 @@ namespace ZR.Service.mes.mm
 
             return cors;
         }
+
+
+        public string[] Finish_point_pack()
+        {
+            List<MmAgvLocation> positions = Context.Queryable<MmAgvLocation>()
+                                          .Where(it => it.AreaCode == 9 || it.AreaCode == 10)
+                                          .ToList();
+
+            string[] cors = new string[positions.Count];
+            for (int i = 0; i < positions.Count; i++) cors[i] = positions[i].Coordinate.ToString();
+
+            return cors;
+        }
     }
 }