|
@@ -2503,10 +2503,10 @@ EnumHelper.GetDescription(ActionTypeEnum.StartDryMachine));
|
|
|
|
|
|
if (actionInfo == null)
|
|
|
{
|
|
|
- Log.Instance.WriteLogAdd("取==CutterTake" + req.data.location + "异常===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req),
|
|
|
+ Log.Instance.WriteLogAdd("取==CutterTake" + req.data.location + "没有查询到校验信息===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req),
|
|
|
"CNC刀具取放状态");
|
|
|
responseData.result = "true";
|
|
|
- responseData.resultMsg = "取==CutterTake" + req.data.location + "异常===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req);
|
|
|
+ responseData.resultMsg = "取==CutterTake" + req.data.location + "没有查询到校验信息===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req);
|
|
|
return responseData;
|
|
|
}
|
|
|
|
|
@@ -2671,10 +2671,10 @@ EnumHelper.GetDescription(ActionTypeEnum.StartDryMachine));
|
|
|
CcsAction actionInfo = _ccsActionService.GetList(actionQuery).FirstOrDefault();
|
|
|
|
|
|
if (actionInfo == null) {
|
|
|
- /* Log.Instance.WriteLogAdd("放==CutterPut" + req.data.location + "异常===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req),
|
|
|
- "刀具取放状态");*/
|
|
|
+ Log.Instance.WriteLogAdd("放==CutterPut" + req.data.location + "没有查询到校验信息===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req),
|
|
|
+ "刀具取放状态");
|
|
|
responseData.result = "true";
|
|
|
- responseData.resultMsg = "放==CutterPut" + req.data.location + "异常===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req);
|
|
|
+ responseData.resultMsg = "放==CutterPut" + req.data.location + "没有查询到校验信息===>>" + "没有查询到配置方法,默认通过" + JsonConvert.SerializeObject(req);
|
|
|
return responseData;
|
|
|
}
|
|
|
|
|
@@ -2730,6 +2730,7 @@ EnumHelper.GetDescription(ActionTypeEnum.StartDryMachine));
|
|
|
{
|
|
|
s7.ConnectClose();
|
|
|
Log.Instance.WriteLogAdd("放 == 已经发送上料请求,上料允许状态不满足====" + JsonConvert.SerializeObject(req), "刀具取放状态");
|
|
|
+
|
|
|
responseData.result = "false";
|
|
|
responseData.resultMsg = "已经发送上料请求,上料允许状态不满";
|
|
|
return responseData;
|