Skip to content

刘韬 / SO815-AutoInOutStore

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

1

1 个父辈 b9302332
内嵌 并排
正在显示 6 个修改的文件 包含 28 行增加 和 28 行删除
source/ACSingleStore/FrmAxisDebug.cs
...@@ -143,11 +143,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -143,11 +143,11 @@ namespace OnlineStore.AutoInOutStore
{ {
if (this.btnInOutMove.BackColor .Equals(System.Drawing.SystemColors.Control)) if (this.btnInOutMove.BackColor .Equals(System.Drawing.SystemColors.Control))
{ {
if (StoreManager.Store.InOutAxisCanMove().Equals(false)) //if (StoreManager.Store.InOutAxisCanMove().Equals(false))
{ //{
MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning); // MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return; // return;
} //}
int speed = FormUtil.GetIntValue(txtInOutSpeed); int speed = FormUtil.GetIntValue(txtInOutSpeed);
if (speed <= 0) if (speed <= 0)
{ {
...@@ -230,11 +230,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -230,11 +230,11 @@ namespace OnlineStore.AutoInOutStore
{ {
if (btnInOutMovej.BackColor.Equals(System.Drawing.SystemColors.Control)) if (btnInOutMovej.BackColor.Equals(System.Drawing.SystemColors.Control))
{ {
if (StoreManager.Store.InOutAxisCanMove().Equals(false)) //if (StoreManager.Store.InOutAxisCanMove().Equals(false))
{ //{
MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning); // MessageBox.Show(FrmStoreBox.cannotMove, FrmStoreBox.warn, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return; // return;
} //}
int speed = FormUtil.GetIntValue(txtInOutSpeed); int speed = FormUtil.GetIntValue(txtInOutSpeed);
if (speed <= 0) if (speed <= 0)
{ {
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -371,7 +371,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -371,7 +371,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + "开始复位：先定位气缸下降"); LogUtil.info(LOGGER, StoreName + "开始复位：先定位气缸下降");
// 复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴 // 复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_LocationCylinderBack); StoreMove.NextMoveStep(StoreMoveStep.BOX_H_LocationCylinderBack);
LocationDownAndWait(); //LocationDownAndWait();
} }
AutomaticBaiting.StartReset(); AutomaticBaiting.StartReset();
isInPro = false; isInPro = false;
......
source/DeviceLibrary/store/AC_Store.cs
...@@ -191,9 +191,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -191,9 +191,9 @@ namespace OnlineStore.DeviceLibrary
case StoreStatus.InStoreExecute: case StoreStatus.InStoreExecute:
aa = ResourceControl.GetString(ResourceControl.InStoreExecute, "入库执行中"); aa = ResourceControl.GetString(ResourceControl.InStoreExecute, "入库执行中");
break; break;
case StoreStatus.InTrouble: //case StoreStatus.InTrouble:
aa = ResourceControl.GetString(ResourceControl.InTrouble, "故障中"); // aa = ResourceControl.GetString(ResourceControl.InTrouble, "故障中");
break; // break;
case StoreStatus.OutStoreBoxEnd: case StoreStatus.OutStoreBoxEnd:
aa = ResourceControl.GetString(ResourceControl.OutStoreBoxEnd, "料盘出仓位完成"); aa = ResourceControl.GetString(ResourceControl.OutStoreBoxEnd, "料盘出仓位完成");
break; break;
......
source/DeviceLibrary/store/StoreMoveStep.cs
...@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 3=故障中 /// 3=故障中
/// </summary> /// </summary>
InTrouble = 3, //InTrouble = 3,
/// <summary> /// <summary>
/// 4=警告 /// 4=警告
/// </summary> /// </summary>
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
...@@ -337,22 +337,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -337,22 +337,22 @@ namespace OnlineStore.DeviceLibrary
{ {
return ResourceControl.GetString(ResourceControl.WaitTime, "时间等待：") + "【" + TimeMSeconds + "】"; return ResourceControl.GetString(ResourceControl.WaitTime, "时间等待：") + "【" + TimeMSeconds + "】";
} }
else if (WaitType == (int)Wait_Type.StellMove_4) //else if (WaitType == (int)Wait_Type.StellMove_4)
{ //{
return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 "; // return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
} //}
else if (WaitType == (int)Wait_Type.ShuoKe_5) //else if (WaitType == (int)Wait_Type.ShuoKe_5)
{ //{
return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 "; // return ResourceControl.GetString(ResourceControl.TargetPosition, "电钢目标位置：") + "【" + TargetPosition + "】 ";
} //}
else if (WaitType == (int)Wait_Type.AxisHomeSingle_6) else if (WaitType == (int)Wait_Type.AxisHomeSingle_6)
{ {
return "【" + AxisInfo.DisplayStr + "】ORG：【" + IoValue + "】 "; return "【" + AxisInfo.DisplayStr + "】ORG：【" + IoValue + "】 ";
} }
else if (WaitType == (int)Wait_Type.WaitHeight_7) //else if (WaitType == (int)Wait_Type.WaitHeight_7)
{ //{
return ResourceControl.GetString(ResourceControl.trayHeight, "料盘高度") + "【" + HeightValue + "】 "; // return ResourceControl.GetString(ResourceControl.trayHeight, "料盘高度") + "【" + HeightValue + "】 ";
} //}
else if (WaitType == (int)Wait_Type.AxisLimitNegativeSingle_8) else if (WaitType == (int)Wait_Type.AxisLimitNegativeSingle_8)
{ {
return "【" + AxisInfo.DisplayStr + "】" + ResourceControl.GetString(ResourceControl.FuLimit, "负限位") + "【" + IoValue + "】 "; return "【" + AxisInfo.DisplayStr + "】" + ResourceControl.GetString(ResourceControl.FuLimit, "负限位") + "【" + IoValue + "】 ";
......
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
...@@ -988,7 +988,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -988,7 +988,7 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList.Add(IO_Type.BatchDoor_Open); MustHaveDIList.Add(IO_Type.BatchDoor_Open);
MustHaveDIList.Add(IO_Type.BatchDoor_Close); MustHaveDIList.Add(IO_Type.BatchDoor_Close);
MustHaveDIList.Add(IO_Type.TrayCheck_Fixture); MustHaveDIList.Add(IO_Type.TrayCheck_Fixture);
MustHaveDIList.Add(IO_Type.CompressAxis_Check); //MustHaveDIList.Add(IO_Type.CompressAxis_Check);
MustHaveDIList.Add(IO_Type.DoorClose_LoadMaterial); MustHaveDIList.Add(IO_Type.DoorClose_LoadMaterial);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!