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 list = sqlSugarClient.Queryable().Where(x => !string.IsNullOrEmpty(x.AgvPositionCode)).ToList(); + List Locationlist = sqlSugarClient.Queryable().Where(x => !string.IsNullOrEmpty(x.AgvPositionCode)).ToList(); + List locationInfos = new List(); + foreach (WmsBaseLocation location in Locationlist) + { + if (location != null) + { + WmsPalletInfo wmsPalletInfo = sqlSugarClient.Queryable().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) {