Skip to content

李娜 / SO664-AssemblyLine

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

升降轴P2点位问题修改。

1 个父辈 d1e28d12
内嵌 并排
正在显示 5 个修改的文件 包含 5 行增加 和 8 行删除
SO664-AssemblyLine.sln
...@@ -22,7 +22,6 @@ Global ...@@ -22,7 +22,6 @@ Global
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{43CDD09E-FCF3-4960-A01D-3BBFE9933122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43CDD09E-FCF3-4960-A01D-3BBFE9933122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43CDD09E-FCF3-4960-A01D-3BBFE9933122}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43CDD09E-FCF3-4960-A01D-3BBFE9933122}.Release|Any CPU.ActiveCfg = Release|Any CPU {43CDD09E-FCF3-4960-A01D-3BBFE9933122}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43CDD09E-FCF3-4960-A01D-3BBFE9933122}.Release|Any CPU.Build.0 = Release|Any CPU {43CDD09E-FCF3-4960-A01D-3BBFE9933122}.Release|Any CPU.Build.0 = Release|Any CPU
{513BC1C9-800D-43A6-9499-3700BAEC3554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {513BC1C9-800D-43A6-9499-3700BAEC3554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
...@@ -38,11 +37,9 @@ Global ...@@ -38,11 +37,9 @@ Global
{0D2542F5-DD62-4352-82D0-383D9A045E74}.Release|Any CPU.ActiveCfg = Release|Any CPU {0D2542F5-DD62-4352-82D0-383D9A045E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D2542F5-DD62-4352-82D0-383D9A045E74}.Release|Any CPU.Build.0 = Release|Any CPU {0D2542F5-DD62-4352-82D0-383D9A045E74}.Release|Any CPU.Build.0 = Release|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DE7A34B-77A5-465B-985B-1219FE0A9615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.Build.0 = Release|Any CPU {7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.Build.0 = Release|Any CPU
{C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Release|Any CPU.Build.0 = Release|Any CPU {C9575C5E-9D4B-4B4F-BE41-926652B8985F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -541,7 +541,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -541,7 +541,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.JM_02_CylinderTake)) else if (MoveInfo.IsStep(LineMoveStep.JM_02_CylinderTake))
{ {
int p2 = Config.GetUpdownP2Detial(MoveInfo.MoveParam.PlateH); int p2 = Config.GetUpdownP2Detial(MoveInfo.MoveParam.PlateH,MoveInfo.MoveParam.PlateW);
MoveInfo.NextMoveStep(LineMoveStep.JM_03_UpdownToP2); MoveInfo.NextMoveStep(LineMoveStep.JM_03_UpdownToP2);
OutLog(logName + MoveInfo.SLog + "：升降轴下降到取料点P2 [" + p2 + "]"); OutLog(logName + MoveInfo.SLog + "：升降轴下降到取料点P2 [" + p2 + "]");
UpdownAxis.AbsMove(MoveInfo, p2, Config.UpdownAxis_P2Speed); UpdownAxis.AbsMove(MoveInfo, p2, Config.UpdownAxis_P2Speed);
......
source/LoadCVSLibrary/storeConfig/config/FeedingEquip_Config.cs
...@@ -201,7 +201,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -201,7 +201,7 @@ namespace OnlineStore.LoadCSVLibrary
return UpdownP2DetialMap; return UpdownP2DetialMap;
} }
public int GetUpdownP2Detial(int trayHeight, int traySize = 8) public int GetUpdownP2Detial(int trayHeight, int traySize )
{ {
LoadP2DetialMap(); LoadP2DetialMap();
string fkey = traySize + "X" + trayHeight; string fkey = traySize + "X" + trayHeight;
......
source/LoadCVSLibrary/storeConfig/config/HYEquip_Config.cs
...@@ -218,7 +218,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -218,7 +218,7 @@ namespace OnlineStore.LoadCSVLibrary
return UpdownP2DetialMap; return UpdownP2DetialMap;
} }
public int GetUpdownP2Detial(int trayHeight, int traySize = 8) public int GetUpdownP2Detial(int trayHeight, int traySize)
{ {
LoadP2DetialMap(); LoadP2DetialMap();
string fkey = traySize + "X" + trayHeight; string fkey = traySize + "X" + trayHeight;
......
source/LoadCVSLibrary/storeConfig/config/MoveEquip_Config.cs
...@@ -124,7 +124,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -124,7 +124,7 @@ namespace OnlineStore.LoadCSVLibrary
return UpdownP2DetialMap; return UpdownP2DetialMap;
} }
public int GetUpdownP2Detial(int trayHeight, int traySize = 8) public int GetUpdownP2Detial(int trayHeight, int traySize )
{ {
LoadP2DetialMap(); LoadP2DetialMap();
string fkey = traySize + "X" + trayHeight; string fkey = traySize + "X" + trayHeight;
...@@ -198,7 +198,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -198,7 +198,7 @@ namespace OnlineStore.LoadCSVLibrary
return UpdownP3DetialMap; return UpdownP3DetialMap;
} }
public int GetUpdownP3Detial(int trayHeight, int traySize = 8) public int GetUpdownP3Detial(int trayHeight, int traySize )
{ {
LoadP3DetialMap(); LoadP3DetialMap();
string fkey = traySize + "X" + trayHeight; string fkey = traySize + "X" + trayHeight;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!