Commit 4016eb2b LN

更改部分点位名称

1 个父辈 1cbba93f
...@@ -294,8 +294,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -294,8 +294,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1!"); LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1!");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_DoorOPosition_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
ComMoveToPosition(Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed); ComMoveToPosition(Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
break; break;
...@@ -320,8 +320,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -320,8 +320,8 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_M_H_TOP1_CompressHome: case StoreMoveStep.BOX_M_H_TOP1_CompressHome:
MoveInfo.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1); MoveInfo.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1);
LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1!"); LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1!");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_DoorOPosition_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
ComMoveToPosition(Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed); ComMoveToPosition(Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
break; break;
case StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1: case StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1:
...@@ -885,139 +885,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -885,139 +885,6 @@ namespace OnlineStore.DeviceLibrary
} }
#region 入库命令处理
private void ReviceInStoreProcess(string message, Operation resultOperation)
{
Dictionary<string, string> data = resultOperation.data;
if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
{
//服务器返回时有:posId库位编号,plateW:料盘宽度,plateH:料盘高度,
//postId格式BoxId#位置
string posId = data[ParamDefine.posId];
string plateW = data[ParamDefine.plateW];
string plateH = data[ParamDefine.plateH];
string[] posArray = posId.Split('#');
if (!(posArray.Length == 2))
{
WarnMsg = Name + "入库库位格式错误:二维码【" + message + "】库位【" + posId + "】";
LogUtil.error(Name + "服务器反馈 入库库位格式错误:二维码【" + message + "】库位【" + posId + "】");
LogUtil.info("服务器反馈 入库库位格式错误:二维码【" + message + "】库位【" + posId + "】");
return;
}
int storeId = int.Parse(posArray[0]);
//根据发送的posId获取位置列表
ACBoxPosition position = CSVPositionReader<ACBoxPosition>.GetPositon(posId);
if (position == null)
{ //出入库没有找到服务器发送的库位,需要打印日志方便查询原因
WarnMsg = "入库未找到库位:二维码【" + message + "】库位【" + posId + "】 ";
LogUtil.error(Name + "收到服务器入库命令:入库未找到库位:二维码【" + message + "】库位【" + posId + "】");
LogUtil.info("收到服务器入库命令:入库未找到库位:二维码【" + message + "】库位【" + posId + "】");
return;
}
//TODO:判断BOX是否处于可以入库状态,如果调试或急停中,需要返回给服务器;
if (CanStarInOut())
{
InOutParam param = new InOutParam(message, posId, plateH, plateW);
StartInStoreMove(param);
//如果当前正在出入库中,需要记录下来,等待空闲时执行
LogInfo(" 收到服务器入库命令:库位号【" + posId + "】二维码【" + message + "】 开始入库!");
}
else
{
LogInfo(" 收到服务器入库命令:库位号【" + posId + "】二维码【" + message + "】 正在忙碌中,无法入库!");
}
}
}
public bool ReviceLineCheckInStoreCMD(string posId, string plateH, string plateW, string message)
{
string logName = Name + "入库库位验证【 " + message + "】【" + posId + "】:";
try
{
if (storeRunStatus.Equals(StoreRunStatus.Wait))
{
LogUtil.info(logName + " 设备未启动,验证失败");
return false;
}
// CodeMsg = "收到二维码【 " + message + "】,发送给服务器获取入库PosID";
LogUtil.debug(logName + "发送给服务器验证入库PosID");
//发送扫码内容到服务器进行入库操作
Operation operation = getLineBoxStatus();
operation.op = 1;
operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", DeviceID.ToString() } };
operation.data.Add("inPos", posId);
string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
if (resultOperation == null)
{
// CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
LogUtil.info(logName + " 没有收到服务器反馈 ");
}
else if (!string.IsNullOrEmpty(resultOperation.msg))
{
//如果有提示消息,直接显示提示
LogUtil.info(logName + "服务器反馈 :" + resultOperation.msg);
}
else if (resultOperation.op.Equals(1))
{
LogUtil.info(logName + " 成功");
return true;
}
}
catch (Exception ex)
{
LogUtil.info(logName + " 出错:" + ex.ToString());
}
return false;
}
public void ReviceLineInStoreCMD(string posId, string plateH, string plateW, string message)
{
string logName = "流水线入库命令【 " + message + "】【" + posId + "】:";
//if (!LineConnect.WaitInStoreList.Contains(posId))
//{
// LogUtil.error(logName + "库位未验证通过,重新验证库位");
// bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message);
// if (!result)
// {
// return;
// }
//}
//else
//{
// //LineConnect.WaitInStoreList.Remove(posId);
//}
//根据发送的posId获取位置列表
ACBoxPosition position = CSVPositionReader<ACBoxPosition>.GetPositon(posId);
if (position == null)
{ //出入库没有找到服务器发送的库位,需要打印日志方便查询原因
WarnMsg = "入库未找到库位:二维码【" + message + "】库位【" + posId + "】 ";
LogUtil.error(logName + "未找到库位");
// LogUtil.info( "收到流水线入库:入库未找到库位:二维码【" + message + "】库位【" + posId + "】");
return;
}
//TODO:判断BOX是否处于可以入库状态,如果调试或急停中,需要返回给服务器;
if (CanStarInOut())
{
InOutParam param = new InOutParam(message, posId, plateH, plateW);
LogUtil.info(logName + " 开始入库!");
StartInStoreMove(param);
//如果当前正在出入库中,需要记录下来,等待空闲时执行
}
else
{
LogUtil.info(logName + " 正在忙碌中,无法入库!");
}
}
#endregion
#region 温湿度处理 #region 温湿度处理
/// <summary> /// <summary>
/// 湿度标准,超过后需要报警 /// 湿度标准,超过后需要报警
...@@ -1287,7 +1154,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1287,7 +1154,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (resultOperation.op.Equals(1)) if (resultOperation.op.Equals(1))
{ {
ReviceInStoreProcess("", resultOperation); // ReviceInStoreProcess("", resultOperation);
} }
else if (resultOperation.op.Equals(2)) else if (resultOperation.op.Equals(2))
{ {
......
...@@ -105,12 +105,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -105,12 +105,26 @@ namespace OnlineStore.DeviceLibrary
// LogUtil.debug("等待height=" + wait.HeightValue + "完成"); // LogUtil.debug("等待height=" + wait.HeightValue + "完成");
//} //}
} }
//else if (wait.WaitType == 5) else if (wait.WaitType.Equals(8))
//{ {
// string msg = ""; string msg = "";
// wait.IsEnd = ShuoKeIsEnd(wait, out msg); if (IOValue(TargetIoType).Equals(TargetIoValue))
// NotOkMsg = NotOkMsg +" "+ msg; {
//} wait.IsEnd = true;
}
else
{
bool result = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
if (!result)
{
LogUtil.error(msg);
}
wait.IsEnd = result;
}
}else if (wait.WaitType.Equals(9))
{
wait.IsEnd = (LastScanCodes.Count > 0);
}
if (wait.IsEnd) if (wait.IsEnd)
{ {
if (MoveInfo.OneWaitCanEndStep) if (MoveInfo.OneWaitCanEndStep)
...@@ -237,7 +251,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -237,7 +251,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice); MoveInfo.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice);
InOutStoreLog("入库:SI_06 拿物品,压紧轴至P2(压紧点)) 升降轴至P7(进料口取料缓冲点) "); InOutStoreLog("入库:SI_06 拿物品,压紧轴至P2(压紧点)) 升降轴至P7(进料口取料缓冲点) ");
ComMoveToPosition(moveP.ComPress_P2, Config.CompAxis_P2_Speed); ComMoveToPosition(moveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed);
} }
else if (MoveInfo.MoveStep == StoreMoveStep.SI_06_DoorWarToDevice) else if (MoveInfo.MoveStep == StoreMoveStep.SI_06_DoorWarToDevice)
{ {
...@@ -471,7 +485,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -471,7 +485,7 @@ namespace OnlineStore.DeviceLibrary
InOutStoreLog("出库:SO_11 放下物品,升降轴至P8(进料口出料缓冲点) "); InOutStoreLog("出库:SO_11 放下物品,升降轴至P8(进料口出料缓冲点) ");
//NeedCheckSafetyLight = 0; //NeedCheckSafetyLight = 0;
ComMoveToPosition(moveP.ComPress_P1, Config.CompAxis_P1_Speed); ComMoveToPosition(moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P8, Config.UpDownAxis_P8_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P8, Config.UpDownAxis_P8_Speed);
} }
else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_DevicePutWare) else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_DevicePutWare)
{ {
......
...@@ -184,22 +184,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -184,22 +184,22 @@ namespace OnlineStore.DeviceLibrary
p.ComPress_P1 = box.Config.CompAxis_P1_Position; p.ComPress_P1 = box.Config.CompAxis_P1_Position;
p.InOut_P1 = box.Config.InOutAxis_P1_Position; p.InOut_P1 = box.Config.InOutAxis_P1_Position;
p.Middle_P1 = box.Config.MiddleAxis_P1_Position; p.Middle_P1 = box.Config.MiddleAxis_P1;
p.InOut_P2 = position.InOutAxis_DoorPosition_P2; p.InOut_P2 = position.InOutAxis_P2;
p.UpDown_P1 = box.Config.UpDownAxis_DoorOPosition_P1; p.UpDown_P1 = box.Config.UpDownAxis_P1;
p.UpDown_P8 = box.Config.UpDownAxis_DoorIBPosition_P8; // p.UpDown_P8 = box.Config.UpDownAxis_DoorIBPosition_P8;
p.UpDown_P2 = box.Config.UpDownAxis_DoorIPosition_P2; p.UpDown_P2 = box.Config.UpDownAxis_P2;
p.UpDown_P7 = box.Config.UpDownAxis_DoorOBPosition_P7; // p.UpDown_P7 = box.Config.UpDownAxis_DoorOBPosition_P7;
p.ComPress_P2 = position.CompressAxis_Position_P2; p.ComPress_P2 = position.ComAxis_P2;
p.ComPress_P3 = position.CompressAxis_CPosition_P3; p.ComPress_P3 = position.ComAxis_P3;
p.InOut_P3 = position.InOutAxis_Position_P3; p.InOut_P3 = position.InoutAxis_P3;
p.Middle_P2 = position.MiddleAxis_Position_P2; p.Middle_P2 = position.MiddleAxis_P2;
p.UpDown_P3 = position.UpDownAxis_IHPosition_P3; p.UpDown_P3 = position.UpdownAxis_IH_P3;
p.UpDown_P4 = position.UpDownAxis_ILPosition_P4; p.UpDown_P4 = position.UpdownAxis_IL_P4;
p.UpDown_P5 = position.UpDownAxis_OHPosition_P5; p.UpDown_P5 = position.UpdownAxis_OH_P5;
p.UpDown_P6 = position.UpDownAxis_OLPosition_P6; p.UpDown_P6 = position.UpdownAxis_OL_P6;
param.MoveP = p; param.MoveP = p;
if (String.IsNullOrEmpty(param.PlateH)) if (String.IsNullOrEmpty(param.PlateH))
......
...@@ -42,14 +42,16 @@ AXIS,(轴一)旋转轴,Middle_Axis,1,COM1,0,,,,, ...@@ -42,14 +42,16 @@ AXIS,(轴一)旋转轴,Middle_Axis,1,COM1,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,2,COM1,0,,,,, AXIS,(轴二)升降轴轴,UpDown_Axis,2,COM1,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,3,COM1,0,,,,, AXIS,(轴三)进出轴,InOut_Axis,3,COM1,0,,,,,
AXIS,(轴四)压紧轴,Comp_Axis,4,COM1,0,,,,, AXIS,(轴四)压紧轴,Comp_Axis,4,COM1,0,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,403000,,,,,,, PRO,升降轴 NG料口放料点 P1,UpDownAxis_P1,403000,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,415000,,,,,,, PRO,升降轴 NG料口放料缓冲点 P2,UpDownAxis_P2,415000,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,, ,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,, ,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,,
PRO,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,268093,,,,,,, PRO,旋转轴(轴1)P1 待机原位点/NG料口位置,MiddleAxis_P1,268093,,,,,,,
PRO,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,, PRO,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴(轴4)P1待机原位点,CompAxis_P1_Position,10000,,,,,,, PRO,压紧轴(轴4)P1待机原位点,CompAxis_P1_Position,10000,,,,,,,
PRO,压紧轴(轴4)P3压紧前点,CompAxis_P3_Position,10000,,,,,,, PRO,压紧轴(轴4)P3压紧前点,CompAxis_P3_Position,10000,,,,,,,
PRO,压紧轴(轴4)P4目标压紧点,CompAxis_P4_Position,10000,,,,,,,
PRO,压紧轴(轴4)压紧确认信号收到之后下降的位置,CompAxis_Down_Position,2000,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,, PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,,
PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,80,,,,,,, PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,80,,,,,,,
...@@ -97,7 +99,7 @@ PRO,升降轴(轴2)PA1速度,UpDownAxis_PA1_Speed,100,,,,,, , ...@@ -97,7 +99,7 @@ PRO,升降轴(轴2)PA1速度,UpDownAxis_PA1_Speed,100,,,,,, ,
PRO,升降轴(轴2)PA2速度,UpDownAxis_PA2_Speed,100,,,,,,, PRO,升降轴(轴2)PA2速度,UpDownAxis_PA2_Speed,100,,,,,,,
PRO,进出轴(轴3)PA速度,InOutAxis_PA_Speed,100,,,,,,, PRO,进出轴(轴3)PA速度,InOutAxis_PA_Speed,100,,,,,,,
PRO,旋转轴(轴1)PA速度,MiddleAxis_PA_Speed,120,,,,,,, PRO,旋转轴(轴1)PA速度,MiddleAxis_PA_Speed,120,,,,,,,
PRO,压紧轴(轴4)缓慢压紧速度,CompAxis_Com_Speed,100,,,,,,, PRO,压紧轴(轴4)P4速度,CompAxis_P4_Speed,100,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴一)旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,, PRO,(轴一)旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
PRO,(轴二)升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, , PRO,(轴二)升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,
......
...@@ -42,14 +42,16 @@ AXIS,(轴一)旋转轴,Middle_Axis,1,COM1,0,,,,, ...@@ -42,14 +42,16 @@ AXIS,(轴一)旋转轴,Middle_Axis,1,COM1,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,2,COM1,0,,,,, AXIS,(轴二)升降轴轴,UpDown_Axis,2,COM1,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,3,COM1,0,,,,, AXIS,(轴三)进出轴,InOut_Axis,3,COM1,0,,,,,
AXIS,(轴四)压紧轴,Comp_Axis,4,COM1,0,,,,, AXIS,(轴四)压紧轴,Comp_Axis,4,COM1,0,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,403000,,,,,,, PRO,升降轴 进料口取料点 P1,UpDownAxis_P1,403000,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,415000,,,,,,, PRO,升降轴 进料口出料前点 P2,UpDownAxis_P2,415000,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,, PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,,
PRO,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,268093,,,,,,, PRO,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1,268093,,,,,,,
PRO,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,, PRO,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴(轴4)P1待机原位点,CompAxis_P1_Position,10000,,,,,,, PRO,压紧轴(轴4)P1待机原位点,CompAxis_P1_Position,10000,,,,,,,
PRO,压紧轴(轴4)P3压紧前点,CompAxis_P3_Position,10000,,,,,,, PRO,压紧轴(轴4)P3压紧前点,CompAxis_P3_Position,10000,,,,,,,
PRO,压紧轴(轴4)P4目标压紧点,CompAxis_P4_Position,10000,,,,,,,
PRO,压紧轴(轴4)压紧确认信号收到之后下降的位置,CompAxis_Down_Position,2000,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,, PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,,
PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,80,,,,,,, PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,80,,,,,,,
...@@ -97,7 +99,7 @@ PRO,升降轴(轴2)PA1速度,UpDownAxis_PA1_Speed,100,,,,,, , ...@@ -97,7 +99,7 @@ PRO,升降轴(轴2)PA1速度,UpDownAxis_PA1_Speed,100,,,,,, ,
PRO,升降轴(轴2)PA2速度,UpDownAxis_PA2_Speed,100,,,,,,, PRO,升降轴(轴2)PA2速度,UpDownAxis_PA2_Speed,100,,,,,,,
PRO,进出轴(轴3)PA速度,InOutAxis_PA_Speed,100,,,,,,, PRO,进出轴(轴3)PA速度,InOutAxis_PA_Speed,100,,,,,,,
PRO,旋转轴(轴1)PA速度,MiddleAxis_PA_Speed,120,,,,,,, PRO,旋转轴(轴1)PA速度,MiddleAxis_PA_Speed,120,,,,,,,
PRO,压紧轴(轴4)缓慢压紧速度,CompAxis_Com_Speed,100,,,,,,, PRO,压紧轴(轴4)P4速度,CompAxis_P4_Speed,100,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴一)旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,, PRO,(轴一)旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
PRO,(轴二)升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, , PRO,(轴二)升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,
......
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,NG口放料点P2
1#AC1_1_1_4,774,8,7,1,211783,51884,55245,55245,51884,68000,9999,9999,81000 1#AC1_1_1_4,774,8,7,1,211783,51884,55245,55245,51884,68000,9999,9999,81000
1#AC1_1_1_5,773,8,7,1,211783,67807,71168,71168,67807,68000,12000,75000,81000 1#AC1_1_1_5,773,8,7,1,211783,67807,71168,71168,67807,68000,12000,75000,81000
1#AC1_1_1_6,772,8,7,1,211783,83730,87091,87091,83730,68000,12000,75000,81000 1#AC1_1_1_6,772,8,7,1,211783,83730,87091,87091,83730,68000,12000,75000,81000
......
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,NG口放料点P2
2#AC1_1_1_4,774,8,7,2,211783,51884,55245,55245,51884,68000,9999,9999,81000 2#AC1_1_1_4,774,8,7,2,211783,51884,55245,55245,51884,68000,9999,9999,81000
2#AC1_1_1_5,773,8,7,2,211783,67807,71168,71168,67807,68000,12000,75000,81000 2#AC1_1_1_5,773,8,7,2,211783,67807,71168,71168,67807,68000,12000,75000,81000
2#AC1_1_1_6,772,8,7,2,211783,83730,87091,87091,83730,68000,12000,75000,81000 2#AC1_1_1_6,772,8,7,2,211783,83730,87091,87091,83730,68000,12000,75000,81000
......
...@@ -119,6 +119,31 @@ namespace OnlineStore.DeviceLibrary ...@@ -119,6 +119,31 @@ namespace OnlineStore.DeviceLibrary
MoveP.Middle_PA = sp.MiddleAxis_PA; MoveP.Middle_PA = sp.MiddleAxis_PA;
} }
internal void UpdatePosId(string message, string posId, string plateW, string plateH,int comPosition)
{
this.WareCode = message;
this.PosID = posId;
this.PlateH = plateH;
this.PlateW = plateW;
ACBoxPosition position = CSVPositionReader<ACBoxPosition>.GetPositon(posId);
if (position == null)
{
LogUtil.error( "GetPositon[" + posId + "] =null,没有库位不能执行出入库");
}
MoveP.InOut_P2 = position.InOutAxis_P2;
MoveP.ComPress_P2 = comPosition;
MoveP.ComPress_P3 = position.ComAxis_P3;
MoveP.InOut_P3 = position.InoutAxis_P3;
MoveP.Middle_P2 = position.MiddleAxis_P2;
MoveP.UpDown_P3 = position.UpdownAxis_IH_P3;
MoveP.UpDown_P4 = position.UpdownAxis_IL_P4;
MoveP.UpDown_P5 = position.UpdownAxis_OH_P5;
MoveP.UpDown_P6 = position.UpdownAxis_OL_P6;
}
} }
} }
...@@ -13,72 +13,72 @@ namespace OnlineStore.DeviceLibrary ...@@ -13,72 +13,72 @@ namespace OnlineStore.DeviceLibrary
public class LineMoveP public class LineMoveP
{ {
/// <summary> /// <summary>
/// 轴2( 升降轴) 进料口取料点 P1 /// 轴2( 升降轴) NG料口放料点 P2
/// </summary> /// </summary>
public int UpDown_P1 { get; set; } public int UpDown_P1 = 0;
/// <summary> /// <summary>
/// 轴2( 升降轴) 进料口出料前点P2 /// 轴2( 升降轴) NG料口放料缓冲点 P2
/// </summary> /// </summary>
public int UpDown_P2 { get; set; } public int UpDown_P2 = 0;
/// <summary> /// <summary>
/// 轴2( 升降轴) 库位入料前点P3 /// 轴2( 升降轴) 库位入料前点P3
/// </summary> /// </summary>
public int UpDown_P3 { get; set; } public int UpDown_P3 = 0;
/// <summary> /// <summary>
/// 轴2( 升降轴) 库位入料缓冲点P4 /// 轴2( 升降轴) 库位入料缓冲点P4
/// </summary> /// </summary>
public int UpDown_P4 { get; set; } public int UpDown_P4 = 0;
/// <summary> /// <summary>
/// 轴2( 升降轴) 库位出料前点P5 /// 轴2( 升降轴) 库位出料前点P5
/// </summary> /// </summary>
public int UpDown_P5 { get; set; } public int UpDown_P5 = 0;
/// <summary> /// <summary>
/// 轴2( 升降轴) 库位出料缓冲点P6 /// 轴2( 升降轴) 库位出料缓冲点P6
/// </summary> /// </summary>
public int UpDown_P6 { get; set; } public int UpDown_P6 = 0;
/// <summary> ///// <summary>
/// 轴2( 升降轴) 进料口取料缓冲点P7 ///// 轴2( 升降轴) 进料口取料缓冲点P7
/// </summary> ///// </summary>
public int UpDown_P7 { get; set; } //public int UpDown_P7 = 0;
/// <summary> ///// <summary>
/// 轴2( 升降轴) 进料口出料缓冲点P8 ///// 轴2( 升降轴) 进料口出料缓冲点P8
/// </summary> ///// </summary>
public int UpDown_P8 { get; set; } //public int UpDown_P8 = 0;
/// <summary> /// <summary>
/// 轴1旋转轴 待机原位点 P1 /// 轴1旋转轴 待机原位点 P1
/// </summary> /// </summary>
public int Middle_P1 { get; set; } public int Middle_P1 = 0;
/// <summary> /// <summary>
/// 轴1旋转轴 库位点 P2 /// 轴1旋转轴 库位点 P2
/// </summary> /// </summary>
public int Middle_P2 { get; set; } public int Middle_P2 = 0;
/// <summary> /// <summary>
/// 轴3进出轴 待机原位点P1 /// 轴3进出轴 待机原位点P1
/// </summary> /// </summary>
public int InOut_P1 { get; set; } public int InOut_P1 = 0;
/// <summary> /// <summary>
/// 轴3进出轴 进料口取料点P2 /// 轴3进出轴 NG口放料点
/// </summary> /// </summary>
public int InOut_P2 { get; set; } public int InOut_P2 = 0;
/// <summary> /// <summary>
/// 轴3进出轴 库位点取料点P3 /// 轴3进出轴 库位点取料点P3
/// </summary> /// </summary>
public int InOut_P3 { get; set; } public int InOut_P3 = 0;
/// <summary> /// <summary>
/// 轴4( 压紧轴)待机原位点P1 /// 轴4( 压紧轴)待机原位点P1
/// </summary> /// </summary>
public int ComPress_P1 { get; set; } public int ComPress_P1 = 0;
/// <summary> /// <summary>
/// 轴4( 压紧轴)压紧点 P2 /// 轴4( 压紧轴)压紧点 P2
/// </summary> /// </summary>
public int ComPress_P2 { get; set; } public int ComPress_P2 = 0;
/// <summary> /// <summary>
/// 轴4( 压紧轴) 压紧前点P3 /// 轴4( 压紧轴) 压紧前点P3
/// </summary> /// </summary>
public int ComPress_P3{ get; set; } public int ComPress_P3 = 0;
/// <summary> /// <summary>
/// 料架进出轴取料点 /// 料架进出轴取料点
......
...@@ -316,125 +316,165 @@ namespace OnlineStore.DeviceLibrary ...@@ -316,125 +316,165 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 料架入库:检测到线体入料口信号 /// 料架入库:检测到线体入料口信号
/// </summary> /// </summary>
SI_S01_LineIn_Check= 20001, BI_01_LineIn_Check= 20001,
/// <summary> /// <summary>
/// 料架入库:入料口移门打开 /// 料架入库:入料口移门打开
/// </summary> /// </summary>
SI_S02_DoorOpen = 20002, BI_02_DoorOpen = 20002,
/// <summary> /// <summary>
/// 料架入库:线体正转 /// 料架入库:线体正转
/// </summary> /// </summary>
SI_S03_LineRun = 20003, BI_03_LineRun = 20003,
/// <summary> /// <summary>
/// 料架入库:取料位检测到信号,停止线体正转 /// 料架入库:取料位检测到信号,停止线体正转
/// </summary> /// </summary>
SI_S04_LineStop = 20004, BI_04_LineStop = 20004,
/// <summary> /// <summary>
/// 料架入库:入料口移门关闭 /// 料架入库:入料口移门关闭
/// </summary> /// </summary>
SI_S05_DoorClose = 20005, BI_05_DoorClose = 20005,
/// <summary> /// <summary>
/// 料架入库:定位装置上升 /// 料架入库:定位装置上升
/// </summary> /// </summary>
SI_S06_LocationUp = 20006, BI_06_LocationUp = 20006,
/// <summary> /// <summary>
/// 料架入库:顶升装置上升 /// 料架入库:顶升装置上升
/// </summary> /// </summary>
SI_S07_TopCylinderUp = 20007, BI_07_TopCylinderUp = 20007,
/// <summary> /// <summary>
/// 料架入库:开始循环从第一个空位逐个取料盘,扫码入库 /// 料架入库:开始循环从第一个空位逐个取料盘,扫码入库
/// </summary> /// </summary>
SI_S08_StartGetTray= 20008, BI_08_StartGetTray= 20008,
/// <summary> /// <summary>
/// 料架取料:叉子后退到待机点P1 /// 料架取料:叉子后退到待机点P1
/// </summary> /// </summary>
SI_S11_InoutToP1 = 20111, BI_11_InoutToP1 = 20111,
/// <summary> /// <summary>
/// 料架取料:升降轴移动到PA1低点,旋转轴移动到PA1点,压紧轴到压紧前点 /// 料架取料:升降轴移动到PA1低点,旋转轴移动到PA1点,压紧轴到压紧前点
/// </summary> /// </summary>
SI_S12_MoveToShelf = 20112, BI_12_MoveToShelf = 20112,
/// <summary> /// <summary>
/// 料架取料:叉子前进到PA点 /// 料架取料:叉子前进到PA点
/// </summary> /// </summary>
SI_S13_InoutToPA = 20113, BI_13_InoutToPA = 20113,
/// <summary> /// <summary>
/// 料架取料:升降轴上升到PA2点 /// 料架取料:升降轴上升到PA2点
/// </summary> /// </summary>
SI_S14_UpdownToPA2 = 20114, BI_14_UpdownToPA2 = 20114,
/// <summary> /// <summary>
/// 料架取料:压紧轴开始缓慢压紧 /// 料架取料:压紧轴开始缓慢压紧
/// </summary> /// </summary>
SI_S15_StartCompress = 20115, BI_15_StartCompress = 20115,
/// <summary> /// <summary>
/// 料架取料:检测到料叉压紧确认信号,再次向下压紧指定的值 /// 料架取料:检测到料叉压紧确认信号,再次向下压紧指定的值
/// </summary> /// </summary>
SI_S16_ComAxisDownMove = 20116, BI_16_ComAxisDownMove = 20116,
/// <summary> /// <summary>
/// 料架取料:记录压紧高度,叉子后退到扫码点 /// 料架取料:记录压紧高度,叉子后退到扫码点
/// </summary> /// </summary>
SI_S17_InoutBack = 20117, BI_17_InoutBack = 20117,
/// <summary> /// <summary>
/// 料架取料:记录宽度,开始扫码 /// 料架取料:记录宽度,开始扫码
/// </summary> /// </summary>
SI_S18_ScanCode = 20118, BI_18_ScanCode = 20118,
/// <summary> /// <summary>
/// 料架取料:扫码成功,从服务器获取库位号 /// 料架取料:扫码成功,从服务器获取库位号
/// </summary> /// </summary>
SI_S19_GetPosId = 20119, BI_19_GetPosId = 20119,
/// <summary> /// <summary>
/// 料架取料: 获取库位号完成,设置位置参数,开始入库 /// 料架取料: 获取库位号完成,设置位置参数,开始入库
/// </summary> /// </summary>
SI_S20_CompressWare = 20120, BI_20_SetInstoreParam= 20120,
/// <summary> /// <summary>
/// 入库。。移动到库位点,轴1( 转盘) 至P2( 库位点)轴2(上下) 至P3(库位入库前点) /// 入库。。移动到库位点,轴1( 转盘) 至P2( 库位点)轴2(上下) 至P3(库位入库前点)
/// </summary> /// </summary>
SI_S21_MoveToBag = 20121, BI_21_MoveToBag = 20121,
/// <summary> /// <summary>
/// 入库。。叉子进入库位中,轴3( 叉子) 至P3(库位取放料点) /// 入库。。叉子进入库位中,轴3( 叉子) 至P3(库位取放料点)
/// </summary> /// </summary>
SI_S22_DeviceToBag = 20122, BI_22_DeviceToBag = 20122,
/// <summary> /// <summary>
/// 入库。。放下物品,轴2( 上下) 至P4( 库位入料缓冲点)轴4( 压紧) 至P3( 压紧前点) /// 入库。。放下物品,轴2( 上下) 至P4( 库位入料缓冲点)轴4( 压紧) 至P3( 压紧前点)
/// </summary> /// </summary>
SI_S23_PutWareToBag = 20123, BI_23_PutWareToBag = 20123,
/// <summary> /// <summary>
/// 入库。。叉子从库位中返回,轴3( 叉子) 动作至P1( 待机点) /// 入库。。叉子从库位中返回,轴3( 叉子) 动作至P1( 待机点)
/// </summary> /// </summary>
SI_S24_DeviceBackFromBag = 20124, BI_24_DeviceBackFromBag = 20124,
/// <summary> /// <summary>
/// 入库。。返回待机点,轴2/轴1/轴4动作至P1( 待机点))开始 /// 入库。。返回待机点,轴2/轴1/轴4动作至P1( 待机点))开始
/// </summary> /// </summary>
SI_S25_GoBack = 20125, BI_25_GoBack = 20125,
/// <summary> /// <summary>
/// 送出料盘:扫码或获取库位失败,升降轴移动到NG料门口上端,旋转轴移动到NG料门口 /// 送出料盘:扫码或获取库位失败,升降轴移动到NG料门口上端,旋转轴移动到NG料门口
/// </summary> /// </summary>
SI_S31_ToNGDoor=20131, BI_31_ToNGDoor=20131,
/// <summary> /// <summary>
/// 送出料盘:NG料口升降门上升 /// 送出料盘:NG料口升降门上升
/// </summary> /// </summary>
SI_S32_NGDoorUp = 20132, BI_32_NGDoorUp = 20132,
/// <summary> /// <summary>
/// 送出料盘:进出轴前进到NG料门口位置 /// 送出料盘:进出轴前进到NG料门口位置
/// </summary> /// </summary>
SI_S33_InoutToNGDoor = 20133, BI_33_InoutToNGDoor = 20133,
/// <summary> /// <summary>
/// 送出料盘:升降轴缓慢下降,放下料盘 /// 送出料盘:升降轴缓慢下降,放下料盘
/// </summary> /// </summary>
SI_S34_UpdownDown= 20134, BI_34_UpdownDown= 20134,
/// <summary> /// <summary>
/// 送出料盘:叉子后退到P1 /// 送出料盘:叉子后退到P1
/// </summary> /// </summary>
SI_S35_InoutToP1 = 20135, BI_35_InoutToP1 = 20135,
/// <summary> /// <summary>
/// 送出料盘:关门NG料门,送出料盘结束 /// 送出料盘:关门NG料门,送出料盘结束
/// </summary> /// </summary>
SI_S36_NGDoorDown = 20136, BI_36_NGDoorDown = 20136,
#endregion
#region 把料架送出步骤 21000开始
/// <summary>
/// 送出料架:顶升气缸下降
/// </summary>
BS_01_TopCylinder_Down=21001,
/// <summary>
/// 送出料架:定位气缸下降
/// </summary>
BS_02_LocatinCylinder_Down = 21002,
/// <summary>
/// 送出料架:打开仓门
/// </summary>
BS_03_DoorOpen = 21003,
/// <summary>
/// 送出料架:线体反转
/// </summary>
BS_04_LineBack= 21004,
/// <summary>
/// 送出料架:等待取料工位无信号,入料口有信号
/// </summary>
BS_05_WaitInLineSingle = 21005,
/// <summary>
/// 送出料架:再转动300时间
/// </summary>
BS_06_WaitTime = 21006,
/// <summary>
/// 送出料架:停止转动
/// </summary>
BS_07_LineStop= 21007,
/// <summary>
/// 送出料架:通知调度系统拿走
/// </summary>
BS_08_CallAGV = 21008,
/// <summary>
/// 送出料架:关闭仓门
/// </summary>
BS_09_CloseDoor= 21009,
#endregion #endregion
} }
......
...@@ -242,6 +242,28 @@ namespace OnlineStore.DeviceLibrary ...@@ -242,6 +242,28 @@ namespace OnlineStore.DeviceLibrary
wait.IsEnd = false; wait.IsEnd = false;
return wait; return wait;
} }
public static WaitResultInfo WaitComAxis(ConfigMoveAxis axis, int targetPosition, int targetSpeed)
{
WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0;
wait.WaitType = 8;
wait.AxisInfo = axis;
wait.IsHomeMove = false;
wait.TargetPosition = targetPosition;
wait.TargetSpeed = targetSpeed;
wait.IsEnd = false;
return wait;
}
internal static WaitResultInfo WaitCode()
{
WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0;
wait.WaitType = 9;
wait.IsHomeMove = false;
wait.IsEnd = false;
return wait;
}
public string ToStr() public string ToStr()
{ {
...@@ -278,6 +300,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -278,6 +300,12 @@ namespace OnlineStore.DeviceLibrary
}else if (WaitType == 7) }else if (WaitType == 7)
{ {
return "料盘高度【" + HeightValue + "】 "; return "料盘高度【" + HeightValue + "】 ";
}else if (WaitType.Equals(8))
{
return "压紧轴压紧到位";
}else if (WaitType.Equals(9))
{
return "扫码完成";
} }
else else
{ {
...@@ -289,7 +317,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -289,7 +317,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public int CanWhileMoveCount { get; set; } public int CanWhileMoveCount { get; set; }
/// <summary> /// <summary>
/// 等待结果,1=轴运动,2=IO运动,3=时间,4=电钢,5=硕科电机,6=等待轴原点信号 /// 等待结果,1=轴运动,2=IO运动,3=时间,4=电钢,5=硕科电机,6=等待轴原点信号,8=等待压紧轴压紧到位
/// </summary> /// </summary>
public int WaitType { get; set; } public int WaitType { get; set; }
/// <summary> /// <summary>
......
...@@ -21,51 +21,51 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -21,51 +21,51 @@ namespace OnlineStore.LoadCSVLibrary
/// 中轴位置(旋转轴库位点)P2 /// 中轴位置(旋转轴库位点)P2
/// </summary> /// </summary>
[CSVAttribute("中轴位置P2")] [CSVAttribute("中轴位置P2")]
public int MiddleAxis_Position_P2 { get; set; } public int MiddleAxis_P2 { get; set; }
/// <summary> /// <summary>
/// 升降轴(库位出料前点)P5 /// 升降轴(库位出料前点)P5
/// </summary> /// </summary>
[CSVAttribute("升降轴库位出料前点P5")] [CSVAttribute("升降轴库位出料前点P5")]
public int UpDownAxis_OHPosition_P5 { get; set; } public int UpdownAxis_OH_P5 { get; set; }
/// <summary> /// <summary>
/// 升降轴(库位出料缓冲点)P6 /// 升降轴(库位出料缓冲点)P6
/// </summary> /// </summary>
[CSVAttribute("升降轴库位出料缓冲点P6")] [CSVAttribute("升降轴库位出料缓冲点P6")]
public int UpDownAxis_OLPosition_P6 { get; set; } public int UpdownAxis_OL_P6 { get; set; }
/// <summary> /// <summary>
/// 升降轴(库位入料前点)P3 /// 升降轴(库位入料前点)P3
/// </summary> /// </summary>
[CSVAttribute("升降轴库位入料前点P3")] [CSVAttribute("升降轴库位入料前点P3")]
public int UpDownAxis_IHPosition_P3 { get; set; } public int UpdownAxis_IH_P3 { get; set; }
/// <summary> /// <summary>
/// 升降轴(库位入料缓冲点)P4 /// 升降轴(库位入料缓冲点)P4
/// </summary> /// </summary>
[CSVAttribute("升降轴库位入料缓冲点P4")] [CSVAttribute("升降轴库位入料缓冲点P4")]
public int UpDownAxis_ILPosition_P4 { get; set; } public int UpdownAxis_IL_P4 { get; set; }
/// <summary> /// <summary>
/// 进出轴(库位点取料点)P3 /// 进出轴(库位点取料点)P3
/// </summary> /// </summary>
[CSVAttribute("进出轴库位点取料点P3")] [CSVAttribute("进出轴库位点取料点P3")]
public int InOutAxis_Position_P3 { get; set; } public int InoutAxis_P3 { get; set; }
/// <summary> /// <summary>
/// 压紧轴(压紧点)P2 /// 压紧轴(压紧点)P2
/// </summary> /// </summary>
[CSVAttribute("压紧轴压紧点P2")] [CSVAttribute("压紧轴压紧点P2")]
public int CompressAxis_Position_P2 { get; set; } public int ComAxis_P2 { get; set; }
/// <summary> /// <summary>
/// 压紧轴(压紧前点)P3 /// 压紧轴(压紧前点)P3
/// </summary> /// </summary>
[CSVAttribute("压紧轴压紧前点P3")] [CSVAttribute("压紧轴压紧前点P3")]
public int CompressAxis_CPosition_P3 { get; set; } public int ComAxis_P3 { get; set; }
/// <summary> /// <summary>
/// 轴3(进出轴) 进料口取料点P2 /// 轴3(进出轴) NG口放料点P2
/// </summary> /// </summary>
[CSVAttribute("进出轴进料口取料点P2")] [CSVAttribute("NG口放料点P2")]
public int InOutAxis_DoorPosition_P2 { get; set; } public int InOutAxis_P2 { get; set; }
public static bool CheckPosition(ACBoxPosition position, AC_BOX_Config Config) public static bool CheckPosition(ACBoxPosition position, AC_BOX_Config Config)
{ {
...@@ -75,9 +75,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -75,9 +75,9 @@ namespace OnlineStore.LoadCSVLibrary
{ {
int mMin = Config.Middle_Axis.PositionMin; int mMin = Config.Middle_Axis.PositionMin;
int mMax = Config.Middle_Axis.PositionMax; int mMax = Config.Middle_Axis.PositionMax;
if (mMin > position.MiddleAxis_Position_P2 || mMax < position.MiddleAxis_Position_P2) if (mMin > position.MiddleAxis_P2 || mMax < position.MiddleAxis_P2)
{ {
LogUtil.error(position.PositionNum + " MiddleAxis_Position_P2位置超出" + Config.Middle_Axis.Explain + "上下限(" + mMin + "-" + mMax + ")"); LogUtil.error(position.PositionNum + " MiddleAxis_P2 位置超出" + Config.Middle_Axis.Explain + "上下限(" + mMin + "-" + mMax + ")");
return false; return false;
} }
} }
...@@ -85,12 +85,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -85,12 +85,12 @@ namespace OnlineStore.LoadCSVLibrary
{ {
int iMin = Config.InOut_Axis.PositionMin; int iMin = Config.InOut_Axis.PositionMin;
int iMax = Config.InOut_Axis.PositionMax; int iMax = Config.InOut_Axis.PositionMax;
if (iMin > position.InOutAxis_DoorPosition_P2 || iMax < position.InOutAxis_DoorPosition_P2) if (iMin > position.InOutAxis_P2 || iMax < position.InOutAxis_P2)
{ {
LogUtil.error(position.PositionNum + " InOutAxis_DoorPosition_P2位置超出" + Config.InOut_Axis.Explain + "上下限(" + iMin + "-" + iMax + ")"); LogUtil.error(position.PositionNum + " InOutAxis_P2 位置超出" + Config.InOut_Axis.Explain + "上下限(" + iMin + "-" + iMax + ")");
return false; return false;
} }
if (iMin > position.InOutAxis_Position_P3 || iMax < position.InOutAxis_Position_P3) if (iMin > position.InoutAxis_P3 || iMax < position.InoutAxis_P3)
{ {
LogUtil.error(position.PositionNum + " InOutAxis_Position_P3位置超出" + Config.InOut_Axis.Explain + "上下限(" + iMin + "-" + iMax + ")"); LogUtil.error(position.PositionNum + " InOutAxis_Position_P3位置超出" + Config.InOut_Axis.Explain + "上下限(" + iMin + "-" + iMax + ")");
return false; return false;
...@@ -100,24 +100,24 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -100,24 +100,24 @@ namespace OnlineStore.LoadCSVLibrary
{ {
int uMin = Config.UpDown_Axis.PositionMin; int uMin = Config.UpDown_Axis.PositionMin;
int uMax = Config.UpDown_Axis.PositionMax; int uMax = Config.UpDown_Axis.PositionMax;
if (uMin > position.UpDownAxis_IHPosition_P3 || uMax < position.UpDownAxis_IHPosition_P3) if (uMin > position.UpdownAxis_IH_P3 || uMax < position.UpdownAxis_IH_P3)
{ {
LogUtil.error(position.PositionNum + " UpDownAxis_IHPosition_P3位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")"); LogUtil.error(position.PositionNum + " UpdownAxis_IH_P3 位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")");
return false; return false;
} }
if (uMin > position.UpDownAxis_ILPosition_P4 || uMax < position.UpDownAxis_ILPosition_P4) if (uMin > position.UpdownAxis_IL_P4 || uMax < position.UpdownAxis_IL_P4)
{ {
LogUtil.error(position.PositionNum + " UpDownAxis_ILPosition_P4位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")"); LogUtil.error(position.PositionNum + " UpdownAxis_IL_P4 位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")");
return false; return false;
} }
if (uMin > position.UpDownAxis_OHPosition_P5 || uMax < position.UpDownAxis_OHPosition_P5) if (uMin > position.UpdownAxis_OH_P5 || uMax < position.UpdownAxis_OH_P5)
{ {
LogUtil.error(position.PositionNum + " UpDownAxis_OHPosition_P5位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")"); LogUtil.error(position.PositionNum + " UpdownAxis_OH_P5 位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")");
return false; return false;
} }
if (uMin > position.UpDownAxis_OLPosition_P6 || uMax < position.UpDownAxis_OLPosition_P6) if (uMin > position.UpdownAxis_OL_P6 || uMax < position.UpdownAxis_OL_P6)
{ {
LogUtil.error(position.PositionNum + " UpDownAxis_OLPosition_P6位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")"); LogUtil.error(position.PositionNum + "UpdownAxis_OL_P6 位置超出" + Config.UpDown_Axis.Explain + "上下限(" + uMin + "-" + uMax + ")");
return false; return false;
} }
} }
......
...@@ -231,33 +231,33 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -231,33 +231,33 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// 升降轴 进料口取料点 P1 /// 升降轴 NG料口放料点P1
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_DoorOPosition_P1")] [ConfigProAttribute("UpDownAxis_P1")]
public int UpDownAxis_DoorOPosition_P1 { get; set; } public int UpDownAxis_P1 { get; set; }
/// <summary> /// <summary>
/// 升降轴 进料口出料前点 P2 /// 升降轴 NG料口放料缓冲点 P2
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_DoorIPosition_P2")] [ConfigProAttribute("UpDownAxis_P2")]
public int UpDownAxis_DoorIPosition_P2 { get; set; } public int UpDownAxis_P2 { get; set; }
/// <summary> ///// <summary>
/// 升降轴 进料口取料缓冲点 P7 ///// 升降轴 进料口取料缓冲点 P7
/// </summary> ///// </summary>
[ConfigProAttribute("UpDownAxis_DoorOBPosition_P7")] //[ConfigProAttribute("UpDownAxis_DoorOBPosition_P7")]
public int UpDownAxis_DoorOBPosition_P7 { get; set; } //public int UpDownAxis_DoorOBPosition_P7 { get; set; }
/// <summary> ///// <summary>
/// 升降轴 进料口出料缓冲点 P8 ///// 升降轴 进料口出料缓冲点 P8
/// </summary> ///// </summary>
[ConfigProAttribute("UpDownAxis_DoorIBPosition_P8")] //[ConfigProAttribute("UpDownAxis_DoorIBPosition_P8")]
public int UpDownAxis_DoorIBPosition_P8 { get; set; } //public int UpDownAxis_DoorIBPosition_P8 { get; set; }
/// <summary> /// <summary>
/// PRO 旋转轴(轴1)P1 待机原位点 MiddleAxis_P1_Position /// PRO 旋转轴(轴1)P1 待机原位点/NG料口位置 MiddleAxis_P1
/// </summary> /// </summary>
[ConfigProAttribute("MiddleAxis_P1_Position")] [ConfigProAttribute("MiddleAxis_P1")]
public int MiddleAxis_P1_Position { get; set; } public int MiddleAxis_P1 { get; set; }
/// <summary> /// <summary>
/// PRO 进出轴(轴3)P1待机原位点 InOutAxis_P1_Position /// PRO 进出轴(轴3)P1待机原位点 InOutAxis_P1_Position
/// </summary> /// </summary>
...@@ -323,36 +323,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -323,36 +323,6 @@ namespace OnlineStore.LoadCSVLibrary
public int CompAxis_HomeAddSpeed { get; set; } public int CompAxis_HomeAddSpeed { get; set; }
/// <summary>
/// PRO (轴一)旋转轴最小限位 MiddleAxis_PositionMin
/// </summary>
[ConfigProAttribute("MiddleAxis_PositionMin", false)]
public int MiddleAxis_PositionMin { get; set; }
/// <summary>
/// PRO (轴二)升降轴最小限位 UpdownAxis_PositionMin
/// </summary>
[ConfigProAttribute("UpdownAxis_PositionMin", false)]
public int UpdownAxis_PositionMin { get; set; }
/// <summary>
/// PRO (轴三)进出轴最小限位 InoutAxis_PositionMin
/// </summary>
[ConfigProAttribute("InoutAxis_PositionMin", false)]
public int InoutAxis_PositionMin { get; set; }
/// <summary>
/// PRO (轴一)旋转轴最大限位 MiddleAxis_PositionMax
/// </summary>
[ConfigProAttribute("MiddleAxis_PositionMax", false)]
public int MiddleAxis_PositionMax { get; set; }
/// <summary>
/// PRO (轴二)升降轴最大限位 UpdownAxis_PositionMax
/// </summary>
[ConfigProAttribute("UpdownAxis_PositionMax", false)]
public int UpdownAxis_PositionMax { get; set; }
/// <summary>
/// PRO (轴三)进出轴最大限位 InoutAxis_PositionMax
/// </summary>
[ConfigProAttribute("InoutAxis_PositionMax", false)]
public int InoutAxis_PositionMax { get; set; }
/// <summary> /// <summary>
...@@ -372,13 +342,22 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -372,13 +342,22 @@ namespace OnlineStore.LoadCSVLibrary
public int CompAxis_P3_Speed { get; set; } public int CompAxis_P3_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,压紧轴(轴4)缓慢压紧速度,CompAxis_Com_Speed,100,,,,,,, /// PRO,压紧轴(轴4)P4速度,CompAxis_P4_Speed,100,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("CompAxis_Com_Speed")] [ConfigProAttribute("CompAxis_P4_Speed")]
public int CompAxis_Com_Speed { get; set; } public int CompAxis_P4_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,压紧轴(轴4)压紧确认信号收到之后下降的位置,CompAxis_Down_Position,2000,,,,,,,
/// </summary>
[ConfigProAttribute("CompAxis_Down_Position")]
public int CompAxis_Down_Position { get; set; }
/// <summary>
/// PRO,压紧轴(轴4)P4目标压紧点,CompAxis_P4_Position,10000,,,,,,,
/// </summary>
[ConfigProAttribute("CompAxis_P4_Position")]
public int CompAxis_P4_Position { get; set; }
/// <summary>
/// PRO,升降轴(轴2)PA1速度,UpDownAxis_PA1_Speed,100,,,,,, , /// PRO,升降轴(轴2)PA1速度,UpDownAxis_PA1_Speed,100,,,,,, ,
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_PA1_Speed")] [ConfigProAttribute("UpDownAxis_PA1_Speed")]
...@@ -405,6 +384,38 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -405,6 +384,38 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("CompAxis_P3_Position")] [ConfigProAttribute("CompAxis_P3_Position")]
public int CompAxis_P3_Position { get; set; } public int CompAxis_P3_Position { get; set; }
/// <summary>
/// PRO (轴一)旋转轴最小限位 MiddleAxis_PositionMin
/// </summary>
[ConfigProAttribute("MiddleAxis_PositionMin", false)]
public int MiddleAxis_PositionMin { get; set; }
/// <summary>
/// PRO (轴二)升降轴最小限位 UpdownAxis_PositionMin
/// </summary>
[ConfigProAttribute("UpdownAxis_PositionMin", false)]
public int UpdownAxis_PositionMin { get; set; }
/// <summary>
/// PRO (轴三)进出轴最小限位 InoutAxis_PositionMin
/// </summary>
[ConfigProAttribute("InoutAxis_PositionMin", false)]
public int InoutAxis_PositionMin { get; set; }
/// <summary>
/// PRO (轴一)旋转轴最大限位 MiddleAxis_PositionMax
/// </summary>
[ConfigProAttribute("MiddleAxis_PositionMax", false)]
public int MiddleAxis_PositionMax { get; set; }
/// <summary>
/// PRO (轴二)升降轴最大限位 UpdownAxis_PositionMax
/// </summary>
[ConfigProAttribute("UpdownAxis_PositionMax", false)]
public int UpdownAxis_PositionMax { get; set; }
/// <summary>
/// PRO (轴三)进出轴最大限位 InoutAxis_PositionMax
/// </summary>
[ConfigProAttribute("InoutAxis_PositionMax", false)]
public int InoutAxis_PositionMax { get; set; }
/// <summary> /// <summary>
/// 预警温度 /// 预警温度
/// </summary> /// </summary>
...@@ -576,9 +587,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -576,9 +587,9 @@ namespace OnlineStore.LoadCSVLibrary
//Config.UpDown_Axis.ResolveSpeed = Config.UpdownAxis_ResolveSpeed; //Config.UpDown_Axis.ResolveSpeed = Config.UpdownAxis_ResolveSpeed;
//Config.Middle_Axis.ResolveSpeed = Config.MiddleAxis_ResolveSpeed; //Config.Middle_Axis.ResolveSpeed = Config.MiddleAxis_ResolveSpeed;
Config.Middle_Axis.DefaultPosition = Config.MiddleAxis_P1_Position; Config.Middle_Axis.DefaultPosition = Config.MiddleAxis_P1;
Config.InOut_Axis.DefaultPosition = Config.InOutAxis_P1_Position; Config.InOut_Axis.DefaultPosition = Config.InOutAxis_P1_Position;
Config.UpDown_Axis.DefaultPosition = Config.UpDownAxis_DoorOPosition_P1; Config.UpDown_Axis.DefaultPosition = Config.UpDownAxis_P1;
Config.Comp_Axis.DefaultPosition = Config.CompAxis_P1_Position; Config.Comp_Axis.DefaultPosition = Config.CompAxis_P1_Position;
Config.Comp_Axis.CanErrorCountMax = 1000; Config.Comp_Axis.CanErrorCountMax = 1000;
Config.Comp_Axis.CanErrorCountMin = 10; Config.Comp_Axis.CanErrorCountMin = 10;
......
...@@ -164,9 +164,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -164,9 +164,9 @@ namespace OnlineStore.LoadCSVLibrary
//Config.UpDown_Axis.ResolveSpeed = Config.UpdownAxis_ResolveSpeed; //Config.UpDown_Axis.ResolveSpeed = Config.UpdownAxis_ResolveSpeed;
//Config.Middle_Axis.ResolveSpeed = Config.MiddleAxis_ResolveSpeed; //Config.Middle_Axis.ResolveSpeed = Config.MiddleAxis_ResolveSpeed;
Config.Middle_Axis.DefaultPosition = Config.MiddleAxis_P1_Position; Config.Middle_Axis.DefaultPosition = Config.MiddleAxis_P1;
Config.InOut_Axis.DefaultPosition = Config.InOutAxis_P1_Position; Config.InOut_Axis.DefaultPosition = Config.InOutAxis_P1_Position;
Config.UpDown_Axis.DefaultPosition = Config.UpDownAxis_DoorOPosition_P1; Config.UpDown_Axis.DefaultPosition = Config.UpDownAxis_P1;
Config.Comp_Axis.DefaultPosition = Config.CompAxis_P1_Position; Config.Comp_Axis.DefaultPosition = Config.CompAxis_P1_Position;
Config.Comp_Axis.CanErrorCountMax = 1000; Config.Comp_Axis.CanErrorCountMax = 1000;
Config.Comp_Axis.CanErrorCountMin = 10; Config.Comp_Axis.CanErrorCountMin = 10;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!