From d16a6a21020096cea729ef96987b435656ab9134 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Fri, 18 Jul 2025 14:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/WcsTaskApplication.cs           | 30 ++++++++++++---------
 SlnMesnac.Model/domain/WmsBaseLocation.cs   |  2 +-
 SlnMesnac.Model/domain/WmsBaseLocationVo.cs | 15 +++++++++++
 3 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 SlnMesnac.Model/domain/WmsBaseLocationVo.cs

diff --git a/Application/WcsTaskApplication.cs b/Application/WcsTaskApplication.cs
index bb0e0ef..0339a87 100644
--- a/Application/WcsTaskApplication.cs
+++ b/Application/WcsTaskApplication.cs
@@ -346,26 +346,32 @@ namespace Application
             PadResponse padResponse = new PadResponse();
             try
             {
-                List<WmsBaseLocation> Locationlist = sqlSugarClient.Queryable<WmsBaseLocation>()
-                    .LeftJoin<WmsPalletInfo>((wbi,wpi) => wbi.ContainerCode == wpi.PalletInfoCode)
-                   .Select((wbi, wpi) => new WmsBaseLocation
-                   {
-                       AgvPositionCode = wbi.AgvPositionCode,
-                       LocationStatus = wbi.LocationStatus,
-                      Amount = wpi.Amount,
-             
-                   }).ToList();
-                //List<AllLocationInfo> locationInfos = new List<AllLocationInfo>();
+                List<WmsBaseLocationVo> Locationlist = sqlSugarClient.SqlQueryable<WmsBaseLocationVo>
+                    ("SELECT agv_position_code,location_status,ifnull(amount,0)  as amount  FROM wms_base_location wbl LEFT JOIN wms_pallet_info wpi ON wbl.container_code=wpi.pallet_info_code")
+                    .ToList();
+                //List<WmsBaseLocation> Locationlist = sqlSugarClient.Queryable<WmsBaseLocation>().LeftJoin<WmsPalletInfo>((wbi, wpi) => wbi.ContainerCode == wpi.PalletInfoCode).ToList();
+                //List <AllLocationInfo> locationInfos = new List<AllLocationInfo>();
                 //foreach (var location in Locationlist)
                 //{
                 //    if (location != null)
                 //    {
-                //        WmsPalletInfo wmsPalletInfo = sqlSugarClient.Queryable<WmsPalletInfo>().Where(t => t.PalletInfoCode == location.ContainerCode).First();
                 //        AllLocationInfo locationInfo = new AllLocationInfo();
+                //        if (location.ContainerCode != "")
+                //        {
+                //            WmsPalletInfo wmsPalletInfo = sqlSugarClient.Queryable<WmsPalletInfo>().Where(t => t.PalletInfoCode == location.ContainerCode).First();
+
+
+                //            locationInfo.Amount = wmsPalletInfo.Amount;
+
+
+                //        }
+                //        else {
+                //            locationInfo.Amount = 0;
+                //        }
                 //        locationInfo.LocationCode = location.AgvPositionCode;
-                //        locationInfo.Amount = wmsPalletInfo.Amount;
                 //        locationInfo.LocationStatus = location.LocationStatus;
                 //        locationInfos.Add(locationInfo);
+
                 //    }
                 //    else
                 //    {
diff --git a/SlnMesnac.Model/domain/WmsBaseLocation.cs b/SlnMesnac.Model/domain/WmsBaseLocation.cs
index 28d4fde..c31224c 100644
--- a/SlnMesnac.Model/domain/WmsBaseLocation.cs
+++ b/SlnMesnac.Model/domain/WmsBaseLocation.cs
@@ -59,6 +59,6 @@ namespace SlnMesnac.Model.domain
 
 
 
-        public int Amount { get; set; }
+      
     }
 }
\ No newline at end of file
diff --git a/SlnMesnac.Model/domain/WmsBaseLocationVo.cs b/SlnMesnac.Model/domain/WmsBaseLocationVo.cs
new file mode 100644
index 0000000..24dfb56
--- /dev/null
+++ b/SlnMesnac.Model/domain/WmsBaseLocationVo.cs
@@ -0,0 +1,15 @@
+using SqlSugar;
+using System;
+using System.Runtime.Serialization;
+
+namespace SlnMesnac.Model.domain
+{
+  
+    public class WmsBaseLocationVo : WmsBaseLocation
+    {
+        
+
+
+        public int Amount { get; set; }
+    }
+}
\ No newline at end of file