|
|
@@ -1108,38 +1108,48 @@ namespace IMCS.CCS.Service.Impl
|
|
|
//根据sort顺序,查询左中右可取位置,写入地址列表
|
|
|
CcsActionAddress actionAddressGet = new CcsActionAddress();
|
|
|
actionAddressGet.Type = "CALLBACK_GET_COOR";
|
|
|
- actionAddressGet.Sort = key;
|
|
|
+ actionAddressGet.Sort = 2;
|
|
|
List<CcsActionAddress> GetCcsActionAddresses = _ccsActionAddressService.GetList(actionAddressGet);
|
|
|
|
|
|
//赋值测量结果
|
|
|
requestData.result = tagValue2.TagValue;
|
|
|
//根据工件id确认哪个位置已测量,赋值工位id
|
|
|
string srcWorkId = task.CallbackFailValue3; //原工件id
|
|
|
-
|
|
|
-
|
|
|
- foreach (CcsActionAddress actionAddress in GetCcsActionAddresses)
|
|
|
- {
|
|
|
- if (!string.IsNullOrEmpty(actionAddress.Address))
|
|
|
- {
|
|
|
- if (actionAddress.Value == "workId")
|
|
|
- {
|
|
|
- var operateResult = s7.Read(actionAddress.Address, 60) ;
|
|
|
- requestData.workId = ToolUtils.ReturnStringByBytes(operateResult.Content);
|
|
|
- }
|
|
|
- else if (actionAddress.Value == "procedureNo")
|
|
|
- {
|
|
|
- var operateResult = s7.Read(actionAddress.Address,40);
|
|
|
- requestData.procedureNo = ToolUtils.ReturnStringByBytes(operateResult.Content);
|
|
|
- }
|
|
|
- else if (actionAddress.Value == "workProgramName")
|
|
|
- {
|
|
|
- var operateResult = s7.Read(actionAddress.Address,40);
|
|
|
- requestData.workProgramName = ToolUtils.ReturnStringByBytes(operateResult.Content);
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- Log.Instance.WriteLogAdd("当前中间工件信息==>工件ID" + requestData.workId + ",当前任务工件ID = " + srcWorkId + ",程序名:" +requestData.workProgramName, LOG_TITLE_CALLBACK);
|
|
|
+ var operateResult = s7.Read("DB200.2708", 60);
|
|
|
+ currentMiddleWorkId = ToolUtils.ReturnStringByBytes(operateResult.Content);
|
|
|
+ if (!string.IsNullOrEmpty(currentMiddleWorkId))
|
|
|
+ {
|
|
|
+ currentMiddleWorkId = currentMiddleWorkId.Trim();
|
|
|
+ }
|
|
|
+ requestData.workId = currentMiddleWorkId;
|
|
|
+
|
|
|
+ Log.Instance.WriteLogAdd("当前中间工件信息==>工件ID" + currentMiddleWorkId + ",当前任务工件ID = " + srcWorkId + ",程序名:" + requestData.workProgramName, LOG_TITLE_CALLBACK);
|
|
|
+ //foreach (CcsActionAddress actionAddress in GetCcsActionAddresses)
|
|
|
+ // {
|
|
|
+ // if (!string.IsNullOrEmpty(actionAddress.Address))
|
|
|
+ // {
|
|
|
+ // if (actionAddress.Value == "workId")
|
|
|
+ // {
|
|
|
+ // var operateResult = s7.Read("DB200.2708", 60) ;
|
|
|
+
|
|
|
+ // requestData.workId = ToolUtils.ReturnStringByBytes(operateResult.Content);
|
|
|
+ // Log.Instance.WriteLogAdd("当前中间工件信息==>工件ID" + requestData.workId + ",operateResult = " + operateResult, LOG_TITLE_CALLBACK);
|
|
|
+ // }
|
|
|
+ // else if (actionAddress.Value == "procedureNo")
|
|
|
+ // {
|
|
|
+ // var operateResult = s7.Read(actionAddress.Address,40);
|
|
|
+ // requestData.procedureNo = ToolUtils.ReturnStringByBytes(operateResult.Content);
|
|
|
+ // }
|
|
|
+ // else if (actionAddress.Value == "workProgramName")
|
|
|
+ // {
|
|
|
+ // var operateResult = s7.Read(actionAddress.Address,40);
|
|
|
+ // requestData.workProgramName = ToolUtils.ReturnStringByBytes(operateResult.Content);
|
|
|
+
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
//当中间位工件ID等于原工件ID
|
|
|
if (srcWorkId == currentMiddleWorkId)
|
|
|
{
|
