|
@@ -679,7 +679,7 @@ namespace IMCS.CCS.Services
|
|
EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter), req.taskId, req.taskNodeId);
|
|
EnumHelper.GetDescription(ActionTypeEnum.SendQualityCenter), req.taskId, req.taskNodeId);
|
|
taskCallbackData = setCallBackValue(CcsActionAddresses, taskCallbackData);
|
|
taskCallbackData = setCallBackValue(CcsActionAddresses, taskCallbackData);
|
|
//清洗机启动时更新回调值
|
|
//清洗机启动时更新回调值
|
|
- if(string.IsNullOrEmpty(req.data.Location) && req.data.Location == "123")
|
|
|
|
|
|
+ if(!string.IsNullOrEmpty(req.data.Location) && req.data.Location == "123")
|
|
{
|
|
{
|
|
taskCallbackData.Address = "DB200.48";
|
|
taskCallbackData.Address = "DB200.48";
|
|
taskCallbackData.CallbackValue = "1";
|
|
taskCallbackData.CallbackValue = "1";
|
|
@@ -1158,7 +1158,7 @@ namespace IMCS.CCS.Services
|
|
break;
|
|
break;
|
|
|
|
|
|
}
|
|
}
|
|
- s7.Write(CcsActionAddressWrites[0].Address, Convert.ToInt16(CcsActionAddressWrites[0].Value));
|
|
|
|
|
|
+ s7.Write(CcsActionAddressWrites[0].Address, Convert.ToInt16(prgNo));
|
|
}
|
|
}
|
|
//Thread.Sleep(30000);
|
|
//Thread.Sleep(30000);
|
|
if (isTimeOut)
|
|
if (isTimeOut)
|