diff --git a/.vs/HighWayIot/FileContentIndex/45204c95-fda3-47ed-822c-ecb14fa4cffd.vsidx b/.vs/HighWayIot/FileContentIndex/45204c95-fda3-47ed-822c-ecb14fa4cffd.vsidx deleted file mode 100644 index dd6207bd..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/45204c95-fda3-47ed-822c-ecb14fa4cffd.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/6f4a27db-ed43-4fc8-8e63-9c66d62f0b47.vsidx b/.vs/HighWayIot/FileContentIndex/6f4a27db-ed43-4fc8-8e63-9c66d62f0b47.vsidx new file mode 100644 index 00000000..6149db96 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/6f4a27db-ed43-4fc8-8e63-9c66d62f0b47.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/a23e834c-8987-467a-b6b7-66a4b7bd91ec.vsidx b/.vs/HighWayIot/FileContentIndex/a23e834c-8987-467a-b6b7-66a4b7bd91ec.vsidx deleted file mode 100644 index 2d982bf2..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/a23e834c-8987-467a-b6b7-66a4b7bd91ec.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/a3639ca3-75ed-466c-a5da-e571ca1edabc.vsidx b/.vs/HighWayIot/FileContentIndex/a3639ca3-75ed-466c-a5da-e571ca1edabc.vsidx deleted file mode 100644 index 93724802..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/a3639ca3-75ed-466c-a5da-e571ca1edabc.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/ce9d9a21-c68d-4c4e-84a1-a9ea944280f6.vsidx b/.vs/HighWayIot/FileContentIndex/ce9d9a21-c68d-4c4e-84a1-a9ea944280f6.vsidx deleted file mode 100644 index a1e4b9f7..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/ce9d9a21-c68d-4c4e-84a1-a9ea944280f6.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/fdfdcac1-62b4-4005-85c6-d65db8dda4f0.vsidx b/.vs/HighWayIot/FileContentIndex/fdfdcac1-62b4-4005-85c6-d65db8dda4f0.vsidx new file mode 100644 index 00000000..155e387b Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/fdfdcac1-62b4-4005-85c6-d65db8dda4f0.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 643d67a1..7d7b0560 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 99db1bfd..e7bfca2d 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -171,7 +171,15 @@ namespace Aucma.Scada.Business { PrintLogInfoMessage($"匹配货道:{spaceInfo.spaceName}"); // RefreshScanMateriaCodeEvent?.Invoke(materiaclCode, materialType, spaceInfo.spaceName, storeCode); //刷新界面扫码信息 - CreateOutStoreTask(spaceInfo, planCode, taskCode); //创建出库任务 + bool result = CreateOutStoreTask(spaceInfo, planCode, taskCode); //创建出库任务 + if (result) + { + PrintLogInfoMessage("出库任务创建成功"); + } + else + { + PrintLogInfoMessage("出库任务创建失败"); + } } else { @@ -283,7 +291,7 @@ namespace Aucma.Scada.Business //{ // spaceInfo.spaceStock = spaceInfo.spaceStock + 1; //} - + spaceInfo.outRouteAmount += 1; _spaceInfoService.UpdateSpaceInfo(spaceInfo); } @@ -519,6 +527,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.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 4523417c..deeef55b 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index 3f83b64d..c7b25b46 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll index 98f0cccc..00146f1b 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb index 418de0c4..729d8bab 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll index e9615603..5ab25a3e 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb index 41545909..05f0039b 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index 7af272cd..206b35c2 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index 4523417c..deeef55b 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index 3f83b64d..c7b25b46 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll index 98f0cccc..00146f1b 100644 Binary files a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb index 418de0c4..729d8bab 100644 Binary files a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb differ 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.Model/obj/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll index 98f0cccc..00146f1b 100644 Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb index 418de0c4..729d8bab 100644 Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index 4523417c..deeef55b 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb index 3f83b64d..c7b25b46 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll index 98f0cccc..00146f1b 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb index 418de0c4..729d8bab 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index e9615603..5ab25a3e 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb index 41545909..05f0039b 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ 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 6a2fbcf2..9f44591c 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/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll index 98f0cccc..00146f1b 100644 Binary files a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb index 418de0c4..729d8bab 100644 Binary files a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index e9615603..5ab25a3e 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index 41545909..05f0039b 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index db5fd47c..9dd39b15 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/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index e9615603..5ab25a3e 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index 41545909..05f0039b 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs index d2637bbd..9a7cdfcc 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);