|
@@ -1274,14 +1274,15 @@ namespace TeamAAS_VP.Core
|
|
|
// 开始锁付
|
|
// 开始锁付
|
|
|
else if (addressConfig.In_WorkStart.Address.Contains(tuple.nodeId))
|
|
else if (addressConfig.In_WorkStart.Address.Contains(tuple.nodeId))
|
|
|
{
|
|
{
|
|
|
- if (tuple.value is bool state)
|
|
|
|
|
|
|
+ if (tuple.value is Int16 state)
|
|
|
{
|
|
{
|
|
|
- if (state)
|
|
|
|
|
|
|
+ if (state==1)
|
|
|
{
|
|
{
|
|
|
SendTaskMessage($"收到开始锁付信号...", MessageLevel.Debug);
|
|
SendTaskMessage($"收到开始锁付信号...", MessageLevel.Debug);
|
|
|
//位置编号
|
|
//位置编号
|
|
|
Int16 positionIndex = plc.ReadNode<Int16>(addressConfig.In_ProductNum.Address);
|
|
Int16 positionIndex = plc.ReadNode<Int16>(addressConfig.In_ProductNum.Address);
|
|
|
SendTaskMessage($"编号:{positionIndex}", MessageLevel.Info);
|
|
SendTaskMessage($"编号:{positionIndex}", MessageLevel.Info);
|
|
|
|
|
+ await plc.WriteNodeAsync(addressConfig.In_WorkStart.Address, (Int16)0);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
@@ -1293,9 +1294,9 @@ namespace TeamAAS_VP.Core
|
|
|
// 停止锁付
|
|
// 停止锁付
|
|
|
else if (addressConfig.In_WorkDone.Address.Contains(tuple.nodeId))
|
|
else if (addressConfig.In_WorkDone.Address.Contains(tuple.nodeId))
|
|
|
{
|
|
{
|
|
|
- if (tuple.value is bool state)
|
|
|
|
|
|
|
+ if (tuple.value is Int16 state)
|
|
|
{
|
|
{
|
|
|
- if (state)
|
|
|
|
|
|
|
+ if (state==1)
|
|
|
{
|
|
{
|
|
|
SendTaskMessage($"收到停止锁付信号...", MessageLevel.Debug);
|
|
SendTaskMessage($"收到停止锁付信号...", MessageLevel.Debug);
|
|
|
//位置编号
|
|
//位置编号
|
|
@@ -1336,6 +1337,7 @@ namespace TeamAAS_VP.Core
|
|
|
lockResult.WaveDatas= ScrewDriver.WaveDatas;
|
|
lockResult.WaveDatas= ScrewDriver.WaveDatas;
|
|
|
_eventAggregator.GetEvent<LockFinishNotification>().Publish(lockResult);
|
|
_eventAggregator.GetEvent<LockFinishNotification>().Publish(lockResult);
|
|
|
await _systemDatabaseService.RecordLockResultAsync(lockResult);
|
|
await _systemDatabaseService.RecordLockResultAsync(lockResult);
|
|
|
|
|
+ await plc.WriteNodeAsync(addressConfig.In_WorkDone.Address, (Int16)0);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|