|
@@ -2115,16 +2115,22 @@ namespace IMCS.CCS.Services
|
|
|
|
|
|
if (string.IsNullOrEmpty(actionAddress.Value))
|
|
|
{
|
|
|
- var resultBytes = s7.Read(actionAddress.Value, 40);
|
|
|
+ var resultBytes = s7.Read(actionAddress.Address, 360);
|
|
|
responseData.result = ToolUtils.ReturnStringByBytes(resultBytes.Content);
|
|
|
- }
|
|
|
+ req.data.content = responseData.result;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ s7.Write(actionAddress.Address, Convert.ToInt16(actionAddress.Value));
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
s7.ConnectClose();
|
|
|
|
|
|
- Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.ReadRFID) + "读取RFID故障===>>" + JsonConvert.SerializeObject(req)
|
|
|
- , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
|
|
|
+ Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.ReadRFID) + " 读取RFID成功===>>" + JsonConvert.SerializeObject(req)
|
|
|
+ , EnumHelper.GetDescription(ActionTypeEnum.ReadRFID));
|
|
|
return responseData;
|
|
|
}
|
|
|
catch (Exception ex)
|
|
@@ -2183,20 +2189,22 @@ namespace IMCS.CCS.Services
|
|
|
|
|
|
if (string.IsNullOrEmpty(actionAddress.Value))
|
|
|
{
|
|
|
- s7.Write(actionAddress.Address, ToolUtils.ReturnBtyesWtitString(req.data.content, 128));
|
|
|
+ s7.Write(actionAddress.Address, ToolUtils.ReturnBtyesWtitString(req.data.content, 360));
|
|
|
+ //var resultBytes = s7.Read("DB200.868", 40);
|
|
|
+ //Console.WriteLine(ToolUtils.ReturnStringByBytes(resultBytes.Content));
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- s7.Write(actionAddress.Address, actionAddress.Value);
|
|
|
+ s7.Write(actionAddress.Address, Convert.ToInt16(actionAddress.Value));
|
|
|
}
|
|
|
Thread.Sleep(SLEEP_TIME);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
s7.ConnectClose();
|
|
|
-
|
|
|
- Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.WriteRFID) + "写RFID故障===>>" + JsonConvert.SerializeObject(req)
|
|
|
- , EnumHelper.GetDescription(ActionTypeEnum.GetServoStacker));
|
|
|
+
|
|
|
+ Log.Instance.WriteLogAdd(EnumHelper.GetDescription(ActionTypeEnum.WriteRFID) + " 写RFID成功===>>" + JsonConvert.SerializeObject(req)
|
|
|
+ , EnumHelper.GetDescription(ActionTypeEnum.WriteRFID));
|
|
|
return responseData;
|
|
|
}
|
|
|
catch (Exception ex)
|