diff --git a/.vs/HighWayIot/FileContentIndex/0e608aa8-92d7-4866-934c-0ef3131a7c38.vsidx b/.vs/HighWayIot/FileContentIndex/2fba3dc0-4c03-4939-8ce3-53625fdee5cb.vsidx similarity index 100% rename from .vs/HighWayIot/FileContentIndex/0e608aa8-92d7-4866-934c-0ef3131a7c38.vsidx rename to .vs/HighWayIot/FileContentIndex/2fba3dc0-4c03-4939-8ce3-53625fdee5cb.vsidx diff --git a/.vs/HighWayIot/FileContentIndex/9fdc27ee-8e40-4636-b3d9-5557b6124096.vsidx b/.vs/HighWayIot/FileContentIndex/746bef05-d99a-481e-aaca-5b712180183b.vsidx similarity index 100% rename from .vs/HighWayIot/FileContentIndex/9fdc27ee-8e40-4636-b3d9-5557b6124096.vsidx rename to .vs/HighWayIot/FileContentIndex/746bef05-d99a-481e-aaca-5b712180183b.vsidx diff --git a/.vs/HighWayIot/FileContentIndex/7924aa73-4da7-424a-b25d-8bac28cbd674.vsidx b/.vs/HighWayIot/FileContentIndex/764d889f-ae59-410f-8cc2-32db4f117785.vsidx similarity index 100% rename from .vs/HighWayIot/FileContentIndex/7924aa73-4da7-424a-b25d-8bac28cbd674.vsidx rename to .vs/HighWayIot/FileContentIndex/764d889f-ae59-410f-8cc2-32db4f117785.vsidx diff --git a/.vs/HighWayIot/FileContentIndex/1ad1783a-0c62-4433-9207-3b0905692b41.vsidx b/.vs/HighWayIot/FileContentIndex/e3623430-b968-4118-8684-1c5c1691a281.vsidx similarity index 100% rename from .vs/HighWayIot/FileContentIndex/1ad1783a-0c62-4433-9207-3b0905692b41.vsidx rename to .vs/HighWayIot/FileContentIndex/e3623430-b968-4118-8684-1c5c1691a281.vsidx diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index adc925b8..d7a793fc 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -544,7 +544,7 @@ namespace Aucma.Scada.Business item.spaceStatus = spaceInfo.spaceStatus; } - result = info.Where(x=>x.spaceStatus == 1 && x.spaceCapacity > 0 ? x.spaceCapacity > (x.spaceStock + x.onRouteAmount) : 1 == 1).OrderByDescending(x => x.spaceStock).OrderBy(x=>x.spaceCode).First(); + result = info.Where(x=>x.spaceStatus == 1 && x.spaceStock > 0 ? x.spaceCapacity > (x.spaceStock + x.onRouteAmount) : 1 == 1).OrderByDescending(x => x.spaceStock).OrderBy(x=>x.spaceCode).First(); } }