|
@@ -714,12 +714,13 @@ namespace IMCS.CCS.Services
|
|
CcsAction actionQuery = new CcsAction();
|
|
CcsAction actionQuery = new CcsAction();
|
|
actionQuery.OperateType = ActionTypeEnum.MoveRobotPosition.ToString();
|
|
actionQuery.OperateType = ActionTypeEnum.MoveRobotPosition.ToString();
|
|
actionQuery.Ip = req.url;
|
|
actionQuery.Ip = req.url;
|
|
- CcsAction actionInfo = _ccsActionService.GetList(actionQuery).FirstOrDefault();
|
|
|
|
|
|
+ CcsAction actionInfo = _ccsActionService.GetList(actionQuery).FirstOrDefault();
|
|
|
|
|
|
- Plc s7 = DevicePlcS7.S7(req.url, ProtocalTypeEnum.S7_1500.ToString());
|
|
|
|
- if (s7.IsConnected != true)
|
|
|
|
|
|
+ SiemensS7Net s7 = DevicePlcS7.SiemensS7(req.url);
|
|
|
|
+ HslCommunication.OperateResult ConnectionResult = s7.ConnectServer();
|
|
|
|
+ if (!ConnectionResult.IsSuccess)
|
|
{
|
|
{
|
|
- s7.Close();
|
|
|
|
|
|
+ s7.ConnectClose();
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.MoveRobotPosition + "移动物品异常===>>" + "PLC连接不上" + JsonConvert.SerializeObject(req),
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.MoveRobotPosition + "移动物品异常===>>" + "PLC连接不上" + JsonConvert.SerializeObject(req),
|
|
EnumHelper.GetDescription(ActionTypeEnum.MoveRobotPosition));
|
|
EnumHelper.GetDescription(ActionTypeEnum.MoveRobotPosition));
|
|
responseData.result = "false";
|
|
responseData.result = "false";
|
|
@@ -735,12 +736,11 @@ namespace IMCS.CCS.Services
|
|
foreach (CcsActionAddress actionAddress in CcsActionAddressChecks)
|
|
foreach (CcsActionAddress actionAddress in CcsActionAddressChecks)
|
|
{
|
|
{
|
|
if (!string.IsNullOrEmpty(actionAddress.Address) && !string.IsNullOrEmpty(actionAddress.Value))
|
|
if (!string.IsNullOrEmpty(actionAddress.Address) && !string.IsNullOrEmpty(actionAddress.Value))
|
|
- {
|
|
|
|
- string CheckAddress = ToolUtils.AddressConvertDBW(actionAddress.Address);
|
|
|
|
- var operateResult = ((ushort)s7.Read(CheckAddress)).ConvertToShort();
|
|
|
|
- if (actionAddress.CheckType ? operateResult.ToString().Equals(actionAddress.Value) : operateResult.ToString() != actionAddress.Value)
|
|
|
|
|
|
+ {
|
|
|
|
+ var operateResult = s7.ReadInt16(actionAddress.Address);
|
|
|
|
+ if (actionAddress.CheckType ? operateResult.Content.ToString().Equals(actionAddress.Value) : operateResult.Content.ToString() != actionAddress.Value)
|
|
{
|
|
{
|
|
- s7.Close();
|
|
|
|
|
|
+ s7.ConnectClose();
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.MoveRobotPosition + "取物品异常===>>" + "条件不满足" + JsonConvert.SerializeObject(req),
|
|
Log.Instance.WriteLogAdd(ActionTypeEnum.MoveRobotPosition + "取物品异常===>>" + "条件不满足" + JsonConvert.SerializeObject(req),
|
|
EnumHelper.GetDescription(ActionTypeEnum.MoveRobotPosition));
|
|
EnumHelper.GetDescription(ActionTypeEnum.MoveRobotPosition));
|
|
responseData.result = "false";
|
|
responseData.result = "false";
|
|
@@ -759,7 +759,7 @@ namespace IMCS.CCS.Services
|
|
Thread.Sleep(SLEEP_TIME);
|
|
Thread.Sleep(SLEEP_TIME);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- s7.Close();
|
|
|
|
|
|
+ s7.ConnectClose();
|
|
|
|
|
|
//插入回调
|
|
//插入回调
|
|
TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.MoveRobotPosition.ToString(),
|
|
TaskCallback taskCallbackData = new TaskCallback(req.url, ActionTypeEnum.MoveRobotPosition.ToString(),
|
|
@@ -1103,10 +1103,7 @@ namespace IMCS.CCS.Services
|
|
responseData.result = "false";
|
|
responseData.result = "false";
|
|
return responseData;
|
|
return responseData;
|
|
}
|
|
}
|
|
-
|
|
|
|
- string CheckAddress1 = ToolUtils.AddressConvertDBW("DB200.314");
|
|
|
|
- string operateResult1 = s7.ReadInt16(CheckAddress1).Content.ToString();
|
|
|
|
-
|
|
|
|
|
|
+
|
|
//查询条件
|
|
//查询条件
|
|
List<CcsActionAddress> CcsActionAddressChecks = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.CHECK.ToString()).ToList();
|
|
List<CcsActionAddress> CcsActionAddressChecks = CcsActionAddresses.Where(o => o.Type == ActionAddressTypeEnum.CHECK.ToString()).ToList();
|
|
foreach (CcsActionAddress actionAddress in CcsActionAddressChecks)
|
|
foreach (CcsActionAddress actionAddress in CcsActionAddressChecks)
|
|
@@ -1168,7 +1165,7 @@ namespace IMCS.CCS.Services
|
|
//s7.Write(CcsActionAddressWrites[1].Address, Convert.ToInt16("3"));
|
|
//s7.Write(CcsActionAddressWrites[1].Address, Convert.ToInt16("3"));
|
|
//重置清零
|
|
//重置清零
|
|
//
|
|
//
|
|
- Thread.Sleep(10000);
|
|
|
|
|
|
+ Thread.Sleep(2000);
|
|
|
|
|
|
s7.Write(CcsActionAddressWrites[1].Address, Convert.ToInt16(CcsActionAddressWrites[1].Value) );
|
|
s7.Write(CcsActionAddressWrites[1].Address, Convert.ToInt16(CcsActionAddressWrites[1].Value) );
|
|
s7.Write(CcsActionAddressWrites[0].Address, Convert.ToInt16("0"));
|
|
s7.Write(CcsActionAddressWrites[0].Address, Convert.ToInt16("0"));
|