From 7e15b73a9511e47b7916e187bf9afaa81cf36379 Mon Sep 17 00:00:00 2001
From: zhangxy <xuanyu9708>
Date: Fri, 18 Jul 2025 10:25:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E5=85=A8=E9=83=A8=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/PdaDto/LocationInfo.cs |  2 ++
 Application/WcsTaskApplication.cs  | 27 +++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Application/PdaDto/LocationInfo.cs b/Application/PdaDto/LocationInfo.cs
index afd8d5b..9f9d7a8 100644
--- a/Application/PdaDto/LocationInfo.cs
+++ b/Application/PdaDto/LocationInfo.cs
@@ -12,5 +12,7 @@ namespace Application.PdaDto
         public string PalletInfoCode { get; set; } = "";
 
         public int Amount { get; set; }
+
+        public int LocationStatus { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Application/WcsTaskApplication.cs b/Application/WcsTaskApplication.cs
index 3ba8a01..ae59eb4 100644
--- a/Application/WcsTaskApplication.cs
+++ b/Application/WcsTaskApplication.cs
@@ -346,10 +346,33 @@ namespace Application
             PadResponse padResponse = new PadResponse();
             try
             {
-                List<WmsBaseLocation> list = sqlSugarClient.Queryable<WmsBaseLocation>().Where(x => !string.IsNullOrEmpty(x.AgvPositionCode)).ToList();
+                List<WmsBaseLocation> Locationlist = sqlSugarClient.Queryable<WmsBaseLocation>().Where(x => !string.IsNullOrEmpty(x.AgvPositionCode)).ToList();
+                List<LocationInfo> locationInfos = new List<LocationInfo>();
+                foreach (WmsBaseLocation location in Locationlist)
+                {
+                    if (location != null)
+                    {
+                        WmsPalletInfo wmsPalletInfo = sqlSugarClient.Queryable<WmsPalletInfo>().Where(t => t.PalletInfoCode == location.ContainerCode).First();
+                        LocationInfo locationInfo = new LocationInfo();
+                        locationInfo.LocationCode = location.AgvPositionCode;
+                        locationInfo.PalletInfoCode = wmsPalletInfo.PalletInfoCode;
+                        locationInfo.Amount = wmsPalletInfo.Amount;
+                        locationInfo.LocationStatus = location.LocationStatus;
+                        locationInfos.Add(locationInfo);
+                    }
+                    else
+                    {
+                        LocationInfo locationInfo = new LocationInfo();
+                        locationInfo.LocationCode = "";
+                        locationInfo.PalletInfoCode = "";
+                        locationInfo.Amount = 0;
+                        locationInfo.LocationStatus = 0;
+                        locationInfos.Add(locationInfo);
+                    }
+                }
                 padResponse.code = "200";
                 padResponse.message = "成功";
-                padResponse.data = list;
+                padResponse.data = locationInfos;
             }
             catch (Exception ex)
             {