Skip to content

李娜 / SO908-XLRStore

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

Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

2 个父辈 e020cdda 02967b37
内嵌 并排
正在显示 5 个修改的文件 包含 44 行增加 和 43 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs
...@@ -95,7 +95,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -95,7 +95,7 @@ namespace OnlineStore.DeviceLibrary
CodeMsg = ""; CodeMsg = "";
//WarnMsg = ""; //WarnMsg = "";
//状态 //状态
boxStatus.status = (int)runStatus; boxStatus.status = (int)deviceStatus;
if (IsDebug) if (IsDebug)
{ {
boxStatus.status = (int)DeviceStatus.Debugging; boxStatus.status = (int)DeviceStatus.Debugging;
...@@ -154,7 +154,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -154,7 +154,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))
{ {
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
...@@ -51,6 +51,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -51,6 +51,7 @@ namespace OnlineStore.DeviceLibrary
/// <returns></returns> /// <returns></returns>
private bool PreInStoreCheck(InOutParam param) private bool PreInStoreCheck(InOutParam param)
{ {
if (!AutoInout.autoNext && !InDoorCheck(param)) if (!AutoInout.autoNext && !InDoorCheck(param))
{ {
SetWarnMsg(Name + $" 启动入库出错，入口料盘无入库信息[barcode={param.PosInfo.barcode},PosSide={param.PosInfo.GetPosSide()}], 任务取消"); SetWarnMsg(Name + $" 启动入库出错，入口料盘无入库信息[barcode={param.PosInfo.barcode},PosSide={param.PosInfo.GetPosSide()}], 任务取消");
...@@ -199,7 +200,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -199,7 +200,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.SI_06_InOutBackFromBuff); MoveInfo.NextMoveStep(StepEnum.SI_06_InOutBackFromBuff);
LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到料屉库位取放料点P3[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到料屉库位取放料点P3[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
//清空暂存区料盘信息 //清空暂存区料盘信息
// ClearInDoorBuffer(); ClearInDoorBuffer();
XAxis_To_P3(); XAxis_To_P3();
break; break;
case StepEnum.SI_06_InOutBackFromBuff: case StepEnum.SI_06_InOutBackFromBuff:
...@@ -207,16 +208,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -207,16 +208,16 @@ namespace OnlineStore.DeviceLibrary
//存储当前料叉信息 //存储当前料叉信息
if (MoveInfo.MoveParam.PosInfoBack == null) if (MoveInfo.MoveParam.PosInfoBack == null)
{ {
//if(CheckOtherSideIsThereReel(out InOutPosInfo inOutPosInfo)) if (CheckOtherSideIsThereReel(out InOutPosInfo inOutPosInfo))
//{ {
// MoveInfo.NextMoveStep(StepEnum.SI_01_PullAxis_Ready); MoveInfo.NextMoveStep(StepEnum.SI_01_PullAxis_Ready);
// LogInfo($"入库 {MoveInfo.SLog}：取另一面暂存区的料[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：取另一面暂存区的料[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
// MoveInfo.MoveParam.PosInfoBack = MoveInfo.MoveParam.PosInfo.ToCopy(); MoveInfo.MoveParam.PosInfoBack = MoveInfo.MoveParam.PosInfo.ToCopy();
// MoveInfo.MoveParam.PosInfo = inOutPosInfo; MoveInfo.MoveParam.PosInfo = inOutPosInfo;
// MoveInfo.MoveParam.MoveP = new LineMoveP(Config, inOutPosInfo.PosId); MoveInfo.MoveParam.MoveP = new LineMoveP(Config, inOutPosInfo.PosId);
//} }
//else else
{ {
MoveInfo.NextMoveStep(StepEnum.SI_07_MiddleToP3); MoveInfo.NextMoveStep(StepEnum.SI_07_MiddleToP3);
MiddleAxis_To_P3(); MiddleAxis_To_P3();
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
...@@ -189,11 +189,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -189,11 +189,11 @@ namespace OnlineStore.DeviceLibrary
MoveAxisToP2(); MoveAxisToP2();
break; break;
case StepEnum.SO_15_ToBufferArea: case StepEnum.SO_15_ToBufferArea:
//if (!OutDoorCheck(MoveInfo.MoveParam)) if (!OutDoorCheck(MoveInfo.MoveParam))
//{ {
// SetWarnMsg($"出库 {MoveInfo.SLog}：出料口有其他料盘，无法放置该料盘[barcode={MoveInfo.MoveParam.PosInfo.barcode},PosSide={MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); SetWarnMsg($"出库 {MoveInfo.SLog}：出料口有其他料盘，无法放置该料盘[barcode={MoveInfo.MoveParam.PosInfo.barcode},PosSide={MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
//} }
//else else
{ {
MoveInfo.NextMoveStep(StepEnum.SO_16_VerifyBufferState); MoveInfo.NextMoveStep(StepEnum.SO_16_VerifyBufferState);
LogInfo($"出库 {MoveInfo.SLog}：出料口无料盘确认，开始放料[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"出库 {MoveInfo.SLog}：出料口无料盘确认，开始放料[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
...@@ -402,7 +402,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -402,7 +402,7 @@ namespace OnlineStore.DeviceLibrary
side = "BB"; side = "BB";
atBside = true; atBside = true;
col = i; col = i;
PosId = $"05{side}{row.ToString().PadLeft(2,'0')}{col.ToString().PadLeft(2,'0')}0101"; PosId = $"05{side}{row.ToString().PadLeft(2, '0')}{col.ToString().PadLeft(2, '0')}0101";
return true; return true;
} }
} }
...@@ -482,11 +482,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -482,11 +482,9 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
/// <summary> /// <summary>
/// 设置料仓状态 /// 设置料仓状态
///1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///2=急停，3=故障，4=警告，5=调试
/// 6=入库执行中,7=入仓完成，8=入仓失败
/// 9=出库执行，10=出仓完成，11=出库失败
/// </summary> /// </summary>
/// <param name="deviceStatus">设备上报服务端的状态</param>
/// <param name="runStatus">设备显示的状态</param>
private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus) private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus)
{ {
this.deviceStatus = deviceStatus; this.deviceStatus = deviceStatus;
...@@ -582,10 +580,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -582,10 +580,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " 启动入库出错，忙碌或报警中 ，storeStatus=" + runStatus + ",MoveType=" + MoveInfo.MoveType + ",isInSuddenDown=" + isInSuddenDown + ",isNoAirpressure_Check=" + isNoAirpressure_Check); LogUtil.error(Name + " 启动入库出错，忙碌或报警中 ，storeStatus=" + runStatus + ",MoveType=" + MoveInfo.MoveType + ",isInSuddenDown=" + isInSuddenDown + ",isNoAirpressure_Check=" + isNoAirpressure_Check);
return false; return false;
} }
//if (!PreInStoreCheck(param)) if (!PreInStoreCheck(param))
//{ {
// return false; return false;
//} }
startInStoreTime = DateTime.Now; startInStoreTime = DateTime.Now;
LogInfo(" 启动入库【" + param.PosInfo.ToStr() + "】 "); LogInfo(" 启动入库【" + param.PosInfo.ToStr() + "】 ");
param.MoveP = new LineMoveP(Config, param.PosInfo.PosId); param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
...@@ -599,25 +597,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -599,25 +597,24 @@ namespace OnlineStore.DeviceLibrary
private bool InDoorCheck(InOutParam param) private bool InDoorCheck(InOutParam param)
{ {
return true;
if (param.PosInfo == null) if (param.PosInfo == null)
return false; return false;
//if (CheckASide(param)) if (CheckASide(param))
//{ {
// if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.HIGH) && param.PosInfo != null) if (IOValue(IO_Type.UpperArea_Check_A).Equals(IO_VALUE.HIGH) && param.PosInfo != null)
// { {
// return true; return true;
// } }
//} }
//else else
//{ {
// if (IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.HIGH) && param.PosInfo != null) if (IOValue(IO_Type.UpperArea_Check_B).Equals(IO_VALUE.HIGH) && param.PosInfo != null)
// { {
// return true; return true;
// } }
//} }
//return false; return false;
} }
protected override void InstoreProcess() protected override void InstoreProcess()
...@@ -642,6 +639,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -642,6 +639,8 @@ namespace OnlineStore.DeviceLibrary
/// <returns></returns> /// <returns></returns>
private bool OutDoorCheck(InOutParam param) private bool OutDoorCheck(InOutParam param)
{ {
if (param.PosInfo == null)
return false;
if (param.PosInfo.GetPosSide().Equals("A"))//A面 if (param.PosInfo.GetPosSide().Equals("A"))//A面
{ {
if (CheckAOutDoor()) if (CheckAOutDoor())
...@@ -687,7 +686,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -687,7 +686,7 @@ namespace OnlineStore.DeviceLibrary
public void StartExecuctOut(InOutParam param) public void StartExecuctOut(InOutParam param)
{ {
bool result = false; bool result = false;
//if (OutDoorCheck(param)) if (OutDoorCheck(param))
{ {
result = StartOutstore(param); result = StartOutstore(param);
} }
......
source/XLRStoreClient/boxForm/FrmAxisMove.cs
...@@ -159,6 +159,7 @@ namespace OnlineStore.XLRStore ...@@ -159,6 +159,7 @@ namespace OnlineStore.XLRStore
MessageBox.Show("行走机构不在安全位置，无法移动升降轴，请先将行走机构退回待机位(" + StoreManager.XLRStore.boxEquip.Config.MoveAxis_P1 + ")", "警告（行走机构在安全位置时，才能移动移栽升降轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); MessageBox.Show("行走机构不在安全位置，无法移动升降轴，请先将行走机构退回待机位(" + StoreManager.XLRStore.boxEquip.Config.MoveAxis_P1 + ")", "警告（行走机构在安全位置时，才能移动移栽升降轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return false; return false;
} }
} }
private void AxisABSMove(AxisBean moveAxis, TextBox txtValue, int targetSpeed) private void AxisABSMove(AxisBean moveAxis, TextBox txtValue, int targetSpeed)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!