diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 8a007b25..e0c19c5b 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -644,8 +644,8 @@ namespace Aucma.Scada.Business // taskHandleBusiness.WritePlc(spaceInfo.storeCode, spaceInfo.spaceCode); //读取PLC获取货道信息:存放数量、在途数量 - spaceInfo.spaceStock -= 1; - spaceInfo.outRouteAmount -= 1; + // spaceInfo.spaceStock -= 1; + // spaceInfo.outRouteAmount -= 1; #region Add By wenjy 2023-10-30 13:44:00 通过PLC获取货道信息 var item = taskHandleBusiness.ReadSpaceInfoByPlc(spaceInfo); @@ -678,8 +678,9 @@ namespace Aucma.Scada.Business RefreshStoreStockEvent?.Invoke(); - //清除任务信息 - _taskInfoService.DeleteTaskInfo(taskCode, storeCode); + //更新任务状态 + taskInfo.taskStatus = 3; + _taskInfoService.UpdateTaskInfo(taskInfo); _spaceDetailService.DeleteSpaceDetailByMaterialCode(taskInfo.materialCode); diff --git a/Aucma.Scada.Business/OutStoreTaskHandle.cs b/Aucma.Scada.Business/OutStoreTaskHandle.cs index 5c6df950..f71179eb 100644 --- a/Aucma.Scada.Business/OutStoreTaskHandle.cs +++ b/Aucma.Scada.Business/OutStoreTaskHandle.cs @@ -464,8 +464,8 @@ namespace Aucma.Scada.Business var item = info[i]; ReadLinerFinish_OutStore(item); Console.WriteLine($"内胆任务:{item.taskCode};物料:{item.materialCode};出库完成"); - item.taskStatus = 3; - linerTaskInfos.Add(item); + // item.taskStatus = 3; + // linerTaskInfos.Add(item); } } @@ -483,9 +483,12 @@ namespace Aucma.Scada.Business { while (true) { - var shellTasks = shellTaskInfos.Where(x => x.taskStatus == 3).ToList(); + //var shellTasks = shellTaskInfos.Where(x => x.taskStatus == 3).ToList(); + + //var linerTasks = linerTaskInfos.Where(x => x.taskStatus == 3).ToList(); - var linerTasks = linerTaskInfos.Where(x => x.taskStatus == 3).ToList(); + var shellTasks = GetTaskInfoByTaskStatus(appConfig.shellStoreCode,3); + var linerTasks = GetTaskInfoByTaskStatus(appConfig.linerStoreCode, 3); RealTaskInfo shellTask = null; RealTaskInfo linerTask = null; @@ -504,11 +507,14 @@ namespace Aucma.Scada.Business { Console.WriteLine($"绑定箱壳:{shellTask.materialCode};内胆:{linerTask.materialCode};条码"); _codeBindingRecordServices.BindingCode(shellTask.materialCode, linerTask.materialCode); - shellTaskInfos.Remove(shellTask); - linerTaskInfos.Remove(linerTask); + + _taskInfoService.DeleteTaskInfoById(shellTask.objId); + _taskInfoService.DeleteTaskInfoById(linerTask.objId); + // shellTaskInfos.Remove(shellTask); + // linerTaskInfos.Remove(linerTask); } - Thread.Sleep(1000); + Thread.Sleep(2000); } }); diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 0d81e5bc..89dc4a17 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb index 4fa9f60f..94cd8f77 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ diff --git a/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs index 1c200c04..2a3ee619 100644 --- a/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs @@ -239,6 +239,10 @@ namespace HighWayIot.Repository.service.Impl exp = exp.And(x => x.taskStatus == taskStatus); } taskInfos = _mesRepository.GetList(exp); + if(taskInfos.Count > 0) + { + taskInfos.OrderBy(x => x.beginTime); + } } catch (Exception ex) {