Skip to content

李娜 / RC1271-DUOStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0ee241e8 由 LN
选项

入库bug修改

1 个父辈 7935ab36
内嵌 并排
正在显示 9 个修改的文件 包含 40 行增加 和 34 行删除
dll/DeviceLib.dll
此文件类型无法预览
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
...@@ -19,8 +19,8 @@ PRO,,L1_旋转轴_P11-出料口位置,MiddleAxis_P11,306900,,,,,,,,,,,, ...@@ -19,8 +19,8 @@ PRO,,L1_旋转轴_P11-出料口位置,MiddleAxis_P11,306900,,,,,,,,,,,,
PRO,,L3_进出轴_P2-入料口取放料点,InOutAxis_P2,140800,,,,,,,,,,,, PRO,,L3_进出轴_P2-入料口取放料点,InOutAxis_P2,140800,,,,,,,,,,,,
PRO,,L3_进出轴_P11-出料口取放料点,InOutAxis_P11,148000,,,,,,,,,,,, PRO,,L3_进出轴_P11-出料口取放料点,InOutAxis_P11,148000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P1速度,UpDownAxis_P1_Speed,600,,,,,,,,,,,, PRO,,L2_上下轴_P1速度/高速,UpDownAxis_P1_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P2速度,UpDownAxis_P2_Speed,600,,,,,,,,,,,, PRO,,L2_上下轴_P2速度/低速,UpDownAxis_P2_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P3速度,UpDownAxis_P3_Speed,1000,,, ,,,,,,,,, PRO,,L2_上下轴_P3速度,UpDownAxis_P3_Speed,1000,,, ,,,,,,,,,
PRO,,L2_上下轴_P4速度,UpDownAxis_P4_Speed,200,,,,,,,,,,,, PRO,,L2_上下轴_P4速度,UpDownAxis_P4_Speed,200,,,,,,,,,,,,
PRO,,L2_上下轴_P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,, PRO,,L2_上下轴_P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,,
...@@ -36,8 +36,8 @@ PRO,,L4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,, ...@@ -36,8 +36,8 @@ PRO,,L4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,,
PRO,,L4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,, PRO,,L4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,,
PRO,,L4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,, PRO,,L4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P11速度,UpDownAxis_P11_Speed,600,,,,,,,,,,,, PRO,,L2_上下轴_P11速度/低速,UpDownAxis_P11_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P12速度,UpDownAxis_P12_Speed,600,,,,,,,,,,,, PRO,,L2_上下轴_P12速度/高速,UpDownAxis_P12_Speed,600,,,,,,,,,,,,
PRO,,L3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,, PRO,,L3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,L1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,, PRO,,L1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
......
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
...@@ -19,8 +19,8 @@ PRO,,R1_旋转轴_P11-出料口位置,MiddleAxis_P11,306900,,,,,,,,,,,, ...@@ -19,8 +19,8 @@ PRO,,R1_旋转轴_P11-出料口位置,MiddleAxis_P11,306900,,,,,,,,,,,,
PRO,,R3_进出轴_P2-入料口取放料点,InOutAxis_P2,140800,,,,,,,,,,,, PRO,,R3_进出轴_P2-入料口取放料点,InOutAxis_P2,140800,,,,,,,,,,,,
PRO,,R3_进出轴_P11-出料口取放料点,InOutAxis_P11,148000,,,,,,,,,,,, PRO,,R3_进出轴_P11-出料口取放料点,InOutAxis_P11,148000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,R2_上下轴_P1速度,UpDownAxis_P1_Speed,600,,,,,,,,,,,, PRO,,R2_上下轴_P1速度/高速,UpDownAxis_P1_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P2速度,UpDownAxis_P2_Speed,600,,,,,,,,,,,, PRO,,R2_上下轴_P2速度/低速,UpDownAxis_P2_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P3速度,UpDownAxis_P3_Speed,1000,,, ,,,,,,,,, PRO,,R2_上下轴_P3速度,UpDownAxis_P3_Speed,1000,,, ,,,,,,,,,
PRO,,R2_上下轴_P4速度,UpDownAxis_P4_Speed,200,,,,,,,,,,,, PRO,,R2_上下轴_P4速度,UpDownAxis_P4_Speed,200,,,,,,,,,,,,
PRO,,R2_上下轴_P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,, PRO,,R2_上下轴_P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,,
...@@ -36,8 +36,8 @@ PRO,,R4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,, ...@@ -36,8 +36,8 @@ PRO,,R4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,,
PRO,,R4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,, PRO,,R4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,,
PRO,,R4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,, PRO,,R4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,R2_上下轴_P11速度,UpDownAxis_P11_Speed,600,,,,,,,,,,,, PRO,,R2_上下轴_P11速度/低速,UpDownAxis_P11_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P12速度,UpDownAxis_P12_Speed,600,,,,,,,,,,,, PRO,,R2_上下轴_P12速度/高速,UpDownAxis_P12_Speed,600,,,,,,,,,,,,
PRO,,R3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,, PRO,,R3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,R1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,, PRO,,R1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
......
source/DeviceLibrary/duoStore/BoxBean_Partial.cs
...@@ -148,9 +148,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -148,9 +148,9 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.SI_03_InoutToP2)) else if (MoveInfo.IsStep(StoreMoveStep.SI_03_InoutToP2))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SI_04_GetReel); MoveInfo.NextMoveStep(StoreMoveStep.SI_04_GetReel);
InOutStoreLog(outType + "升降轴到P7 ["+ moveP.UpDown_P7 + "],压紧轴到P2 ["+ moveP.ComPress_P2 + "] "); InOutStoreLog(outType + "升降轴到入料口高点P2 ["+ moveP.UpDown_P2 + "],压紧轴到P2 ["+ moveP.ComPress_P2 + "] ");
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P2, Config.CompAxis_P2_Speed); ComAxis.AbsMove(MoveInfo, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed); UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed );
} }
else if (MoveInfo.IsStep(StoreMoveStep.SI_04_GetReel)) else if (MoveInfo.IsStep(StoreMoveStep.SI_04_GetReel))
{ {
...@@ -383,9 +383,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -383,9 +383,9 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveParam.TargetPosition.Equals(0)) if (MoveInfo.MoveParam.TargetPosition.Equals(0))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_06_ToDoor); MoveInfo.NextMoveStep(StoreMoveStep.SO_06_ToDoor);
InOutStoreLog(outType + "旋转轴 至P2[" + moveP.Middle_P2 + "],升降轴到P3" + moveP.UpDown_P3 + " "); InOutStoreLog(outType + "旋转轴 至P1[" + moveP.Middle_P1 + "],升降轴到P2[" + moveP.UpDown_P2 + "] ");
MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P2, Config.MiddleAxis_P2_Speed); MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P1 , Config.MiddleAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed); UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P2, Config.UpDownAxis_P1_Speed);
} }
else else
{ {
...@@ -418,7 +418,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -418,7 +418,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_PutReel); MoveInfo.NextMoveStep(StoreMoveStep.SO_08_PutReel);
InOutStoreLog(outType + "放下物品 升降轴至P1[" + moveP.UpDown_P1 + "]，压紧轴到P3 [" + moveP.ComPress_P3 + "]"); InOutStoreLog(outType + "放下物品 升降轴至P1[" + moveP.UpDown_P1 + "]，压紧轴到P3 [" + moveP.ComPress_P3 + "]");
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed); ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed); UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P2_Speed);
} }
else if (MoveInfo.IsStep(StoreMoveStep.SO_08_PutReel)) else if (MoveInfo.IsStep(StoreMoveStep.SO_08_PutReel))
{ {
......
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs
...@@ -584,7 +584,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -584,7 +584,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_05_WaitTime)) else if (MoveInfo.IsStep(StoreMoveStep.LI_05_WaitTime))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.LI_06_TopUp); MoveInfo.NextMoveStep(StoreMoveStep.LI_06_TopUp);
InOutStoreLog("入料检测： 顶升气缸上升"); InOutStoreLog("入料检测：链条停止转动， 顶升气缸上升");
LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up); CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
} }
else if (MoveInfo.IsStep(StoreMoveStep.LI_06_TopUp)) else if (MoveInfo.IsStep(StoreMoveStep.LI_06_TopUp))
......
source/DeviceLibrary/duoStore/EquipBase.cs
...@@ -136,7 +136,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -136,7 +136,7 @@ namespace OnlineStore.DeviceLibrary
} }
TimeSpan span = DateTime.Now - checkAlarmTime; TimeSpan span = DateTime.Now - checkAlarmTime;
//在回原点，复位，出入库时，检测报警间隔减小 //在回原点，复位，出入库时，检测报警间隔减小
if ((runStatus.Equals(StoreRunStatus.Runing) && span.TotalSeconds < 3) || span.TotalSeconds < 1) if ((runStatus.Equals(StoreRunStatus.Runing) && span.TotalSeconds < 3) || span.TotalSeconds < 3)
{ {
return false; return false;
} }
...@@ -147,8 +147,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -147,8 +147,13 @@ namespace OnlineStore.DeviceLibrary
{ {
short axis = axisInfo.Config.GetAxisValue(); short axis = axisInfo.Config.GetAxisValue();
string deviceName = axisInfo.Config.GetNameStr(); string deviceName = axisInfo.Config.GetNameStr();
int value = ACServerManager.GetAlarmStatus(deviceName, axis);
if (ACServerManager.GetAlarmStatus(deviceName, axis) == 1) //if (value.Equals(-1))
//{
// value = ACServerManager.GetAlarmStatus(deviceName, axis);
// LogUtil.error("获取" + axisInfo.Config.Explain + "报警状态为-1，重新获取结果=" + value);
//}
if (value == 1)
{ {
WarnMsg = Name + " 运动轴" + axisInfo.Config.Explain + "报警"; WarnMsg = Name + " 运动轴" + axisInfo.Config.Explain + "报警";
Alarm(AlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo.Config).ToString(), WarnMsg, MoveType.None); Alarm(AlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo.Config).ToString(), WarnMsg, MoveType.None);
......
source/DeviceLibrary/duoStore/StoreManager.cs
...@@ -241,7 +241,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -241,7 +241,7 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_P3 = position.UpdownAxis_IH_P3; p.UpDown_P3 = position.UpdownAxis_IH_P3;
p.UpDown_P4 = position.UpdownAxis_IL_P4; p.UpDown_P4 = position.UpdownAxis_IL_P4;
p.UpDown_P5 = position.UpdownAxis_OH_P5; p.UpDown_P5 = position.UpdownAxis_OH_P5;
p.UpDown_P6 = position.UpdownAxis_OL_P6; p.UpDown_P6 = position.UpdownAxis_OL_P6;
param.MoveP = p; param.MoveP = p;
......
source/DeviceLibrary/store/LineMoveP.cs
...@@ -16,13 +16,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,13 +16,13 @@ namespace OnlineStore.DeviceLibrary
public LineMoveP() public LineMoveP()
{ {
} }
/// <summary> /// <summary>
/// 轴2（ 升降轴） 进料口取料点 P1 /// 轴2（ 升降轴） 升降轴入料口低点P1:
/// </summary> /// </summary>
public int UpDown_P1 { get; set; } public int UpDown_P1 { get; set; }
/// <summary> /// <summary>
/// 轴2（ 升降轴） 进料口出料前点P2 /// 轴2（ 升降轴） 升降轴入料口高点P2:
/// </summary> /// </summary>
public int UpDown_P2 { get; set; } public int UpDown_P2 { get; set; }
/// <summary> /// <summary>
...@@ -41,14 +41,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -41,14 +41,14 @@ namespace OnlineStore.DeviceLibrary
/// 轴2（ 升降轴） 库位出料缓冲点P6 /// 轴2（ 升降轴） 库位出料缓冲点P6
/// </summary> /// </summary>
public int UpDown_P6 { get; set; } public int UpDown_P6 { get; set; }
/// <summary> ///// <summary>
/// 轴2（ 升降轴） 进料口取料缓冲点P7 ///// 轴2（ 升降轴） 进料口取料缓冲点P7
/// </summary> ///// </summary>
public int UpDown_P7 { get; set; } //public int UpDown_P7 { get; set; }
/// <summary> ///// <summary>
/// 轴2（ 升降轴） 进料口出料缓冲点P8 ///// 轴2（ 升降轴） 进料口出料缓冲点P8
/// </summary> ///// </summary>
public int UpDown_P8 { get; set; } //public int UpDown_P8 { get; set; }
/// <summary> /// <summary>
/// 轴1旋转轴 待机原位点 P1 /// 轴1旋转轴 待机原位点 P1
/// </summary> /// </summary>
......
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
...@@ -99,12 +99,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -99,12 +99,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("InOutAxis_P11")] [ConfigProAttribute("InOutAxis_P11")]
public int InOutAxis_P11 { get; set; } public int InOutAxis_P11 { get; set; }
/// <summary> /// <summary>
/// PRO,,L2_上下轴_P1速度,UpDownAxis_P1_Speed,600 /// PRO,,L2_上下轴_P1速度/高速,UpDownAxis_P1_Speed,600
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P1_Speed")] [ConfigProAttribute("UpDownAxis_P1_Speed")]
public int UpDownAxis_P1_Speed { get; set; } public int UpDownAxis_P1_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,L2_上下轴_P2速度,UpDownAxis_P2_Speed,600 /// PRO,,L2_上下轴_P2速度/低速,UpDownAxis_P2_Speed,600
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P2_Speed")] [ConfigProAttribute("UpDownAxis_P2_Speed")]
public int UpDownAxis_P2_Speed { get; set; } public int UpDownAxis_P2_Speed { get; set; }
...@@ -179,12 +179,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -179,12 +179,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("CompAxis_P3_Speed")] [ConfigProAttribute("CompAxis_P3_Speed")]
public int CompAxis_P3_Speed { get; set; } public int CompAxis_P3_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,L2_上下轴_P11速度,UpDownAxis_P11_Speed,600 /// PRO,,L2_上下轴_P11速度/低速,UpDownAxis_P11_Speed,600
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P11_Speed")] [ConfigProAttribute("UpDownAxis_P11_Speed")]
public int UpDownAxis_P11_Speed { get; set; } public int UpDownAxis_P11_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,L2_上下轴_P12速度,UpDownAxis_P12_Speed,600 /// PRO,,L2_上下轴_P12速度/高速,UpDownAxis_P12_Speed,600
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P12_Speed")] [ConfigProAttribute("UpDownAxis_P12_Speed")]
public int UpDownAxis_P12_Speed { get; set; } public int UpDownAxis_P12_Speed { get; set; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!