diff --git a/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs b/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs index 9c83939..05acab4 100644 --- a/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs +++ b/AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs @@ -44,7 +44,7 @@ namespace AUCMA.STORE.Business.Implements return 0; } } - private INIFile iNIFile = new INIFile(System.Environment.CurrentDirectory + "/PlcAddress/PlcAddress.InI"); + /// /// 获取任务队列 /// @@ -59,7 +59,6 @@ namespace AUCMA.STORE.Business.Implements //exp = exp.And(s1 => s1.locationArea == locationArea && s1.pilerTaskType == taskType && s1.operationType == operationType && s1.storeCode == ConfigHelper.GetConfig("storeCode")); exp = exp.And(s1 => s1.pilerTaskType == taskType && s1.operationType == operationType && s1.storeCode == ConfigHelper.GetConfig("storeCode")); - if (taskType == TaskType.InStore) { exp = exp.And(s1 => s1.locationArea == locationArea); @@ -73,7 +72,9 @@ namespace AUCMA.STORE.Business.Implements } } - var outStoreType = iNIFile.IniReadValue("系统设置", "出库方式"); + + + //var outStoreType = iNIFile.IniReadValue("系统设置", "出库方式"); //if(outStoreType == "2") //{ // if(taskType == TaskType.OutStore) diff --git a/AUCMA.STORE.Analysis/TaskHandleBusiness.cs b/AUCMA.STORE.Analysis/TaskHandleBusiness.cs index 69d1e29..94100cb 100644 --- a/AUCMA.STORE.Analysis/TaskHandleBusiness.cs +++ b/AUCMA.STORE.Analysis/TaskHandleBusiness.cs @@ -98,7 +98,7 @@ namespace AUCMA.STORE.Business Task.Delay(5000).Wait(); } - + }); Task.Run(() => @@ -189,7 +189,7 @@ namespace AUCMA.STORE.Business { BaseDeviceInfo item = m_DeviceInfoList.Where(x => x.m_iDeviceId == 1003).FirstOrDefault(); - BaseDeviceInfo rgvDeviceInfo = m_DeviceInfoList.Where(x => x.m_iDeviceId == 1005).FirstOrDefault(); + BaseDeviceInfo rgvDeviceInfo = m_DeviceInfoList.Where(x => x.m_iDeviceId == 1001).FirstOrDefault(); int PilerState = item.m_IDeviceAdapter.ReadInt16ByAddress(ReadOnePilerPlcAddress[2].PLCAddress); int iReadIsReadySignal = item.m_IDeviceAdapter.ReadInt16ByAddress(ReadOnePilerPlcAddress[8].PLCAddress); @@ -384,11 +384,11 @@ namespace AUCMA.STORE.Business taskQueue = null; try { - BaseTaskQueue baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(LocationArea.Location_Left, TaskType.OutStore, OperationType.ManualOperation).Result; + BaseTaskQueue baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(locationArea, TaskType.OutStore, OperationType.ManualOperation).Result; if (baseTaskQueue == null) { - baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(LocationArea.Location_Left, TaskType.OutStore, OperationType.Automatic).Result; + baseTaskQueue = baseTaskQueueBusiness.GetTaskQueue(locationArea, TaskType.OutStore, OperationType.Automatic).Result; } if (baseTaskQueue == null)