|
|
|
|
@ -347,24 +347,22 @@ namespace Application
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
List<WmsBaseLocation> Locationlist = sqlSugarClient.Queryable<WmsBaseLocation>().LeftJoin<WmsPalletInfo>((wbi,wpi) => wbi.ContainerCode == wpi.PalletInfoCode).ToList();
|
|
|
|
|
List<LocationInfo> locationInfos = new List<LocationInfo>();
|
|
|
|
|
foreach (WmsBaseLocation location in Locationlist)
|
|
|
|
|
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();
|
|
|
|
|
LocationInfo locationInfo = new LocationInfo();
|
|
|
|
|
AllLocationInfo locationInfo = new AllLocationInfo();
|
|
|
|
|
locationInfo.LocationCode = location.AgvPositionCode;
|
|
|
|
|
locationInfo.PalletInfoCode = wmsPalletInfo.PalletInfoCode;
|
|
|
|
|
locationInfo.Amount = wmsPalletInfo.Amount;
|
|
|
|
|
locationInfo.LocationStatus = location.LocationStatus;
|
|
|
|
|
locationInfos.Add(locationInfo);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
LocationInfo locationInfo = new LocationInfo();
|
|
|
|
|
AllLocationInfo locationInfo = new AllLocationInfo();
|
|
|
|
|
locationInfo.LocationCode = "";
|
|
|
|
|
locationInfo.PalletInfoCode = "";
|
|
|
|
|
locationInfo.Amount = 0;
|
|
|
|
|
locationInfo.LocationStatus = 0;
|
|
|
|
|
locationInfos.Add(locationInfo);
|
|
|
|
|
|