修改 获取库存接口查询

Application/WcsTaskApplication.cs

@@ -346,31 +346,39 @@ namespace Application
             PadResponse padResponse = new PadResponse();
             try
             {
-                List<WmsBaseLocation> Locationlist = sqlSugarClient.Queryable<WmsBaseLocation>().LeftJoin<WmsPalletInfo>((wbi,wpi) => wbi.ContainerCode == wpi.PalletInfoCode).ToList();
+                List<WmsBaseLocation> Locationlist = sqlSugarClient.Queryable<WmsBaseLocation>()
-                List<AllLocationInfo> locationInfos = new List<AllLocationInfo>();
+                    .LeftJoin<WmsPalletInfo>((wbi,wpi) => wbi.ContainerCode == wpi.PalletInfoCode)
-                foreach (var location in Locationlist)
+                   .Select((wbi, wpi) => new WmsBaseLocation
-                {
+                   {
-                    if (location != null)
+                       AgvPositionCode = wbi.AgvPositionCode,
-                    {
+                       LocationStatus = wbi.LocationStatus,
-                        WmsPalletInfo wmsPalletInfo = sqlSugarClient.Queryable<WmsPalletInfo>().Where(t => t.PalletInfoCode == location.ContainerCode).First();
+                      Amount = wpi.Amount,
-                        AllLocationInfo locationInfo = new AllLocationInfo();
+             
-                        locationInfo.LocationCode = location.AgvPositionCode;
+                   }).ToList();
-                        locationInfo.Amount = wmsPalletInfo.Amount;
+                //List<AllLocationInfo> locationInfos = new List<AllLocationInfo>();
-                        locationInfo.LocationStatus = location.LocationStatus;
+                //foreach (var location in Locationlist)
-                        locationInfos.Add(locationInfo);
+                //{
-                    }
+                //    if (location != null)
-                    else
+                //    {
-                    {
+                //        WmsPalletInfo wmsPalletInfo = sqlSugarClient.Queryable<WmsPalletInfo>().Where(t => t.PalletInfoCode == location.ContainerCode).First();
-                        AllLocationInfo locationInfo = new AllLocationInfo();
+                //        AllLocationInfo locationInfo = new AllLocationInfo();
-                        locationInfo.LocationCode = "";
+                //        locationInfo.LocationCode = location.AgvPositionCode;
-                        locationInfo.Amount = 0;
+                //        locationInfo.Amount = wmsPalletInfo.Amount;
-                        locationInfo.LocationStatus = 0;
+                //        locationInfo.LocationStatus = location.LocationStatus;
-                        locationInfos.Add(locationInfo);
+                //        locationInfos.Add(locationInfo);
-                    }
+                //    }
-                }
+                //    else
+                //    {
+                //        AllLocationInfo locationInfo = new AllLocationInfo();
+                //        locationInfo.LocationCode = "";
+                //        locationInfo.Amount = 0;
+                //        locationInfo.LocationStatus = 0;
+                //        locationInfos.Add(locationInfo);
+                //    }
+                //}
                 padResponse.code = "200";
                 padResponse.message = "成功";
-                padResponse.data = locationInfos;
+                padResponse.data = Locationlist;
             }
             catch (Exception ex)
             {

SlnMesnac.Model/domain/WmsBaseLocation.cs

@@ -55,5 +55,10 @@ namespace SlnMesnac.Model.domain
 
         [SugarColumn(ColumnName = "equip_key", ColumnDescription = "RFId设备key")]
         public string? EquipKey { get; set; }
+
+
+
+
+        public int Amount { get; set; }
     }
 }