diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index a55a833e..df896448 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 37f06fc6..81e1cc34 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -272,8 +272,8 @@ namespace Aucma.Scada.Business //{ // spaceInfo.spaceStock = spaceInfo.spaceStock + 1; //} - - //_spaceInfoService.UpdateSpaceInfo(spaceInfo); + spaceInfo.outRouteAmount += 1; + _spaceInfoService.UpdateSpaceInfo(spaceInfo); } #region 轮询获取出库任务下发至PLC,等待PLC执行反馈,完成后再次下发 @@ -448,6 +448,7 @@ namespace Aucma.Scada.Business //读取PLC获取货道信息:存放数量、在途数量 //spaceInfo.materialType = taskInfo.materialType; spaceInfo.spaceStock -= 1; + spaceInfo.outRouteAmount -= 1; if (spaceInfo.spaceStock == 0) { spaceInfo.materialType = string.Empty; diff --git a/Aucma.Scada.Model/domain/BaseSpaceInfo.cs b/Aucma.Scada.Model/domain/BaseSpaceInfo.cs index d43b011f..e9436815 100644 --- a/Aucma.Scada.Model/domain/BaseSpaceInfo.cs +++ b/Aucma.Scada.Model/domain/BaseSpaceInfo.cs @@ -74,6 +74,12 @@ namespace Aucma.Scada.Model.domain [SugarColumn(ColumnName = "ONROUTE_AMOUNT")] public int onRouteAmount { get; set; } + /// + /// 出库数量 + /// + [SugarColumn(ColumnName = "OUTROUTE_AMOUNT")] + public int outRouteAmount { get; set; } + /// /// 入库标识:1-允许入库;2-禁止入库 /// diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 6f44751a..297f546c 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index f0f6b71a..d55bf36f 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs index bb13a1f7..1b0a56c6 100644 --- a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs @@ -110,7 +110,7 @@ namespace HighWayIot.Repository.service.Impl try { Expression> exp = s1 => true; - exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceStock > 0); //相同型号、启用状态、库存不为空的货道信息 + exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceStock - x.outRouteAmount > 0); //相同型号、启用状态、库存不为空的货道信息 spaceInfos = _mesRepository.GetList(exp); diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index d4a84e2a..835e29a1 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ