From c4394798d7709e065b0555d7d183f06a59273f74 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 29 Mar 2024 14:43:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?wms:agv:=20=20agv=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/MES/wms/AgvLocation.cs    | 9 +++++++++
 ZR.Service/mes/wms/WmAGVService.cs | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ZR.Model/MES/wms/AgvLocation.cs b/ZR.Model/MES/wms/AgvLocation.cs
index 70596d53..43bb769b 100644
--- a/ZR.Model/MES/wms/AgvLocation.cs
+++ b/ZR.Model/MES/wms/AgvLocation.cs
@@ -17,6 +17,15 @@ namespace ZR.Model.MES.wms
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
 
+
+        /// <summary>
+        /// 区域 
+        /// </summary>
+       [SugarColumn(ColumnName = "area_code")]
+        public int? AreaCode { get; set; }
+
+
+
         /// <summary>
         /// 区域 
         /// </summary>
diff --git a/ZR.Service/mes/wms/WmAGVService.cs b/ZR.Service/mes/wms/WmAGVService.cs
index e6c8e558..402f53bb 100644
--- a/ZR.Service/mes/wms/WmAGVService.cs
+++ b/ZR.Service/mes/wms/WmAGVService.cs
@@ -113,7 +113,7 @@ namespace ZR.Service.Business
         public List<AgvLocation> GetAGV_position_list(AgvLocation location)
         {
             var predicate = Expressionable.Create<AgvLocation>()
-                .AndIF(string.IsNullOrEmpty(location.Area), it => it.Area == location.Area)
+                .AndIF(location.AreaCode>-1, it => it.AreaCode == location.AreaCode)
                 .AndIF(location.Type > -1, it => it.Type == location.Type)
                 .AndIF(string.IsNullOrEmpty(location.Coordinate), it => it.Coordinate == location.Coordinate);
 

From ca763ec39256445ab5f89b811391f881112f7a27 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 29 Mar 2024 14:43:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?wms:agv:=20=20agv=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
index f4ad3071..c93d7afd 100644
--- a/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmAGVController.cs
@@ -110,7 +110,7 @@ namespace ZR.Admin.WebApi.Controllers
         }
 
         /// <summary>
-        /// 5. 获取agv位置
+        /// 6 获取agv 起点和终点
         /// </summary>
         /// <param name="taskId"></param>
         /// <returns></returns>