diff --git a/.vs/HighWayIot/FileContentIndex/bb475b5e-d4b1-46a8-bd4e-dcb22e6851c8.vsidx b/.vs/HighWayIot/FileContentIndex/49d0fac6-1528-4d7c-ac9f-8af4c6f2ccce.vsidx similarity index 83% rename from .vs/HighWayIot/FileContentIndex/bb475b5e-d4b1-46a8-bd4e-dcb22e6851c8.vsidx rename to .vs/HighWayIot/FileContentIndex/49d0fac6-1528-4d7c-ac9f-8af4c6f2ccce.vsidx index d48cfc19..b8943981 100644 Binary files a/.vs/HighWayIot/FileContentIndex/bb475b5e-d4b1-46a8-bd4e-dcb22e6851c8.vsidx and b/.vs/HighWayIot/FileContentIndex/49d0fac6-1528-4d7c-ac9f-8af4c6f2ccce.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/02d3cf2c-1f55-4677-9a99-a8d87e7c237c.vsidx b/.vs/HighWayIot/FileContentIndex/75db42f2-2b33-4a2f-bf6f-441a6b9ec538.vsidx similarity index 70% rename from .vs/HighWayIot/FileContentIndex/02d3cf2c-1f55-4677-9a99-a8d87e7c237c.vsidx rename to .vs/HighWayIot/FileContentIndex/75db42f2-2b33-4a2f-bf6f-441a6b9ec538.vsidx index 1d0f31f6..2c692730 100644 Binary files a/.vs/HighWayIot/FileContentIndex/02d3cf2c-1f55-4677-9a99-a8d87e7c237c.vsidx and b/.vs/HighWayIot/FileContentIndex/75db42f2-2b33-4a2f-bf6f-441a6b9ec538.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/be2fac41-79a0-4110-9446-cc8f67f46d90.vsidx b/.vs/HighWayIot/FileContentIndex/9151df80-44fc-4370-8ae7-5933d52cf834.vsidx similarity index 83% rename from .vs/HighWayIot/FileContentIndex/be2fac41-79a0-4110-9446-cc8f67f46d90.vsidx rename to .vs/HighWayIot/FileContentIndex/9151df80-44fc-4370-8ae7-5933d52cf834.vsidx index d1f5c3cc..557c0558 100644 Binary files a/.vs/HighWayIot/FileContentIndex/be2fac41-79a0-4110-9446-cc8f67f46d90.vsidx and b/.vs/HighWayIot/FileContentIndex/9151df80-44fc-4370-8ae7-5933d52cf834.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/c239bdf7-5118-43f4-aa0a-8dade93dcb52.vsidx b/.vs/HighWayIot/FileContentIndex/d871bddb-79f4-4ecb-9ac4-4cd15eeabb79.vsidx similarity index 85% rename from .vs/HighWayIot/FileContentIndex/c239bdf7-5118-43f4-aa0a-8dade93dcb52.vsidx rename to .vs/HighWayIot/FileContentIndex/d871bddb-79f4-4ecb-9ac4-4cd15eeabb79.vsidx index eaff84e7..9fe0740f 100644 Binary files a/.vs/HighWayIot/FileContentIndex/c239bdf7-5118-43f4-aa0a-8dade93dcb52.vsidx and b/.vs/HighWayIot/FileContentIndex/d871bddb-79f4-4ecb-9ac4-4cd15eeabb79.vsidx differ diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 86602814..060452e3 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -214,7 +214,7 @@ namespace Aucma.Scada.Business private void PassDownFoamTask() { - //是否出库,出库时堵塞入库 + //出库时堵塞入库,这个地方如果有问题的话,改为操作StartPassDown,将_isBlocked初始值true给while,开始出库时设成false结束while,出库完成后改为ture重新调用StartPassDown while (_isBlocked) { PrintLogInfoMessage("正在出库,当前入库状态堵塞,出库完成后进行释放"); @@ -267,6 +267,9 @@ namespace Aucma.Scada.Business Thread.Sleep(3000); } + /// + /// 开始出库堵塞入库任务下发 + /// public void IssueOutTask() { PrintLogInfoMessage("执行出库任务,入库进行堵塞"); @@ -274,6 +277,9 @@ namespace Aucma.Scada.Business _autoResetEvent.Set(); } + /// + /// 出库完成,释放入库任务下发 + /// public void IssueInTask() { PrintLogInfoMessage("出库完成,释放入库");