@ -346,26 +346,32 @@ namespace Application
PadResponse padResponse = new PadResponse ( ) ;
PadResponse padResponse = new PadResponse ( ) ;
try
try
{
{
List < WmsBaseLocation > Locationlist = sqlSugarClient . Queryable < WmsBaseLocation > ( )
List < WmsBaseLocationVo > Locationlist = sqlSugarClient . SqlQueryable < WmsBaseLocationVo >
. LeftJoin < WmsPalletInfo > ( ( wbi , wpi ) = > wbi . ContainerCode = = wpi . PalletInfoCode )
( "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" )
. Select ( ( wbi , wpi ) = > new WmsBaseLocation
. ToList ( ) ;
{
//List<WmsBaseLocation> Locationlist = sqlSugarClient.Queryable<WmsBaseLocation>().LeftJoin<WmsPalletInfo>((wbi, wpi) => wbi.ContainerCode == wpi.PalletInfoCode).ToList();
AgvPositionCode = wbi . AgvPositionCode ,
//List <AllLocationInfo> locationInfos = new List<AllLocationInfo>();
LocationStatus = wbi . LocationStatus ,
Amount = wpi . Amount ,
} ) . ToList ( ) ;
//List<AllLocationInfo> locationInfos = new List<AllLocationInfo>();
//foreach (var location in Locationlist)
//foreach (var location in Locationlist)
//{
//{
// if (location != null)
// if (location != null)
// {
// {
// WmsPalletInfo wmsPalletInfo = sqlSugarClient.Queryable<WmsPalletInfo>().Where(t => t.PalletInfoCode == location.ContainerCode).First();
// AllLocationInfo locationInfo = new AllLocationInfo();
// 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.LocationCode = location.AgvPositionCode;
// locationInfo.Amount = wmsPalletInfo.Amount;
// locationInfo.LocationStatus = location.LocationStatus;
// locationInfo.LocationStatus = location.LocationStatus;
// locationInfos.Add(locationInfo);
// locationInfos.Add(locationInfo);
// }
// }
// else
// else
// {
// {