|
@@ -296,7 +296,7 @@ namespace IMCS.CCS.Services
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.RobotAction + "异常===>>" + "点位" + req.data.location + "取条件不满足【" + getResult + "】,等待允许取料中" + JsonConvert.SerializeObject(req),
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.RobotAction + "异常===>>" + "点位" + req.data.location + "取条件不满足【" + getResult + "】,等待允许取料中" + JsonConvert.SerializeObject(req),
|
|
EnumHelper.GetDescription(ActionTypeEnum.RobotAction));
|
|
EnumHelper.GetDescription(ActionTypeEnum.RobotAction));
|
|
responseData.result = "false";
|
|
responseData.result = "false";
|
|
- responseData.msg = "异常===>>" + "点位" + req.data.location + "取条件不满足【" + getResult + "】,等待允许取料中";
|
|
|
|
|
|
+ responseData.msg = "异常===>>" + "点位" + req.data.location + "取条件不满足【" + getResult + "】,等待允许取料中,请按装载站上的允许卸料按钮";
|
|
s7.ConnectClose();
|
|
s7.ConnectClose();
|
|
return responseData;
|
|
return responseData;
|
|
}
|
|
}
|
|
@@ -351,7 +351,7 @@ namespace IMCS.CCS.Services
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.RobotAction + "异常===>>" + "点位" + req.data.location + "放条件不满足【" + getResult + "】,等待允许放料中" + JsonConvert.SerializeObject(req),
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.RobotAction + "异常===>>" + "点位" + req.data.location + "放条件不满足【" + getResult + "】,等待允许放料中" + JsonConvert.SerializeObject(req),
|
|
EnumHelper.GetDescription(ActionTypeEnum.RobotAction));
|
|
EnumHelper.GetDescription(ActionTypeEnum.RobotAction));
|
|
responseData.result = "false";
|
|
responseData.result = "false";
|
|
- responseData.msg = "异常===>>" + "点位" + req.data.location + "放条件不满足【" + getResult + "】,等待允许放料中";
|
|
|
|
|
|
+ responseData.msg = "异常===>>" + "点位" + req.data.location + "放条件不满足【" + getResult + "】,等待允许放料中,请按装载站上的允许装载按钮";
|
|
s7.ConnectClose();
|
|
s7.ConnectClose();
|
|
return responseData;
|
|
return responseData;
|
|
}
|
|
}
|
|
@@ -627,6 +627,7 @@ namespace IMCS.CCS.Services
|
|
deviceReq.Type = OpcUaActionTypeEnum.UploadFileList.ToString();
|
|
deviceReq.Type = OpcUaActionTypeEnum.UploadFileList.ToString();
|
|
deviceReq.prgName = req.data.fileName;
|
|
deviceReq.prgName = req.data.fileName;
|
|
deviceReq.subFileList = req.data.subFileList;
|
|
deviceReq.subFileList = req.data.subFileList;
|
|
|
|
+ deviceReq.Ip = req.url;
|
|
var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, mazakUrlContext, deviceReq, null);
|
|
var Result = await _apiRequestService.RequestAsync(RequsetModeEnum.Post, mazakUrlContext, deviceReq, null);
|
|
ResponseOpcUaData responseOpcUaData = JsonConvert.DeserializeObject<ResponseOpcUaData>(Result.Message);
|
|
ResponseOpcUaData responseOpcUaData = JsonConvert.DeserializeObject<ResponseOpcUaData>(Result.Message);
|
|
if (!Result.IsSuccess || !responseOpcUaData.result)
|
|
if (!Result.IsSuccess || !responseOpcUaData.result)
|