wenjy
/
NJSL.Aucma.Store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - RGV设备编号修改

Browse Source
master
wenjy 3 weeks ago
parent 3d11932772
commit 953396af5b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File

7
AUCMA.STORE.Analysis/Implements/BaseTaskQueueBusiness.cs
Unescape Escape View File

@ -44,7 +44,7 @@ namespace AUCMA.STORE.Business.Implements
return 0; return 0;
} }
} }
private INIFile iNIFile = new INIFile(System.Environment.CurrentDirectory + "/PlcAddress/PlcAddress.InI");
/// <summary> /// <summary>
/// 获取任务队列 /// 获取任务队列
/// </summary> /// </summary>
@ -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.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")); exp = exp.And(s1 => s1.pilerTaskType == taskType && s1.operationType == operationType && s1.storeCode == ConfigHelper.GetConfig("storeCode"));
if (taskType == TaskType.InStore) if (taskType == TaskType.InStore)
{ {
exp = exp.And(s1 => s1.locationArea == locationArea); 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(outStoreType == "2")
//{ //{
// if(taskType == TaskType.OutStore) // if(taskType == TaskType.OutStore)

8
AUCMA.STORE.Analysis/TaskHandleBusiness.cs
Unescape Escape View File

@ -98,7 +98,7 @@ namespace AUCMA.STORE.Business
Task.Delay(5000).Wait(); Task.Delay(5000).Wait();
} }
}); });
Task.Run(() => Task.Run(() =>
@ -189,7 +189,7 @@ namespace AUCMA.STORE.Business
{ {
BaseDeviceInfo item = m_DeviceInfoList.Where(x => x.m_iDeviceId == 1003).FirstOrDefault(); 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 PilerState = item.m_IDeviceAdapter.ReadInt16ByAddress(ReadOnePilerPlcAddress[2].PLCAddress);
int iReadIsReadySignal = item.m_IDeviceAdapter.ReadInt16ByAddress(ReadOnePilerPlcAddress[8].PLCAddress); int iReadIsReadySignal = item.m_IDeviceAdapter.ReadInt16ByAddress(ReadOnePilerPlcAddress[8].PLCAddress);
@ -384,11 +384,11 @@ namespace AUCMA.STORE.Business
taskQueue = null; taskQueue = null;
try 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) 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) if (baseTaskQueue == null)

Write Preview
Loading…
Cancel
Save