Skip to content

张东亮 / SO1057-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8e40f615 由 张东亮
选项

紧急出库到紧急箱子

1 个父辈 cb317e8b
内嵌 并排
正在显示 15 个修改的文件 包含 645 行增加 和 330 行删除
source/DeviceLibrary/Config/Config_InputEquip.csv
...@@ -48,6 +48,8 @@ PRO,0,取料升降轴_A上暂存区13寸放料低点,Updown_P14_AUpperL13,65798, ...@@ -48,6 +48,8 @@ PRO,0,取料升降轴_A上暂存区13寸放料低点,Updown_P14_AUpperL13,65798,
PRO,0,取料升降轴_A下暂存区13寸取料低点,Updown_P15_AUnderL13,368000,,,,,,,,,,,, PRO,0,取料升降轴_A下暂存区13寸取料低点,Updown_P15_AUnderL13,368000,,,,,,,,,,,,
PRO,0,取料升降轴_B上暂存区13寸放料低点,Updown_P16_BUpperL13,65798,,,,,,,,,,,, PRO,0,取料升降轴_B上暂存区13寸放料低点,Updown_P16_BUpperL13,65798,,,,,,,,,,,,
PRO,0,取料升降轴_B下暂存区13寸取料低点,Updown_P17_BUnderL13,370000,,,,,,,,,,,, PRO,0,取料升降轴_B下暂存区13寸取料低点,Updown_P17_BUnderL13,370000,,,,,,,,,,,,
PRO,0,取料升降轴_紧急料区放料高点,Updown_P18_NGH,310000,,,,,,,,,,,,
PRO,0,取料升降轴_紧急料区放料低点,Updown_P19_NGL,310000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,取料升降轴_P1速度,Updown_P1_Speed,45000,,,,,,,,,,,, PRO,0,取料升降轴_P1速度,Updown_P1_Speed,45000,,,,,,,,,,,,
PRO,1,取料升降轴_P2速度,Updown_P2_Speed,45000,,,,,,,,,,,, PRO,1,取料升降轴_P2速度,Updown_P2_Speed,45000,,,,,,,,,,,,
...@@ -66,6 +68,8 @@ PRO,13,取料升降轴_P14速度,Updown_P14_Speed,45000,,,,,,,,,,,, ...@@ -66,6 +68,8 @@ PRO,13,取料升降轴_P14速度,Updown_P14_Speed,45000,,,,,,,,,,,,
PRO,14,取料升降轴_P15速度,Updown_P15_Speed,45000,,,,,,,,,,,, PRO,14,取料升降轴_P15速度,Updown_P15_Speed,45000,,,,,,,,,,,,
PRO,15,取料升降轴_P16速度,Updown_P16_Speed,45000,,,,,,,,,,,, PRO,15,取料升降轴_P16速度,Updown_P16_Speed,45000,,,,,,,,,,,,
PRO,16,取料升降轴_P17速度,Updown_P17_Speed,45000,,,,,,,,,,,, PRO,16,取料升降轴_P17速度,Updown_P17_Speed,45000,,,,,,,,,,,,
PRO,17,取料升降轴_P18速度,Updown_P18_Speed,45000,,,,,,,,,,,,
PRO,18,取料升降轴_P19速度,Updown_P19_Speed,45000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,取料旋转轴_待机点,Middle_P1,126912,,,,,,,,,,,, PRO,0,取料旋转轴_待机点,Middle_P1,126912,,,,,,,,,,,,
PRO,0,取料旋转轴_A料口取料点,Middle_P2_ATake,161600,,,,,,,,,,,, PRO,0,取料旋转轴_A料口取料点,Middle_P2_ATake,161600,,,,,,,,,,,,
...@@ -75,6 +79,7 @@ PRO,0,取料旋转轴_B上暂存区放料点,Middle_P5_BUpper,107,,,,,,,,,,,, ...@@ -75,6 +79,7 @@ PRO,0,取料旋转轴_B上暂存区放料点,Middle_P5_BUpper,107,,,,,,,,,,,,
PRO,0,取料旋转轴_NG料区放料点,Middle_P6_NG,214355,,,,,,,,,,,, PRO,0,取料旋转轴_NG料区放料点,Middle_P6_NG,214355,,,,,,,,,,,,
PRO,0,取料旋转轴_A下暂存区取料点,Middle_P7_AUnder,250330,,,,,,,,,,,, PRO,0,取料旋转轴_A下暂存区取料点,Middle_P7_AUnder,250330,,,,,,,,,,,,
PRO,0,取料旋转轴_B下暂存区取料点,Middle_P8_BUnder,107,,,,,,,,,,,, PRO,0,取料旋转轴_B下暂存区取料点,Middle_P8_BUnder,107,,,,,,,,,,,,
PRO,0,取料旋转轴_紧急料区放料点,Middle_P9_NG,214355,,,,,,,,,,,,
PRO,0,取料旋转轴_P1速度,Middle_P1_Speed,100000,,,,,,,,,,,, PRO,0,取料旋转轴_P1速度,Middle_P1_Speed,100000,,,,,,,,,,,,
PRO,1,取料旋转轴_P2速度,Middle_P2_Speed,100000,,,,,,,,,,,, PRO,1,取料旋转轴_P2速度,Middle_P2_Speed,100000,,,,,,,,,,,,
PRO,2,取料旋转轴_P3速度,Middle_P3_Speed,100000,,,,,,,,,,,, PRO,2,取料旋转轴_P3速度,Middle_P3_Speed,100000,,,,,,,,,,,,
...@@ -83,6 +88,7 @@ PRO,4,取料旋转轴_P5速度,Middle_P5_Speed,100000,,,,,,,,,,,, ...@@ -83,6 +88,7 @@ PRO,4,取料旋转轴_P5速度,Middle_P5_Speed,100000,,,,,,,,,,,,
PRO,5,取料旋转轴_P6速度,Middle_P6_Speed,100000,,,,,,,,,,,, PRO,5,取料旋转轴_P6速度,Middle_P6_Speed,100000,,,,,,,,,,,,
PRO,6,取料旋转轴_P7速度,Middle_P7_Speed,100000,,,,,,,,,,,, PRO,6,取料旋转轴_P7速度,Middle_P7_Speed,100000,,,,,,,,,,,,
PRO,7,取料旋转轴_P8速度,Middle_P8_Speed,100000,,,,,,,,,,,, PRO,7,取料旋转轴_P8速度,Middle_P8_Speed,100000,,,,,,,,,,,,
PRO,8,取料旋转轴_P9速度,Middle_P9_Speed,100000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,取料旋转轴_反向间隙补偿值,MiddleAxis_Reverse_Offset,300,,,,,,,,,,,, PRO,0,取料旋转轴_反向间隙补偿值,MiddleAxis_Reverse_Offset,300,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
...@@ -92,9 +98,11 @@ PRO,0,取料进出轴_B缓存区点,Inout_P3,126912,,,,,,,,,,,, ...@@ -92,9 +98,11 @@ PRO,0,取料进出轴_B缓存区点,Inout_P3,126912,,,,,,,,,,,,
PRO,0,取料进出轴_A上料区点,Inout_P4,126912,,,,,,,,,,,, PRO,0,取料进出轴_A上料区点,Inout_P4,126912,,,,,,,,,,,,
PRO,0,取料进出轴_B上料区点,Inout_P5,126912,,,,,,,,,,,, PRO,0,取料进出轴_B上料区点,Inout_P5,126912,,,,,,,,,,,,
PRO,0,取料进出轴_NG区点,Inout_P6,126912,,,,,,,,,,,, PRO,0,取料进出轴_NG区点,Inout_P6,126912,,,,,,,,,,,,
PRO,0,取料进出轴_紧急料区点,Inout_P7,126912,,,,,,,,,,,,
PRO,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,, PRO,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,,
PRO,1,取料进出轴_P2速度,Inout_P2_Speed,100000,,,,,,,,,,,, PRO,1,取料进出轴_P2速度,Inout_P2_Speed,100000,,,,,,,,,,,,
PRO,2,取料进出轴_P3速度,Inout_P3_Speed,100000,,,,,,,,,,,, PRO,2,取料进出轴_P3速度,Inout_P3_Speed,100000,,,,,,,,,,,,
PRO,3,取料进出轴_P4速度,Inout_P4_Speed,100000,,,,,,,,,,,, PRO,3,取料进出轴_P4速度,Inout_P4_Speed,100000,,,,,,,,,,,,
PRO,4,取料进出轴_P5速度,Inout_P5_Speed,100000,,,,,,,,,,,, PRO,4,取料进出轴_P5速度,Inout_P5_Speed,100000,,,,,,,,,,,,
PRO,5,取料进出轴_P6速度,Inout_P6_Speed,100000,,,,,,,,,,,,
\ No newline at end of file \ No newline at end of file
PRO,5,取料进出轴_P6速度,Inout_P6_Speed,100000,,,,,,,,,,,,
PRO,6,取料进出轴_P7速度,Inout_P7_Speed,100000,,,,,,,,,,,,
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
...@@ -165,8 +165,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -165,8 +165,8 @@ namespace OnlineStore.DeviceLibrary
} }
} }
}); });
//最多等待60秒 //最多等待15秒
bool taskResult = eyemtask.Wait(60000); bool taskResult = eyemtask.Wait(15000);
if (!taskResult) if (!taskResult)
{ {
LogUtil.error(deviceName + " 【" + cameraName + "】eyem扫码超时"); LogUtil.error(deviceName + " 【" + cameraName + "】eyem扫码超时");
......
source/DeviceLibrary/manager/model/DeviceStep.cs
...@@ -1140,6 +1140,37 @@ namespace OnlineStore.DeviceLibrary ...@@ -1140,6 +1140,37 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 出库->紧急箱
/// <summary>
/// 出库->紧急箱：取料旋转轴SVD13 运动到P6（NG料区放料点）
/// </summary>
I035_MiddleToUrgentBox,
/// <summary>
/// 出库->紧急箱：取料进出轴SVD12 运动到P6（NG料区放料点）
/// </summary>
I036_InoutToP7,
/// <summary>
/// 出库->紧急箱：取料升降轴SVD12 运动到P9（NG料区放料低点）
/// </summary>
I037_UpdownToP19,
/// <summary>
/// 出库->紧急箱：电卡爪放松
/// </summary>
I038_ClampRelax,
/// <summary>
/// 出库->紧急箱：取料升降轴SVD12 运动到P8（NG料区放料高点）
/// </summary>
I039_UpdownToP18,
/// <summary>
/// 出库->紧急箱：取料进出轴SVD 运动到P1（待机点）
/// </summary>
I040_1_InoutToP1,
/// <summary>
/// 出库->紧急箱：取料旋转轴SVD13 运动到P1（待机点）
/// </summary>
I041_MiddleToP1,
#endregion
#endregion #endregion
#region 料串批量轴复位 1500 开始 #region 料串批量轴复位 1500 开始
......
source/DeviceLibrary/manager/model/InOutParam.cs
...@@ -133,7 +133,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -133,7 +133,7 @@ namespace OnlineStore.DeviceLibrary
public bool singleOut = false; public bool singleOut = false;
public string ToStr() public string ToStr()
{ {
return " [" + barcode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "]，urgentReel [" + urgentReel return " [" + barcode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "]"+ $",hSerial[{hSerial}]" + "，urgentReel [" + urgentReel
+ "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "],singleOut[" + singleOut + "]"; + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "],singleOut[" + singleOut + "]";
} }
......
source/DeviceLibrary/storeBean/XLRStoreBean.cs
...@@ -60,8 +60,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -60,8 +60,13 @@ namespace OnlineStore.DeviceLibrary
HCBoardManager.InitConfig(); HCBoardManager.InitConfig();
IOManager.Init(); IOManager.Init();
AxisManager.Init(); AxisManager.Init();
AxisManager.instance.OpenCard(); bool rtn = AxisManager.instance.OpenCard();
//if (!rtn)
//{
// rtn = AxisManager.instance.CloseCard();
// if (rtn)
// AxisManager.instance.OpenCard();
//}
//初始化摄像机配置 //初始化摄像机配置
CodeManager.LoadConfig(); CodeManager.LoadConfig();
...@@ -73,7 +78,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -73,7 +78,7 @@ namespace OnlineStore.DeviceLibrary
canStart = true; canStart = true;
AgvClient.Init(); AgvClient.Init();
} }
#endregion #endregion
public string CanStart() public string CanStart()
...@@ -148,7 +153,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -148,7 +153,7 @@ namespace OnlineStore.DeviceLibrary
public override bool Reset() public override bool Reset()
{ {
bool isNeedAllReset = false; bool isNeedAllReset = false;
if (isInSuddenDown || isNoAirpressure_Check) if (isInSuddenDown || isNoAirpressure_Check)
{ {
...@@ -158,7 +163,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -158,7 +163,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if ((runStatus == RunStatus.HomeMoving || runStatus == RunStatus.Reset) && NoAlarm()) else if ((runStatus == RunStatus.HomeMoving || runStatus == RunStatus.Reset) && NoAlarm())
{ {
LogUtil.error(Name + "收到复位信号，已经在复位或原点返回中，且当前无报警，不处理复位"); LogUtil.error(Name + "收到复位信号，已经在复位或原点返回中，且当前无报警，不处理复位");
return false; return false;
} }
...@@ -169,7 +174,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -169,7 +174,7 @@ namespace OnlineStore.DeviceLibrary
//重置通用处理 //重置通用处理
mainTimer.Interval = 1000; mainTimer.Interval = 1000;
// maxSeconds = 10; // maxSeconds = 10;
alarmType = AlarmType.None; alarmType = AlarmType.None;
mainTimer.Enabled = false; mainTimer.Enabled = false;
isInSuddenDown = false; isInSuddenDown = false;
...@@ -234,7 +239,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -234,7 +239,7 @@ namespace OnlineStore.DeviceLibrary
isOk = false; isOk = false;
break; break;
} }
} }
} }
...@@ -254,7 +259,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -254,7 +259,7 @@ namespace OnlineStore.DeviceLibrary
Alarm(AlarmType.IoSingleTimeOut); Alarm(AlarmType.IoSingleTimeOut);
} }
} }
} }
#endregion #endregion
private bool busyPro = false; private bool busyPro = false;
...@@ -297,7 +302,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -297,7 +302,7 @@ namespace OnlineStore.DeviceLibrary
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(Name + "LineTimerPro 出错：", ex); LogUtil.error(Name + "LineTimerPro 出错：", ex);
} }
busyPro = false; busyPro = false;
} }
catch (Exception ex) catch (Exception ex)
...@@ -306,7 +311,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -306,7 +311,7 @@ namespace OnlineStore.DeviceLibrary
} }
Thread.Sleep(1); Thread.Sleep(1);
} }
#region 停止运动 #region 停止运动
...@@ -408,7 +413,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -408,7 +413,7 @@ namespace OnlineStore.DeviceLibrary
ConfigIO io = baseConfig.getWaitIO(wait.IoType); ConfigIO io = baseConfig.getWaitIO(wait.IoType);
WarnMsg = Name + "[" + checkWaitInfo.MoveStep + "]等待" + NotOkMsg + " 超时"; WarnMsg = Name + "[" + checkWaitInfo.MoveStep + "]等待" + NotOkMsg + " 超时";
Alarm(AlarmType.IoSingleTimeOut); Alarm(AlarmType.IoSingleTimeOut);
LogUtil.error( WarnMsg, checkWaitInfo.ErrorLogType); LogUtil.error(WarnMsg, checkWaitInfo.ErrorLogType);
} }
//超过报警时长 //超过报警时长
else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < StoreManager.Config.IOSingle_TimerOut * 2) else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < StoreManager.Config.IOSingle_TimerOut * 2)
...@@ -481,8 +486,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -481,8 +486,8 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 忙碌处理 #region 忙碌处理
public override bool StartInstore(InOutParam param) public override bool StartInstore(InOutParam param)
{ {
return true; return true;
...@@ -533,6 +538,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -533,6 +538,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
} }
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
...@@ -456,6 +456,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -456,6 +456,8 @@ namespace OnlineStore.DeviceLibrary
if (!rtn) if (!rtn)
{ {
InOutParam inOut = new InOutParam(MoveInfo.MoveParam.PosInfo.ToCopy()); InOutParam inOut = new InOutParam(MoveInfo.MoveParam.PosInfo.ToCopy());
inOut.PosInfo.IsNG = true;
inOut.PosInfo.NgMsg = "验证入库完成失败";
LogInfo($"入库 {MoveInfo.SLog}：验证入库完成失败，将该库位出库[{inOut.PosInfo.ToStr()}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：验证入库完成失败，将该库位出库[{inOut.PosInfo.ToStr()}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
// if (CheckASide()) // if (CheckASide())
{ {
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs
using Asa; using Asa;
using HalconDotNet;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
...@@ -577,7 +578,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -577,7 +578,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LastHeight = (int)height; LastHeight = (int)height;
} }
else if(height>=27) else if (height >= 27)
{ {
LastHeight = 28; LastHeight = 28;
buchongStr = ">=27，<=小于32"; buchongStr = ">=27，<=小于32";
...@@ -655,7 +656,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -655,7 +656,13 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (SServerManager.GetOutTaskCount(MoveInfo.MoveParam.PosInfo.hSerial) == 0) if (string.IsNullOrEmpty(MoveInfo.MoveParam.PosInfo.hSerial))
{
doorInfo.status = doorStatusE.outStore;
MoveInfo.NextMoveStep(StepEnum.IS11_ShelfReady);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
else if (SServerManager.GetOutTaskCount(MoveInfo.MoveParam.PosInfo.hSerial) == 0)
{ {
SendOutShelfLeave("检测到工单已结束:" + MoveInfo.MoveParam.PosInfo.hSerial); SendOutShelfLeave("检测到工单已结束:" + MoveInfo.MoveParam.PosInfo.hSerial);
} }
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
...@@ -473,10 +473,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -473,10 +473,15 @@ namespace OnlineStore.DeviceLibrary
IOTimeOutProcess(); IOTimeOutProcess();
//判断流水线打开了才可以运行 //判断流水线打开了才可以运行
List<BatchMoveBean> BatchMoveList = new List<BatchMoveBean>() { BatchMove_A, BatchMove_B }; List<BatchMoveBean> BatchMoveList = new List<BatchMoveBean>() { BatchMove_A, BatchMove_B };
foreach (BatchMoveBean moveBean in BatchMoveList)
{
//LogUtil.debug($"{moveBean.Name} 处理");
moveBean.TimerProcess();
}
if (!MoveStop) if (!MoveStop)
{ {
if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm()) // if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm())
{ {
if (CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, IO_Type.FeedingA_Outstore_UnderArea_ReelCheck, BatchMoveList)) if (CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, IO_Type.FeedingA_Outstore_UnderArea_ReelCheck, BatchMoveList))
{ {
...@@ -502,7 +507,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -502,7 +507,7 @@ namespace OnlineStore.DeviceLibrary
CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, IO_Type.FeedingB_Outstore_UnderArea_ReelCheck, BatchMoveList, true); CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, IO_Type.FeedingB_Outstore_UnderArea_ReelCheck, BatchMoveList, true);
} }
} }
LogUtil.debug($"入料机构出库检查");
} }
if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm()) if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm())
...@@ -520,10 +525,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -520,10 +525,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
foreach (BatchMoveBean moveBean in BatchMoveList)
{
moveBean.TimerProcess();
}
if (NoErrorAlarm()) if (NoErrorAlarm())
{ {
CheckAxisAlarm(); CheckAxisAlarm();
...@@ -534,12 +535,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -534,12 +535,22 @@ namespace OnlineStore.DeviceLibrary
DoorInfo doorinfo = null; DoorInfo doorinfo = null;
if (posInfo != null && ioval.Equals(IO_VALUE.HIGH)) if (posInfo != null && ioval.Equals(IO_VALUE.HIGH))
{ {
if (!posInfo.IsNG && string.IsNullOrEmpty(posInfo.hSerial))
{
InOutParam param = new InOutParam(posInfo.ToCopy());
LogInfo($"{posType} 紧急物料{param.PosInfo.ToStr()}，准备出库到紧急箱");
StartOutstore(param);
return true;
}
foreach (BatchMoveBean moveBean in BatchMoveList) foreach (BatchMoveBean moveBean in BatchMoveList)
{ {
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial; if (moveBean.MoveInfo.MoveType.Equals(MoveType.Reset) || moveBean.MoveInfo.MoveType.Equals(MoveType.RHome))
continue;
LogUtil.debug($"{moveBean.Name} CheckStartOutPos 处理");
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial??"";
if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial) if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial)
{ {
LogInfo($"{posType}当前料串的 hSerial:{curhSerial}，与准备出库到料串 hSerial:{posInfo.hSerial} 不符"); LogInfo($"{posType}当前料串的 hSerial:{curhSerial}，与准备出库的 hSerial:{posInfo.hSerial} 不符");
moveBean.ShelfNeedLeave = true; moveBean.ShelfNeedLeave = true;
} }
else if (moveBean.MoveInfo.MoveType == MoveType.InStore && moveBean.MoveInfo.MoveStep == StepEnum.IS23_WaitAgv) else if (moveBean.MoveInfo.MoveType == MoveType.InStore && moveBean.MoveInfo.MoveStep == StepEnum.IS23_WaitAgv)
...@@ -556,7 +567,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -556,7 +567,7 @@ namespace OnlineStore.DeviceLibrary
StartOutstore(param); StartOutstore(param);
return true; return true;
} }
else if(posInfo.IsNG) else if (posInfo.IsNG)
{ {
InOutParam param = new InOutParam(posInfo.ToCopy()); InOutParam param = new InOutParam(posInfo.ToCopy());
LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到NG箱"); LogInfo($"{posType}物料{param.PosInfo.ToStr()}，准备出库到NG箱");
...@@ -580,12 +591,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -580,12 +591,26 @@ namespace OnlineStore.DeviceLibrary
private bool CheckStartOutPos(string posType, InOutPosInfo posInfo, String ioType, List<BatchMoveBean> BatchMoveList, bool shelfAutoLeave = false) private bool CheckStartOutPos(string posType, InOutPosInfo posInfo, String ioType, List<BatchMoveBean> BatchMoveList, bool shelfAutoLeave = false)
{ {
LogUtil.debug($"CheckStartOutPos 【{posType}】,【{posInfo?.ToStr()}】，【{ioType}】");
DoorInfo doorinfo = null; DoorInfo doorinfo = null;
if (posInfo != null && IOValue(ioType).Equals(IO_VALUE.HIGH)) if (posInfo != null && IOValue(ioType).Equals(IO_VALUE.HIGH))
{ {
LogUtil.debug($"CheckStartOutPos 处理0");
if (!posInfo.IsNG && string.IsNullOrEmpty(posInfo.hSerial))
{
InOutParam param = new InOutParam(posInfo.ToCopy());
LogInfo($"{posType} 紧急物料{param.PosInfo.ToStr()}，准备出库到紧急箱");
StartOutstore(param);
LogUtil.debug($"CheckStartOutPos 处理1");
return true;
}
foreach (BatchMoveBean moveBean in BatchMoveList) foreach (BatchMoveBean moveBean in BatchMoveList)
{ {
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial; LogUtil.debug($"{moveBean.Name} CheckStartOutPos {moveBean.MoveInfo.MoveType}");
if (moveBean.MoveInfo.MoveType.Equals(MoveType.Reset) || moveBean.MoveInfo.MoveType.Equals(MoveType.RHome))
continue;
LogUtil.debug($"{moveBean.Name} CheckStartOutPos 处理");
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial ?? "";
if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial) if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial)
{ {
LogInfo($"{posType}当前料串的 hSerial:{curhSerial}，与准备出库到料串 hSerial:{posInfo.hSerial} 不符"); LogInfo($"{posType}当前料串的 hSerial:{curhSerial}，与准备出库到料串 hSerial:{posInfo.hSerial} 不符");
...@@ -617,6 +642,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -617,6 +642,11 @@ namespace OnlineStore.DeviceLibrary
} }
} }
else
{
LogUtil.debug($"CheckStartOutPos 处理-1");
}
LogUtil.debug($"CheckStartOutPos 处理-2");
return false; return false;
} }
......
source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs
...@@ -10,6 +10,7 @@ using System.Text.RegularExpressions; ...@@ -10,6 +10,7 @@ using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using static System.Windows.Forms.AxHost;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
...@@ -373,10 +374,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -373,10 +374,10 @@ namespace OnlineStore.DeviceLibrary
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 旋转轴 到P4{targetV}"); MoveLog($" 入料->A侧 {MoveInfo.SLog}: 旋转轴 到P4{targetV}");
MiddleAxis.AbsMove(MoveInfo, targetV, Config.Middle_P1_Speed); MiddleAxis.AbsMove(MoveInfo, targetV, Config.Middle_P1_Speed);
} }
else if (MoveInfo.IsTimeOut(20)) //else if (MoveInfo.IsTimeOut())
{ //{
MoveTimeOut(MoveInfo, "等待" + BatchMove_A.Name + "扫码结束"); // MoveTimeOut(MoveInfo, "等待" + BatchMove_A.Name + "扫码结束");
} //}
} }
else if (MoveInfo.IsStep(StepEnum.II47_MiddleToP1)) else if (MoveInfo.IsStep(StepEnum.II47_MiddleToP1))
{ {
...@@ -801,6 +802,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -801,6 +802,23 @@ namespace OnlineStore.DeviceLibrary
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P6_NG, Config.Middle_P6_Speed); MiddleAxis.AbsMove(MoveInfo, Config.Middle_P6_NG, Config.Middle_P6_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8_NGH, Config.Updown_P8_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8_NGH, Config.Updown_P8_Speed);
} }
private void ToUrgentBox()
{
MoveInfo.NextMoveStep(StepEnum.I035_MiddleToUrgentBox);
//清空暂存区
int startp = MoveInfo.MoveParam.PosInfo.GetPosType();
if (startp.Equals(1))
{
BufferDataManager.AOutStoreInfo = null;
}
else
{
BufferDataManager.BOutStoreInfo = null;
}
MoveLog($"出库{MoveInfo.SLog}: 紧急料 升降轴到P18（紧急料区放料高点）{Config.Updown_P18_NGH}，旋转轴到P9（紧急料区放料点）{Config.Middle_P9_NG}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P9_NG, Config.Middle_P9_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P18_NGH, Config.Updown_P18_Speed);
}
private DateTime startOutTime = DateTime.Now; private DateTime startOutTime = DateTime.Now;
public override bool StartOutstore(InOutParam param) public override bool StartOutstore(InOutParam param)
{ {
...@@ -947,6 +965,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -947,6 +965,16 @@ namespace OnlineStore.DeviceLibrary
//判断料盘信号是否消失 //判断料盘信号是否消失
if (IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW))
{ {
if (MoveInfo.MoveParam.PosInfo.IsNG)
{
ToNG();
return;
}
else if(string.IsNullOrEmpty(MoveInfo.MoveParam.PosInfo.hSerial))
{
ToUrgentBox();
return;
}
if (!MiddleToShelf()) if (!MiddleToShelf())
{ {
MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady); MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady);
...@@ -962,6 +990,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -962,6 +990,16 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.IO07_WaitReelCheckLow)) else if (MoveInfo.IsStep(StepEnum.IO07_WaitReelCheckLow))
{ {
if (MoveInfo.MoveParam.PosInfo.IsNG)
{
ToNG();
return;
}
else if (string.IsNullOrEmpty(MoveInfo.MoveParam.PosInfo.hSerial))
{
ToUrgentBox();
return;
}
if (!MiddleToShelf()) if (!MiddleToShelf())
{ {
MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady); MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady);
...@@ -1030,6 +1068,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -1030,6 +1068,11 @@ namespace OnlineStore.DeviceLibrary
ToNG(); ToNG();
return; return;
} }
else if (string.IsNullOrEmpty(MoveInfo.MoveParam.PosInfo.hSerial))
{
ToUrgentBox();
return;
}
if (!MiddleToShelf()) if (!MiddleToShelf())
{ {
MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady); MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady);
...@@ -1050,6 +1093,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -1050,6 +1093,11 @@ namespace OnlineStore.DeviceLibrary
ToNG(); ToNG();
return; return;
} }
else if (string.IsNullOrEmpty(MoveInfo.MoveParam.PosInfo.hSerial))
{
ToUrgentBox();
return;
}
if (!MiddleToShelf()) if (!MiddleToShelf())
{ {
MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady); MoveInfo.NextMoveStep(StepEnum.IO21_WaitShelfReady);
...@@ -1202,6 +1250,65 @@ namespace OnlineStore.DeviceLibrary ...@@ -1202,6 +1250,65 @@ namespace OnlineStore.DeviceLibrary
runStatus = RunStatus.Runing; runStatus = RunStatus.Runing;
} }
#endregion #endregion
#region 出库->紧急箱
else if (MoveInfo.IsStep(StepEnum.I035_MiddleToUrgentBox))
{
MoveInfo.NextMoveStep(StepEnum.I036_InoutToP7);
MoveLog($" 出料->紧急箱 {MoveInfo.SLog}: 进出轴到P7（紧急料区放料点）{Config.Inout_P7}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P7, Config.Inout_P7_Speed);
}
else if (MoveInfo.IsStep(StepEnum.I036_InoutToP7))
{
TrayHasLeave();
MoveInfo.NextMoveStep(StepEnum.I037_UpdownToP19);
MoveLog($" 出料->紧急箱 {MoveInfo.SLog}: 升降轴到P19（紧急料区放料低点）{Config.Updown_P19_NGL}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P19_NGL, Config.Updown_P19_Speed);
}
else if (MoveInfo.IsStep(StepEnum.I037_UpdownToP19))
{
MoveInfo.NextMoveStep(StepEnum.I038_ClampRelax);
MoveLog($" 出料->紧急箱 {MoveInfo.SLog}: 夹爪放松");
ClampRelax(MoveInfo, MoveInfo.MoveParam.PosInfo.barcode);
}
else if (MoveInfo.IsStep(StepEnum.I038_ClampRelax))
{
if (!StoreManager.XLRStore.boxEquip.SendStoreState(MoveInfo.MoveParam.PosInfo.PosId, MoveInfo.MoveParam.PosInfo.barcode, DeviceStatus.OutStoreEnd))
return;
MoveInfo.NextMoveStep(StepEnum.I039_UpdownToP18);
MoveLog($" 出料->紧急箱 {MoveInfo.SLog}: 升降轴到P18（紧急料区放料高点）{Config.Updown_P18_NGH}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P18_NGH, Config.Updown_P18_Speed);
}
else if (MoveInfo.IsStep(StepEnum.I039_UpdownToP18))
{
MoveInfo.NextMoveStep(StepEnum.I040_1_InoutToP1);
MoveLog($" 出料->紧急箱 {MoveInfo.SLog}: 进出轴到P1（待机点）{Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
else if (MoveInfo.IsStep(StepEnum.I040_1_InoutToP1))
{
if (shelf.Equals(1))
{
MoveLog($" 出料->紧急箱放料结束");
MoveInfo.EndMove();
runStatus = RunStatus.Runing;
}
else
{
//旋转轴暂不回待机点
MoveInfo.NextMoveStep(StepEnum.I041_MiddleToP1);
MoveLog($" 出料->紧急箱 {MoveInfo.SLog}: 旋转轴 到P1(待机点){Config.Middle_P1}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P1, Config.Middle_P1_Speed);
}
}
else if (MoveInfo.IsStep(StepEnum.I041_MiddleToP1))
{
TimeSpan span = DateTime.Now - startInTime;
MoveLog($" 出料->紧急箱放料结束，耗时【{FormUtil.GetSpanStr(span)}】");
MoveInfo.EndMove();
runStatus = RunStatus.Runing;
}
#endregion
} }
private bool MiddleToShelf() private bool MiddleToShelf()
{ {
......
source/LoadCVSLibrary/storeConfig/config/InputEquip_Config.cs
...@@ -221,6 +221,16 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -221,6 +221,16 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P17_BUnderL13")] [ConfigProAttribute("Updown_P17_BUnderL13")]
public int Updown_P17_BUnderL13 { get; set; } public int Updown_P17_BUnderL13 { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_紧急料区放料高点,Updown_P18_NGH,310000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P18_NGH")]
public int Updown_P18_NGH { get; set; }
/// <summary>
/// PRO,0,取料升降轴_紧急料区放料低点,Updown_P19_NGL,310000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P19_NGL")]
public int Updown_P19_NGL { get; set; }
/// <summary>
/// PRO,0,取料升降轴_P1速度,Updown_P1_Speed,108,,,,,,,,,,,, /// PRO,0,取料升降轴_P1速度,Updown_P1_Speed,108,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Updown_P1_Speed")] [ConfigProAttribute("Updown_P1_Speed")]
...@@ -306,6 +316,16 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -306,6 +316,16 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P17_Speed")] [ConfigProAttribute("Updown_P17_Speed")]
public int Updown_P17_Speed { get; set; } public int Updown_P17_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,17,取料升降轴_P18速度,Updown_P18_Speed,45000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P18_Speed")]
public int Updown_P18_Speed { get; set; }
/// <summary>
/// PRO,18,取料升降轴_P19速度,Updown_P19_Speed,45000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P19_Speed")]
public int Updown_P19_Speed { get; set; }
/// <summary>
/// PRO,0,取料升降轴_待机点,Middle_P1,100,,,,,,,,,,,, /// PRO,0,取料升降轴_待机点,Middle_P1,100,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Middle_P1")] [ConfigProAttribute("Middle_P1")]
...@@ -346,6 +366,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -346,6 +366,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Middle_P8_BUnder")] [ConfigProAttribute("Middle_P8_BUnder")]
public int Middle_P8_BUnder { get; set; } public int Middle_P8_BUnder { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料旋转轴_紧急料区放料点,Middle_P9_NG,214355,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Middle_P9_NG")]
public int Middle_P9_NG { get; set; }
/// <summary>
/// PRO,0,取料旋转轴_P1速度,Middle_P1_Speed,108,,,,,,,,,,,, /// PRO,0,取料旋转轴_P1速度,Middle_P1_Speed,108,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Middle_P1_Speed")] [ConfigProAttribute("Middle_P1_Speed")]
...@@ -385,7 +411,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -385,7 +411,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("Middle_P8_Speed")] [ConfigProAttribute("Middle_P8_Speed")]
public int Middle_P8_Speed { get; set; } public int Middle_P8_Speed { get; set; }
/// <summary>
/// PRO,8,取料旋转轴_P9速度,Middle_P9_Speed,100000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Middle_P9_Speed")]
public int Middle_P9_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料旋转轴_反向间隙补偿值,MiddleAxis_Reverse_Offset,300,,,,,,,,,,,, /// PRO,0,取料旋转轴_反向间隙补偿值,MiddleAxis_Reverse_Offset,300,,,,,,,,,,,,
/// </summary> /// </summary>
...@@ -439,6 +469,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -439,6 +469,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Inout_P6", false)] [ConfigProAttribute("Inout_P6", false)]
public int Inout_P6 { get; set; } public int Inout_P6 { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料进出轴_紧急料区点,Inout_P7,126912,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P7", false)]
public int Inout_P7 { get; set; }
/// <summary>
/// PRO,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,, /// PRO,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Inout_P1_Speed", false)] [ConfigProAttribute("Inout_P1_Speed", false)]
...@@ -469,6 +505,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -469,6 +505,12 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Inout_P6_Speed", false)] [ConfigProAttribute("Inout_P6_Speed", false)]
public int Inout_P6_Speed { get; set; } public int Inout_P6_Speed { get; set; }
/// <summary>
/// PRO,6,取料进出轴_P7速度,Inout_P7_Speed,100000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P7_Speed", false)]
public int Inout_P7_Speed { get; set; }
private List<string> CameraList = null; private List<string> CameraList = null;
......
source/XLRStoreClient/FrmXLRStore.Designer.cs
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
this.tabControl1.Multiline = true; this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1160, 642); this.tabControl1.Size = new System.Drawing.Size(1000, 600);
this.tabControl1.TabIndex = 0; this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 32); this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1152, 606); this.tabPage1.Size = new System.Drawing.Size(992, 564);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 运行日志 "; this.tabPage1.Text = " 运行日志 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(5, 3); this.logBox.Location = new System.Drawing.Point(5, 3);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1141, 595); this.logBox.Size = new System.Drawing.Size(981, 553);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
this.tabPage2.Controls.Add(this.panel1); this.tabPage2.Controls.Add(this.panel1);
this.tabPage2.Location = new System.Drawing.Point(4, 32); this.tabPage2.Location = new System.Drawing.Point(4, 32);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1152, 606); this.tabPage2.Size = new System.Drawing.Size(992, 564);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1152, 606); this.panel1.Size = new System.Drawing.Size(992, 564);
this.panel1.TabIndex = 1; this.panel1.TabIndex = 1;
// //
// tableLayoutPanel1 // tableLayoutPanel1
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1152, 606); this.tableLayoutPanel1.Size = new System.Drawing.Size(992, 564);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// InputControl // InputControl
...@@ -201,11 +201,11 @@ ...@@ -201,11 +201,11 @@
this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2); this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2);
this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill; this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.InputControl.EquipText = "上料机构"; this.InputControl.EquipText = "上料机构";
this.InputControl.Location = new System.Drawing.Point(4, 377); this.InputControl.Location = new System.Drawing.Point(4, 352);
this.InputControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.InputControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.InputControl.MoveInfo = "暂无出入库"; this.InputControl.MoveInfo = "暂无出入库";
this.InputControl.Name = "InputControl"; this.InputControl.Name = "InputControl";
this.InputControl.Size = new System.Drawing.Size(1144, 107); this.InputControl.Size = new System.Drawing.Size(984, 99);
this.InputControl.TabIndex = 5; this.InputControl.TabIndex = 5;
this.InputControl.WorkStatus = "暂未启动"; this.InputControl.WorkStatus = "暂未启动";
// //
...@@ -215,11 +215,11 @@ ...@@ -215,11 +215,11 @@
this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA1.ColorStatus = System.Drawing.Color.White; this.ReelControlA1.ColorStatus = System.Drawing.Color.White;
this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA1.Location = new System.Drawing.Point(4, 205); this.ReelControlA1.Location = new System.Drawing.Point(4, 192);
this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlA1.Name = "ReelControlA1"; this.ReelControlA1.Name = "ReelControlA1";
this.ReelControlA1.ReelText = "暂存区物料"; this.ReelControlA1.ReelText = "暂存区物料";
this.ReelControlA1.Size = new System.Drawing.Size(568, 78); this.ReelControlA1.Size = new System.Drawing.Size(488, 72);
this.ReelControlA1.TabIndex = 0; this.ReelControlA1.TabIndex = 0;
// //
// ReelControlA2 // ReelControlA2
...@@ -228,11 +228,11 @@ ...@@ -228,11 +228,11 @@
this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA2.ColorStatus = System.Drawing.Color.White; this.ReelControlA2.ColorStatus = System.Drawing.Color.White;
this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA2.Location = new System.Drawing.Point(4, 291); this.ReelControlA2.Location = new System.Drawing.Point(4, 272);
this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlA2.Name = "ReelControlA2"; this.ReelControlA2.Name = "ReelControlA2";
this.ReelControlA2.ReelText = "暂存区物料"; this.ReelControlA2.ReelText = "暂存区物料";
this.ReelControlA2.Size = new System.Drawing.Size(568, 78); this.ReelControlA2.Size = new System.Drawing.Size(488, 72);
this.ReelControlA2.TabIndex = 1; this.ReelControlA2.TabIndex = 1;
// //
// ReelControlB1 // ReelControlB1
...@@ -241,11 +241,11 @@ ...@@ -241,11 +241,11 @@
this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB1.ColorStatus = System.Drawing.Color.White; this.ReelControlB1.ColorStatus = System.Drawing.Color.White;
this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB1.Location = new System.Drawing.Point(580, 205); this.ReelControlB1.Location = new System.Drawing.Point(500, 192);
this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlB1.Name = "ReelControlB1"; this.ReelControlB1.Name = "ReelControlB1";
this.ReelControlB1.ReelText = "暂存区物料"; this.ReelControlB1.ReelText = "暂存区物料";
this.ReelControlB1.Size = new System.Drawing.Size(568, 78); this.ReelControlB1.Size = new System.Drawing.Size(488, 72);
this.ReelControlB1.TabIndex = 2; this.ReelControlB1.TabIndex = 2;
// //
// ReelControlB2 // ReelControlB2
...@@ -254,11 +254,11 @@ ...@@ -254,11 +254,11 @@
this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB2.ColorStatus = System.Drawing.Color.White; this.ReelControlB2.ColorStatus = System.Drawing.Color.White;
this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB2.Location = new System.Drawing.Point(580, 291); this.ReelControlB2.Location = new System.Drawing.Point(500, 272);
this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlB2.Name = "ReelControlB2"; this.ReelControlB2.Name = "ReelControlB2";
this.ReelControlB2.ReelText = "暂存区物料"; this.ReelControlB2.ReelText = "暂存区物料";
this.ReelControlB2.Size = new System.Drawing.Size(568, 78); this.ReelControlB2.Size = new System.Drawing.Size(488, 72);
this.ReelControlB2.TabIndex = 3; this.ReelControlB2.TabIndex = 3;
// //
// BoxControl // BoxControl
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
this.BoxControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.BoxControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BoxControl.MoveInfo = "暂无出入库"; this.BoxControl.MoveInfo = "暂无出入库";
this.BoxControl.Name = "BoxControl"; this.BoxControl.Name = "BoxControl";
this.BoxControl.Size = new System.Drawing.Size(1144, 193); this.BoxControl.Size = new System.Drawing.Size(984, 180);
this.BoxControl.TabIndex = 4; this.BoxControl.TabIndex = 4;
this.BoxControl.WorkStatus = "暂未启动"; this.BoxControl.WorkStatus = "暂未启动";
// //
...@@ -284,11 +284,11 @@ ...@@ -284,11 +284,11 @@
this.ShelfAControl.ColorStatus = System.Drawing.Color.White; this.ShelfAControl.ColorStatus = System.Drawing.Color.White;
this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfAControl.EquipText = "A料口"; this.ShelfAControl.EquipText = "A料口";
this.ShelfAControl.Location = new System.Drawing.Point(4, 492); this.ShelfAControl.Location = new System.Drawing.Point(4, 459);
this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ShelfAControl.MoveInfo = "暂无出入库"; this.ShelfAControl.MoveInfo = "暂无出入库";
this.ShelfAControl.Name = "ShelfAControl"; this.ShelfAControl.Name = "ShelfAControl";
this.ShelfAControl.Size = new System.Drawing.Size(568, 110); this.ShelfAControl.Size = new System.Drawing.Size(488, 101);
this.ShelfAControl.TabIndex = 6; this.ShelfAControl.TabIndex = 6;
this.ShelfAControl.WorkStatus = "暂未启动"; this.ShelfAControl.WorkStatus = "暂未启动";
// //
...@@ -299,11 +299,11 @@ ...@@ -299,11 +299,11 @@
this.ShelfBControl.ColorStatus = System.Drawing.Color.White; this.ShelfBControl.ColorStatus = System.Drawing.Color.White;
this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfBControl.EquipText = "B料口"; this.ShelfBControl.EquipText = "B料口";
this.ShelfBControl.Location = new System.Drawing.Point(580, 492); this.ShelfBControl.Location = new System.Drawing.Point(500, 459);
this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ShelfBControl.MoveInfo = "暂无出入库"; this.ShelfBControl.MoveInfo = "暂无出入库";
this.ShelfBControl.Name = "ShelfBControl"; this.ShelfBControl.Name = "ShelfBControl";
this.ShelfBControl.Size = new System.Drawing.Size(568, 110); this.ShelfBControl.Size = new System.Drawing.Size(488, 101);
this.ShelfBControl.TabIndex = 7; this.ShelfBControl.TabIndex = 7;
this.ShelfBControl.WorkStatus = "暂未启动"; this.ShelfBControl.WorkStatus = "暂未启动";
// //
...@@ -583,7 +583,7 @@ ...@@ -583,7 +583,7 @@
this.帮助ToolStripMenuItem}); this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1166, 35); this.menuStrip1.Size = new System.Drawing.Size(1006, 35);
this.menuStrip1.TabIndex = 4; this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
...@@ -666,7 +666,7 @@ ...@@ -666,7 +666,7 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1166, 728); this.tableLayoutPanel2.Size = new System.Drawing.Size(1006, 686);
this.tableLayoutPanel2.TabIndex = 97; this.tableLayoutPanel2.TabIndex = 97;
// //
// tableLayoutPanel3 // tableLayoutPanel3
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowCount = 1;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(1160, 74); this.tableLayoutPanel3.Size = new System.Drawing.Size(1000, 74);
this.tableLayoutPanel3.TabIndex = 1; this.tableLayoutPanel3.TabIndex = 1;
// //
// lblWarnMsg // lblWarnMsg
...@@ -692,16 +692,16 @@ ...@@ -692,16 +692,16 @@
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(3, 0); this.lblWarnMsg.Location = new System.Drawing.Point(3, 0);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(705, 74); this.lblWarnMsg.Size = new System.Drawing.Size(607, 74);
this.lblWarnMsg.TabIndex = 97; this.lblWarnMsg.TabIndex = 97;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// lbldiancifa // lbldiancifa
// //
this.lbldiancifa.Dock = System.Windows.Forms.DockStyle.Fill; this.lbldiancifa.Dock = System.Windows.Forms.DockStyle.Fill;
this.lbldiancifa.Location = new System.Drawing.Point(714, 0); this.lbldiancifa.Location = new System.Drawing.Point(616, 0);
this.lbldiancifa.Name = "lbldiancifa"; this.lbldiancifa.Name = "lbldiancifa";
this.lbldiancifa.Size = new System.Drawing.Size(443, 74); this.lbldiancifa.Size = new System.Drawing.Size(381, 74);
this.lbldiancifa.TabIndex = 98; this.lbldiancifa.TabIndex = 98;
this.lbldiancifa.Text = "label1"; this.lbldiancifa.Text = "label1";
// //
...@@ -710,9 +710,9 @@ ...@@ -710,9 +710,9 @@
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lblStatus}); this.lblStatus});
this.statusStrip1.Location = new System.Drawing.Point(0, 737); this.statusStrip1.Location = new System.Drawing.Point(0, 695);
this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1166, 26); this.statusStrip1.Size = new System.Drawing.Size(1006, 26);
this.statusStrip1.TabIndex = 98; this.statusStrip1.TabIndex = 98;
this.statusStrip1.Text = "statusStrip1"; this.statusStrip1.Text = "statusStrip1";
// //
...@@ -727,7 +727,7 @@ ...@@ -727,7 +727,7 @@
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1166, 763); this.ClientSize = new System.Drawing.Size(1006, 721);
this.Controls.Add(this.statusStrip1); this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.tableLayoutPanel2); this.Controls.Add(this.tableLayoutPanel2);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
......
source/XLRStoreClient/inputForm/FrmBatchMove.Designer.cs
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(949, 546); this.panel2.Size = new System.Drawing.Size(949, 506);
this.panel2.TabIndex = 324; this.panel2.TabIndex = 324;
// //
// groupBox3 // groupBox3
...@@ -308,9 +308,9 @@ ...@@ -308,9 +308,9 @@
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true; this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(322, 86); this.chbMoveStop.Location = new System.Drawing.Point(302, 86);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24); this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.TabIndex = 327; this.chbMoveStop.TabIndex = 327;
this.chbMoveStop.Text = "暂停运动"; this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
...@@ -349,9 +349,9 @@ ...@@ -349,9 +349,9 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(213, 86); this.chbDebug.Location = new System.Drawing.Point(193, 86);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 325; this.chbDebug.TabIndex = 325;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(5, 62); this.lblAgvInfo.Location = new System.Drawing.Point(5, 62);
this.lblAgvInfo.Name = "lblAgvInfo"; this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17); this.lblAgvInfo.Size = new System.Drawing.Size(75, 20);
this.lblAgvInfo.TabIndex = 282; this.lblAgvInfo.TabIndex = 282;
this.lblAgvInfo.Text = "AGV 状态"; this.lblAgvInfo.Text = "AGV 状态";
// //
...@@ -435,9 +435,9 @@ ...@@ -435,9 +435,9 @@
this.chbAutoOut.Checked = true; this.chbAutoOut.Checked = true;
this.chbAutoOut.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoOut.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoOut.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoOut.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoOut.Location = new System.Drawing.Point(502, 510); this.chbAutoOut.Location = new System.Drawing.Point(458, 510);
this.chbAutoOut.Name = "chbAutoOut"; this.chbAutoOut.Name = "chbAutoOut";
this.chbAutoOut.Size = new System.Drawing.Size(168, 24); this.chbAutoOut.Size = new System.Drawing.Size(212, 28);
this.chbAutoOut.TabIndex = 280; this.chbAutoOut.TabIndex = 280;
this.chbAutoOut.Text = "入料完成自动开始出库"; this.chbAutoOut.Text = "入料完成自动开始出库";
this.chbAutoOut.UseVisualStyleBackColor = true; this.chbAutoOut.UseVisualStyleBackColor = true;
...@@ -445,9 +445,9 @@ ...@@ -445,9 +445,9 @@
// //
// FrmBatchMove // FrmBatchMove
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(949, 546); this.ClientSize = new System.Drawing.Size(949, 506);
this.Controls.Add(this.panel2); this.Controls.Add(this.panel2);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
......
source/XLRStoreClient/inputForm/FrmBatchMove.cs
...@@ -302,9 +302,8 @@ namespace OnlineStore.XLRStore ...@@ -302,9 +302,8 @@ namespace OnlineStore.XLRStore
private void btnResetShelf_Click(object sender, EventArgs e) private void btnResetShelf_Click(object sender, EventArgs e)
{ {
moveBean.UpdateShelf();
moveBean.Reset(true);
LogUtil.info(moveBean.Name + "点击：" + btnResetShelf.Text); LogUtil.info(moveBean.Name + "点击：" + btnResetShelf.Text);
moveBean.Reset(true,true);
} }
private void chbMoveStop_CheckedChanged(object sender, EventArgs e) private void chbMoveStop_CheckedChanged(object sender, EventArgs e)
......
source/XLRStoreClient/inputForm/uc/Input_AxisControl.Designer.cs
...@@ -31,49 +31,54 @@ ...@@ -31,49 +31,54 @@
this.tabControl2 = new System.Windows.Forms.TabControl(); this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.groupBox10 = new System.Windows.Forms.GroupBox();
this.groupBox9 = new System.Windows.Forms.GroupBox();
this.groupBox11 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.chbPointEditEnable = new System.Windows.Forms.CheckBox();
this.btnSave = new System.Windows.Forms.Button();
this.inoutAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.inoutAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.axisMoveControl1 = new OnlineStore.XLRStore.useControl.AxisMoveRectControl();
this.updownAxisP14 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP14 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.inoutAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.inoutAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.updownAxisP15 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP15 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP7 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP7 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP7 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP7 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.updownAxisP16 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP16 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.inoutAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.inoutAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP10 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP10 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP11 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP11 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.updownAxisP17 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP17 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP13 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP13 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP12 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP12 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.inoutAxisP7 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP18 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP19 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP9 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox10 = new System.Windows.Forms.GroupBox();
this.inoutAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.inoutAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox9 = new System.Windows.Forms.GroupBox();
this.inoutAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.inoutAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP9 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP9 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox11 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.inoutAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.inoutAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.chbPointEditEnable = new System.Windows.Forms.CheckBox();
this.btnSave = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.XLRStore.useControl.AxisMoveRectControl();
this.tabControl2.SuspendLayout(); this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout(); this.tabPage4.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -82,6 +87,7 @@ ...@@ -82,6 +87,7 @@
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.groupBox8.SuspendLayout(); this.groupBox8.SuspendLayout();
this.tabPage6.SuspendLayout(); this.tabPage6.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox10.SuspendLayout(); this.groupBox10.SuspendLayout();
this.groupBox9.SuspendLayout(); this.groupBox9.SuspendLayout();
this.groupBox11.SuspendLayout(); this.groupBox11.SuspendLayout();
...@@ -96,7 +102,7 @@ ...@@ -96,7 +102,7 @@
this.tabControl2.Location = new System.Drawing.Point(3, 9); this.tabControl2.Location = new System.Drawing.Point(3, 9);
this.tabControl2.Name = "tabControl2"; this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0; this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(979, 288); this.tabControl2.Size = new System.Drawing.Size(984, 288);
this.tabControl2.TabIndex = 231; this.tabControl2.TabIndex = 231;
// //
// tabPage4 // tabPage4
...@@ -120,231 +126,15 @@ ...@@ -120,231 +126,15 @@
this.groupBox2.Controls.Add(this.updownAxisP5); this.groupBox2.Controls.Add(this.updownAxisP5);
this.groupBox2.Location = new System.Drawing.Point(6, 13); this.groupBox2.Location = new System.Drawing.Point(6, 13);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(406, 239); this.groupBox2.Size = new System.Drawing.Size(332, 194);
this.groupBox2.TabIndex = 222; this.groupBox2.TabIndex = 222;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "A上暂存区点位"; this.groupBox2.Text = "A上暂存区点位";
// //
// groupBox5
//
this.groupBox5.Controls.Add(this.updownAxisP15);
this.groupBox5.Controls.Add(this.mideleAxisP7);
this.groupBox5.Controls.Add(this.updownAxisP6);
this.groupBox5.Controls.Add(this.updownAxisP7);
this.groupBox5.Location = new System.Drawing.Point(470, 13);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(481, 239);
this.groupBox5.TabIndex = 223;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "A下暂存区点位";
//
// tabPage5
//
this.tabPage5.Controls.Add(this.groupBox7);
this.tabPage5.Controls.Add(this.groupBox8);
this.tabPage5.Location = new System.Drawing.Point(4, 25);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(971, 259);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "B暂存区";
this.tabPage5.UseVisualStyleBackColor = true;
//
// groupBox7
//
this.groupBox7.Controls.Add(this.updownAxisP16);
this.groupBox7.Controls.Add(this.inoutAxisP3);
this.groupBox7.Controls.Add(this.mideleAxisP5);
this.groupBox7.Controls.Add(this.updownAxisP10);
this.groupBox7.Controls.Add(this.updownAxisP11);
this.groupBox7.Location = new System.Drawing.Point(6, 13);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(390, 227);
this.groupBox7.TabIndex = 224;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "B上暂存区点位";
//
// groupBox8
//
this.groupBox8.Controls.Add(this.updownAxisP17);
this.groupBox8.Controls.Add(this.updownAxisP13);
this.groupBox8.Controls.Add(this.mideleAxisP8);
this.groupBox8.Controls.Add(this.updownAxisP12);
this.groupBox8.Location = new System.Drawing.Point(497, 13);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(415, 227);
this.groupBox8.TabIndex = 224;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "B下暂存区点位";
//
// tabPage6
//
this.tabPage6.Controls.Add(this.groupBox10);
this.tabPage6.Controls.Add(this.groupBox9);
this.tabPage6.Location = new System.Drawing.Point(4, 25);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(971, 259);
this.tabPage6.TabIndex = 2;
this.tabPage6.Text = "NG/待机";
this.tabPage6.UseVisualStyleBackColor = true;
//
// groupBox10
//
this.groupBox10.Controls.Add(this.inoutAxisP1);
this.groupBox10.Controls.Add(this.mideleAxisP1);
this.groupBox10.Controls.Add(this.updownAxisP1);
this.groupBox10.Location = new System.Drawing.Point(3, 15);
this.groupBox10.Name = "groupBox10";
this.groupBox10.Size = new System.Drawing.Size(286, 206);
this.groupBox10.TabIndex = 227;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "待机点点位";
//
// groupBox9
//
this.groupBox9.Controls.Add(this.inoutAxisP6);
this.groupBox9.Controls.Add(this.updownAxisP8);
this.groupBox9.Controls.Add(this.updownAxisP9);
this.groupBox9.Controls.Add(this.mideleAxisP6);
this.groupBox9.Location = new System.Drawing.Point(316, 15);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(422, 206);
this.groupBox9.TabIndex = 225;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "NG料区点位";
//
// groupBox11
//
this.groupBox11.Controls.Add(this.panel1);
this.groupBox11.Location = new System.Drawing.Point(842, 333);
this.groupBox11.Name = "groupBox11";
this.groupBox11.Size = new System.Drawing.Size(304, 224);
this.groupBox11.TabIndex = 233;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "料串取放料点位";
//
// panel1
//
this.panel1.Controls.Add(this.inoutAxisP5);
this.panel1.Controls.Add(this.inoutAxisP4);
this.panel1.Controls.Add(this.mideleAxisP3);
this.panel1.Controls.Add(this.mideleAxisP2);
this.panel1.Controls.Add(this.updownAxisP2);
this.panel1.Controls.Add(this.updownAxisP3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 21);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(298, 200);
this.panel1.TabIndex = 220;
//
// chbPointEditEnable
//
this.chbPointEditEnable.AutoSize = true;
this.chbPointEditEnable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPointEditEnable.Location = new System.Drawing.Point(1002, 66);
this.chbPointEditEnable.Name = "chbPointEditEnable";
this.chbPointEditEnable.Size = new System.Drawing.Size(154, 31);
this.chbPointEditEnable.TabIndex = 234;
this.chbPointEditEnable.Text = "启用点位编辑";
this.chbPointEditEnable.UseVisualStyleBackColor = true;
this.chbPointEditEnable.CheckedChanged += new System.EventHandler(this.chbPointEditEnable_CheckedChanged);
//
// btnSave
//
this.btnSave.BackColor = System.Drawing.Color.White;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(1002, 135);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(144, 69);
this.btnSave.TabIndex = 235;
this.btnSave.Text = "保存点位信息";
this.btnSave.UseVisualStyleBackColor = false;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// inoutAxisP5
//
this.inoutAxisP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP5.Location = new System.Drawing.Point(3, 164);
this.inoutAxisP5.Name = "inoutAxisP5";
this.inoutAxisP5.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP5.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP5.PointText = "进出轴-B料口取料点P5:";
this.inoutAxisP5.PointValue = 0;
this.inoutAxisP5.Size = new System.Drawing.Size(292, 33);
this.inoutAxisP5.TabIndex = 4;
//
// inoutAxisP4
//
this.inoutAxisP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP4.Location = new System.Drawing.Point(3, 129);
this.inoutAxisP4.Name = "inoutAxisP4";
this.inoutAxisP4.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP4.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP4.PointText = "进出轴-A料口取料点P4:";
this.inoutAxisP4.PointValue = 0;
this.inoutAxisP4.Size = new System.Drawing.Size(292, 33);
this.inoutAxisP4.TabIndex = 3;
//
// mideleAxisP3
//
this.mideleAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP3.Location = new System.Drawing.Point(3, 33);
this.mideleAxisP3.Name = "mideleAxisP3";
this.mideleAxisP3.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP3.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP3.PointText = "旋转轴-B料口取料点P3:";
this.mideleAxisP3.PointValue = 0;
this.mideleAxisP3.Size = new System.Drawing.Size(292, 33);
this.mideleAxisP3.TabIndex = 2;
//
// mideleAxisP2
//
this.mideleAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP2.Location = new System.Drawing.Point(3, 3);
this.mideleAxisP2.Name = "mideleAxisP2";
this.mideleAxisP2.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP2.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP2.PointText = "旋转轴-A料口取料点P2:";
this.mideleAxisP2.PointValue = 0;
this.mideleAxisP2.Size = new System.Drawing.Size(292, 33);
this.mideleAxisP2.TabIndex = 1;
//
// updownAxisP2
//
this.updownAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP2.Location = new System.Drawing.Point(3, 65);
this.updownAxisP2.Name = "updownAxisP2";
this.updownAxisP2.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP2.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP2.PointText = "升降轴-A料口取料点P2:";
this.updownAxisP2.PointValue = 0;
this.updownAxisP2.Size = new System.Drawing.Size(292, 33);
this.updownAxisP2.TabIndex = 1;
//
// updownAxisP3
//
this.updownAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP3.Location = new System.Drawing.Point(3, 97);
this.updownAxisP3.Name = "updownAxisP3";
this.updownAxisP3.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP3.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP3.PointText = "升降轴-B料口取料点P3:";
this.updownAxisP3.PointValue = 0;
this.updownAxisP3.Size = new System.Drawing.Size(292, 33);
this.updownAxisP3.TabIndex = 2;
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(7, 318);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(811, 264);
this.axisMoveControl1.TabIndex = 232;
//
// updownAxisP14 // updownAxisP14
// //
this.updownAxisP14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP14.Location = new System.Drawing.Point(6, 121); this.updownAxisP14.Location = new System.Drawing.Point(6, 113);
this.updownAxisP14.Name = "updownAxisP14"; this.updownAxisP14.Name = "updownAxisP14";
this.updownAxisP14.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP14.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP14.PointForeColor = System.Drawing.Color.Black; this.updownAxisP14.PointForeColor = System.Drawing.Color.Black;
...@@ -356,7 +146,7 @@ ...@@ -356,7 +146,7 @@
// inoutAxisP2 // inoutAxisP2
// //
this.inoutAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.inoutAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP2.Location = new System.Drawing.Point(6, 163); this.inoutAxisP2.Location = new System.Drawing.Point(6, 153);
this.inoutAxisP2.Name = "inoutAxisP2"; this.inoutAxisP2.Name = "inoutAxisP2";
this.inoutAxisP2.PointBackColor = System.Drawing.Color.RoyalBlue; this.inoutAxisP2.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP2.PointForeColor = System.Drawing.Color.Black; this.inoutAxisP2.PointForeColor = System.Drawing.Color.Black;
...@@ -401,6 +191,19 @@ ...@@ -401,6 +191,19 @@
this.updownAxisP5.Size = new System.Drawing.Size(306, 36); this.updownAxisP5.Size = new System.Drawing.Size(306, 36);
this.updownAxisP5.TabIndex = 4; this.updownAxisP5.TabIndex = 4;
// //
// groupBox5
//
this.groupBox5.Controls.Add(this.updownAxisP15);
this.groupBox5.Controls.Add(this.mideleAxisP7);
this.groupBox5.Controls.Add(this.updownAxisP6);
this.groupBox5.Controls.Add(this.updownAxisP7);
this.groupBox5.Location = new System.Drawing.Point(418, 13);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(360, 194);
this.groupBox5.TabIndex = 223;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "A下暂存区点位";
//
// updownAxisP15 // updownAxisP15
// //
this.updownAxisP15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -449,10 +252,36 @@ ...@@ -449,10 +252,36 @@
this.updownAxisP7.Size = new System.Drawing.Size(327, 35); this.updownAxisP7.Size = new System.Drawing.Size(327, 35);
this.updownAxisP7.TabIndex = 6; this.updownAxisP7.TabIndex = 6;
// //
// tabPage5
//
this.tabPage5.Controls.Add(this.groupBox7);
this.tabPage5.Controls.Add(this.groupBox8);
this.tabPage5.Location = new System.Drawing.Point(4, 25);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(851, 259);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "B暂存区";
this.tabPage5.UseVisualStyleBackColor = true;
//
// groupBox7
//
this.groupBox7.Controls.Add(this.updownAxisP16);
this.groupBox7.Controls.Add(this.inoutAxisP3);
this.groupBox7.Controls.Add(this.mideleAxisP5);
this.groupBox7.Controls.Add(this.updownAxisP10);
this.groupBox7.Controls.Add(this.updownAxisP11);
this.groupBox7.Location = new System.Drawing.Point(6, 13);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(390, 213);
this.groupBox7.TabIndex = 224;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "B上暂存区点位";
//
// updownAxisP16 // updownAxisP16
// //
this.updownAxisP16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP16.Location = new System.Drawing.Point(6, 140); this.updownAxisP16.Location = new System.Drawing.Point(6, 129);
this.updownAxisP16.Name = "updownAxisP16"; this.updownAxisP16.Name = "updownAxisP16";
this.updownAxisP16.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP16.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP16.PointForeColor = System.Drawing.Color.Black; this.updownAxisP16.PointForeColor = System.Drawing.Color.Black;
...@@ -464,7 +293,7 @@ ...@@ -464,7 +293,7 @@
// inoutAxisP3 // inoutAxisP3
// //
this.inoutAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.inoutAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP3.Location = new System.Drawing.Point(6, 182); this.inoutAxisP3.Location = new System.Drawing.Point(6, 168);
this.inoutAxisP3.Name = "inoutAxisP3"; this.inoutAxisP3.Name = "inoutAxisP3";
this.inoutAxisP3.PointBackColor = System.Drawing.Color.RoyalBlue; this.inoutAxisP3.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP3.PointForeColor = System.Drawing.Color.Black; this.inoutAxisP3.PointForeColor = System.Drawing.Color.Black;
...@@ -488,7 +317,7 @@ ...@@ -488,7 +317,7 @@
// updownAxisP10 // updownAxisP10
// //
this.updownAxisP10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP10.Location = new System.Drawing.Point(6, 58); this.updownAxisP10.Location = new System.Drawing.Point(6, 53);
this.updownAxisP10.Name = "updownAxisP10"; this.updownAxisP10.Name = "updownAxisP10";
this.updownAxisP10.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP10.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP10.PointForeColor = System.Drawing.Color.Black; this.updownAxisP10.PointForeColor = System.Drawing.Color.Black;
...@@ -500,7 +329,7 @@ ...@@ -500,7 +329,7 @@
// updownAxisP11 // updownAxisP11
// //
this.updownAxisP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP11.Location = new System.Drawing.Point(6, 98); this.updownAxisP11.Location = new System.Drawing.Point(6, 89);
this.updownAxisP11.Name = "updownAxisP11"; this.updownAxisP11.Name = "updownAxisP11";
this.updownAxisP11.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP11.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP11.PointForeColor = System.Drawing.Color.Black; this.updownAxisP11.PointForeColor = System.Drawing.Color.Black;
...@@ -509,10 +338,23 @@ ...@@ -509,10 +338,23 @@
this.updownAxisP11.Size = new System.Drawing.Size(356, 34); this.updownAxisP11.Size = new System.Drawing.Size(356, 34);
this.updownAxisP11.TabIndex = 10; this.updownAxisP11.TabIndex = 10;
// //
// groupBox8
//
this.groupBox8.Controls.Add(this.updownAxisP17);
this.groupBox8.Controls.Add(this.updownAxisP13);
this.groupBox8.Controls.Add(this.mideleAxisP8);
this.groupBox8.Controls.Add(this.updownAxisP12);
this.groupBox8.Location = new System.Drawing.Point(414, 13);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(415, 213);
this.groupBox8.TabIndex = 224;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "B下暂存区点位";
//
// updownAxisP17 // updownAxisP17
// //
this.updownAxisP17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP17.Location = new System.Drawing.Point(6, 181); this.updownAxisP17.Location = new System.Drawing.Point(6, 139);
this.updownAxisP17.Name = "updownAxisP17"; this.updownAxisP17.Name = "updownAxisP17";
this.updownAxisP17.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP17.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP17.PointForeColor = System.Drawing.Color.Black; this.updownAxisP17.PointForeColor = System.Drawing.Color.Black;
...@@ -524,7 +366,7 @@ ...@@ -524,7 +366,7 @@
// updownAxisP13 // updownAxisP13
// //
this.updownAxisP13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP13.Location = new System.Drawing.Point(6, 128); this.updownAxisP13.Location = new System.Drawing.Point(6, 98);
this.updownAxisP13.Name = "updownAxisP13"; this.updownAxisP13.Name = "updownAxisP13";
this.updownAxisP13.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP13.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP13.PointForeColor = System.Drawing.Color.Black; this.updownAxisP13.PointForeColor = System.Drawing.Color.Black;
...@@ -548,7 +390,7 @@ ...@@ -548,7 +390,7 @@
// updownAxisP12 // updownAxisP12
// //
this.updownAxisP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP12.Location = new System.Drawing.Point(6, 75); this.updownAxisP12.Location = new System.Drawing.Point(6, 60);
this.updownAxisP12.Name = "updownAxisP12"; this.updownAxisP12.Name = "updownAxisP12";
this.updownAxisP12.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP12.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP12.PointForeColor = System.Drawing.Color.Black; this.updownAxisP12.PointForeColor = System.Drawing.Color.Black;
...@@ -557,6 +399,91 @@ ...@@ -557,6 +399,91 @@
this.updownAxisP12.Size = new System.Drawing.Size(370, 32); this.updownAxisP12.Size = new System.Drawing.Size(370, 32);
this.updownAxisP12.TabIndex = 11; this.updownAxisP12.TabIndex = 11;
// //
// tabPage6
//
this.tabPage6.Controls.Add(this.groupBox1);
this.tabPage6.Controls.Add(this.groupBox10);
this.tabPage6.Controls.Add(this.groupBox9);
this.tabPage6.Location = new System.Drawing.Point(4, 25);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(976, 259);
this.tabPage6.TabIndex = 2;
this.tabPage6.Text = "NG/待机/紧急料";
this.tabPage6.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.inoutAxisP7);
this.groupBox1.Controls.Add(this.updownAxisP18);
this.groupBox1.Controls.Add(this.updownAxisP19);
this.groupBox1.Controls.Add(this.mideleAxisP9);
this.groupBox1.Location = new System.Drawing.Point(615, 15);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(353, 206);
this.groupBox1.TabIndex = 228;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "紧急料区点位";
//
// inoutAxisP7
//
this.inoutAxisP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP7.Location = new System.Drawing.Point(6, 155);
this.inoutAxisP7.Name = "inoutAxisP7";
this.inoutAxisP7.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP7.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP7.PointText = "进出轴-紧急料区点P7:";
this.inoutAxisP7.PointValue = 0;
this.inoutAxisP7.Size = new System.Drawing.Size(341, 33);
this.inoutAxisP7.TabIndex = 9;
//
// updownAxisP18
//
this.updownAxisP18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP18.Location = new System.Drawing.Point(6, 62);
this.updownAxisP18.Name = "updownAxisP18";
this.updownAxisP18.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP18.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP18.PointText = "升降轴-紧急料区放料高点P18:";
this.updownAxisP18.PointValue = 0;
this.updownAxisP18.Size = new System.Drawing.Size(341, 32);
this.updownAxisP18.TabIndex = 7;
//
// updownAxisP19
//
this.updownAxisP19.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP19.Location = new System.Drawing.Point(6, 108);
this.updownAxisP19.Name = "updownAxisP19";
this.updownAxisP19.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP19.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP19.PointText = "升降轴-紧急料区放料低点P19:";
this.updownAxisP19.PointValue = 0;
this.updownAxisP19.Size = new System.Drawing.Size(341, 33);
this.updownAxisP19.TabIndex = 8;
//
// mideleAxisP9
//
this.mideleAxisP9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP9.Location = new System.Drawing.Point(6, 16);
this.mideleAxisP9.Name = "mideleAxisP9";
this.mideleAxisP9.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP9.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP9.PointText = "旋转轴-紧急料区放料点P9:";
this.mideleAxisP9.PointValue = 0;
this.mideleAxisP9.Size = new System.Drawing.Size(341, 32);
this.mideleAxisP9.TabIndex = 5;
//
// groupBox10
//
this.groupBox10.Controls.Add(this.inoutAxisP1);
this.groupBox10.Controls.Add(this.mideleAxisP1);
this.groupBox10.Controls.Add(this.updownAxisP1);
this.groupBox10.Location = new System.Drawing.Point(3, 15);
this.groupBox10.Name = "groupBox10";
this.groupBox10.Size = new System.Drawing.Size(264, 206);
this.groupBox10.TabIndex = 227;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "待机点点位";
//
// inoutAxisP1 // inoutAxisP1
// //
this.inoutAxisP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.inoutAxisP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -593,6 +520,19 @@ ...@@ -593,6 +520,19 @@
this.updownAxisP1.Size = new System.Drawing.Size(247, 32); this.updownAxisP1.Size = new System.Drawing.Size(247, 32);
this.updownAxisP1.TabIndex = 0; this.updownAxisP1.TabIndex = 0;
// //
// groupBox9
//
this.groupBox9.Controls.Add(this.inoutAxisP6);
this.groupBox9.Controls.Add(this.updownAxisP8);
this.groupBox9.Controls.Add(this.updownAxisP9);
this.groupBox9.Controls.Add(this.mideleAxisP6);
this.groupBox9.Location = new System.Drawing.Point(277, 15);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(332, 206);
this.groupBox9.TabIndex = 225;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "NG料区点位";
//
// inoutAxisP6 // inoutAxisP6
// //
this.inoutAxisP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.inoutAxisP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -600,9 +540,9 @@ ...@@ -600,9 +540,9 @@
this.inoutAxisP6.Name = "inoutAxisP6"; this.inoutAxisP6.Name = "inoutAxisP6";
this.inoutAxisP6.PointBackColor = System.Drawing.Color.RoyalBlue; this.inoutAxisP6.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP6.PointForeColor = System.Drawing.Color.Black; this.inoutAxisP6.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP6.PointText = "进出轴-NG料区点P9:"; this.inoutAxisP6.PointText = "进出轴-NG料区点P6:";
this.inoutAxisP6.PointValue = 0; this.inoutAxisP6.PointValue = 0;
this.inoutAxisP6.Size = new System.Drawing.Size(303, 33); this.inoutAxisP6.Size = new System.Drawing.Size(320, 33);
this.inoutAxisP6.TabIndex = 9; this.inoutAxisP6.TabIndex = 9;
// //
// updownAxisP8 // updownAxisP8
...@@ -614,7 +554,7 @@ ...@@ -614,7 +554,7 @@
this.updownAxisP8.PointForeColor = System.Drawing.Color.Black; this.updownAxisP8.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP8.PointText = "升降轴-NG料区放料高点P8:"; this.updownAxisP8.PointText = "升降轴-NG料区放料高点P8:";
this.updownAxisP8.PointValue = 0; this.updownAxisP8.PointValue = 0;
this.updownAxisP8.Size = new System.Drawing.Size(303, 32); this.updownAxisP8.Size = new System.Drawing.Size(320, 32);
this.updownAxisP8.TabIndex = 7; this.updownAxisP8.TabIndex = 7;
// //
// updownAxisP9 // updownAxisP9
...@@ -626,7 +566,7 @@ ...@@ -626,7 +566,7 @@
this.updownAxisP9.PointForeColor = System.Drawing.Color.Black; this.updownAxisP9.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP9.PointText = "升降轴-NG料区放料低点P9:"; this.updownAxisP9.PointText = "升降轴-NG料区放料低点P9:";
this.updownAxisP9.PointValue = 0; this.updownAxisP9.PointValue = 0;
this.updownAxisP9.Size = new System.Drawing.Size(303, 33); this.updownAxisP9.Size = new System.Drawing.Size(320, 33);
this.updownAxisP9.TabIndex = 8; this.updownAxisP9.TabIndex = 8;
// //
// mideleAxisP6 // mideleAxisP6
...@@ -638,20 +578,149 @@ ...@@ -638,20 +578,149 @@
this.mideleAxisP6.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP6.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP6.PointText = "旋转轴-NG料区放料点P6:"; this.mideleAxisP6.PointText = "旋转轴-NG料区放料点P6:";
this.mideleAxisP6.PointValue = 0; this.mideleAxisP6.PointValue = 0;
this.mideleAxisP6.Size = new System.Drawing.Size(303, 32); this.mideleAxisP6.Size = new System.Drawing.Size(320, 32);
this.mideleAxisP6.TabIndex = 5; this.mideleAxisP6.TabIndex = 5;
// //
// groupBox11
//
this.groupBox11.Controls.Add(this.panel1);
this.groupBox11.Location = new System.Drawing.Point(842, 333);
this.groupBox11.Name = "groupBox11";
this.groupBox11.Size = new System.Drawing.Size(304, 224);
this.groupBox11.TabIndex = 233;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "料串取放料点位";
//
// panel1
//
this.panel1.Controls.Add(this.inoutAxisP5);
this.panel1.Controls.Add(this.inoutAxisP4);
this.panel1.Controls.Add(this.mideleAxisP3);
this.panel1.Controls.Add(this.mideleAxisP2);
this.panel1.Controls.Add(this.updownAxisP2);
this.panel1.Controls.Add(this.updownAxisP3);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 21);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(298, 200);
this.panel1.TabIndex = 220;
//
// inoutAxisP5
//
this.inoutAxisP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP5.Location = new System.Drawing.Point(3, 164);
this.inoutAxisP5.Name = "inoutAxisP5";
this.inoutAxisP5.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP5.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP5.PointText = "进出轴-B料口取料点P5:";
this.inoutAxisP5.PointValue = 0;
this.inoutAxisP5.Size = new System.Drawing.Size(292, 33);
this.inoutAxisP5.TabIndex = 4;
//
// inoutAxisP4
//
this.inoutAxisP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP4.Location = new System.Drawing.Point(3, 129);
this.inoutAxisP4.Name = "inoutAxisP4";
this.inoutAxisP4.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP4.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP4.PointText = "进出轴-A料口取料点P4:";
this.inoutAxisP4.PointValue = 0;
this.inoutAxisP4.Size = new System.Drawing.Size(292, 33);
this.inoutAxisP4.TabIndex = 3;
//
// mideleAxisP3
//
this.mideleAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP3.Location = new System.Drawing.Point(3, 33);
this.mideleAxisP3.Name = "mideleAxisP3";
this.mideleAxisP3.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP3.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP3.PointText = "旋转轴-B料口取料点P3:";
this.mideleAxisP3.PointValue = 0;
this.mideleAxisP3.Size = new System.Drawing.Size(292, 33);
this.mideleAxisP3.TabIndex = 2;
//
// mideleAxisP2
//
this.mideleAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP2.Location = new System.Drawing.Point(3, 3);
this.mideleAxisP2.Name = "mideleAxisP2";
this.mideleAxisP2.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP2.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP2.PointText = "旋转轴-A料口取料点P2:";
this.mideleAxisP2.PointValue = 0;
this.mideleAxisP2.Size = new System.Drawing.Size(292, 33);
this.mideleAxisP2.TabIndex = 1;
//
// updownAxisP2
//
this.updownAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP2.Location = new System.Drawing.Point(3, 65);
this.updownAxisP2.Name = "updownAxisP2";
this.updownAxisP2.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP2.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP2.PointText = "升降轴-A料口取料点P2:";
this.updownAxisP2.PointValue = 0;
this.updownAxisP2.Size = new System.Drawing.Size(292, 33);
this.updownAxisP2.TabIndex = 1;
//
// updownAxisP3
//
this.updownAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP3.Location = new System.Drawing.Point(3, 97);
this.updownAxisP3.Name = "updownAxisP3";
this.updownAxisP3.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP3.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP3.PointText = "升降轴-B料口取料点P3:";
this.updownAxisP3.PointValue = 0;
this.updownAxisP3.Size = new System.Drawing.Size(292, 33);
this.updownAxisP3.TabIndex = 2;
//
// chbPointEditEnable
//
this.chbPointEditEnable.AutoSize = true;
this.chbPointEditEnable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPointEditEnable.Location = new System.Drawing.Point(1002, 66);
this.chbPointEditEnable.Name = "chbPointEditEnable";
this.chbPointEditEnable.Size = new System.Drawing.Size(154, 31);
this.chbPointEditEnable.TabIndex = 234;
this.chbPointEditEnable.Text = "启用点位编辑";
this.chbPointEditEnable.UseVisualStyleBackColor = true;
this.chbPointEditEnable.CheckedChanged += new System.EventHandler(this.chbPointEditEnable_CheckedChanged);
//
// btnSave
//
this.btnSave.BackColor = System.Drawing.Color.White;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(1002, 135);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(144, 69);
this.btnSave.TabIndex = 235;
this.btnSave.Text = "保存点位信息";
this.btnSave.UseVisualStyleBackColor = false;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(7, 318);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(811, 264);
this.axisMoveControl1.TabIndex = 232;
//
// Input_AxisControl // Input_AxisControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true;
this.Controls.Add(this.btnSave); this.Controls.Add(this.btnSave);
this.Controls.Add(this.chbPointEditEnable); this.Controls.Add(this.chbPointEditEnable);
this.Controls.Add(this.groupBox11); this.Controls.Add(this.groupBox11);
this.Controls.Add(this.axisMoveControl1); this.Controls.Add(this.axisMoveControl1);
this.Controls.Add(this.tabControl2); this.Controls.Add(this.tabControl2);
this.Name = "Input_AxisControl"; this.Name = "Input_AxisControl";
this.Size = new System.Drawing.Size(1181, 596); this.Size = new System.Drawing.Size(946, 532);
this.VisibleChanged += new System.EventHandler(this.Input_AxisControl_VisibleChanged); this.VisibleChanged += new System.EventHandler(this.Input_AxisControl_VisibleChanged);
this.tabControl2.ResumeLayout(false); this.tabControl2.ResumeLayout(false);
this.tabPage4.ResumeLayout(false); this.tabPage4.ResumeLayout(false);
...@@ -661,6 +730,7 @@ ...@@ -661,6 +730,7 @@
this.groupBox7.ResumeLayout(false); this.groupBox7.ResumeLayout(false);
this.groupBox8.ResumeLayout(false); this.groupBox8.ResumeLayout(false);
this.tabPage6.ResumeLayout(false); this.tabPage6.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox10.ResumeLayout(false); this.groupBox10.ResumeLayout(false);
this.groupBox9.ResumeLayout(false); this.groupBox9.ResumeLayout(false);
this.groupBox11.ResumeLayout(false); this.groupBox11.ResumeLayout(false);
...@@ -718,5 +788,10 @@ ...@@ -718,5 +788,10 @@
private useControl.AxisPointControl updownAxisP3; private useControl.AxisPointControl updownAxisP3;
private System.Windows.Forms.CheckBox chbPointEditEnable; private System.Windows.Forms.CheckBox chbPointEditEnable;
protected System.Windows.Forms.Button btnSave; protected System.Windows.Forms.Button btnSave;
private System.Windows.Forms.GroupBox groupBox1;
private useControl.AxisPointControl inoutAxisP7;
private useControl.AxisPointControl updownAxisP18;
private useControl.AxisPointControl updownAxisP19;
private useControl.AxisPointControl mideleAxisP9;
} }
} }
source/XLRStoreClient/inputForm/uc/Input_AxisControl.cs
...@@ -22,7 +22,7 @@ namespace OnlineStore.XLRStore.inputForm.uc ...@@ -22,7 +22,7 @@ namespace OnlineStore.XLRStore.inputForm.uc
this.inputEquip = inputEquip; this.inputEquip = inputEquip;
LoadPoint(); LoadPoint();
LoadAxis(); LoadAxis();
PointEditEnable(false); PointEditEnable(false);
IsLoad = true; IsLoad = true;
} }
private InputEquip inputEquip; private InputEquip inputEquip;
...@@ -64,6 +64,10 @@ namespace OnlineStore.XLRStore.inputForm.uc ...@@ -64,6 +64,10 @@ namespace OnlineStore.XLRStore.inputForm.uc
inoutAxisP5.SetMoveData(inputEquip.InOutAxis, config.Inout_P5_Speed, config.Inout_P5); inoutAxisP5.SetMoveData(inputEquip.InOutAxis, config.Inout_P5_Speed, config.Inout_P5);
inoutAxisP6.SetMoveData(inputEquip.InOutAxis, config.Inout_P6_Speed, config.Inout_P6); inoutAxisP6.SetMoveData(inputEquip.InOutAxis, config.Inout_P6_Speed, config.Inout_P6);
updownAxisP18.SetMoveData(inputEquip.UpdownAxis, config.Updown_P18_Speed, config.Updown_P18_NGH);
updownAxisP19.SetMoveData(inputEquip.UpdownAxis, config.Updown_P19_Speed, config.Updown_P19_NGL);
mideleAxisP9.SetMoveData(inputEquip.MiddleAxis, config.Middle_P9_Speed, config.Middle_P9_NG);
inoutAxisP7.SetMoveData(inputEquip.InOutAxis, config.Inout_P7_Speed, config.Inout_P7);
} }
private void LoadAxis() private void LoadAxis()
{ {
...@@ -87,7 +91,7 @@ namespace OnlineStore.XLRStore.inputForm.uc ...@@ -87,7 +91,7 @@ namespace OnlineStore.XLRStore.inputForm.uc
groupBox9.Enabled = enable; groupBox9.Enabled = enable;
groupBox10.Enabled = enable; groupBox10.Enabled = enable;
groupBox11.Enabled = enable; groupBox11.Enabled = enable;
groupBox1.Enabled = enable;
} }
private void btnSave_Click(object sender, EventArgs e) private void btnSave_Click(object sender, EventArgs e)
...@@ -125,6 +129,11 @@ namespace OnlineStore.XLRStore.inputForm.uc ...@@ -125,6 +129,11 @@ namespace OnlineStore.XLRStore.inputForm.uc
inputEquip.Config.Inout_P4 = inoutAxisP4.PointValue; inputEquip.Config.Inout_P4 = inoutAxisP4.PointValue;
inputEquip.Config.Inout_P5 = inoutAxisP5.PointValue; inputEquip.Config.Inout_P5 = inoutAxisP5.PointValue;
inputEquip.Config.Inout_P6 = inoutAxisP6.PointValue; inputEquip.Config.Inout_P6 = inoutAxisP6.PointValue;
inputEquip.Config.Updown_P18_NGH = updownAxisP18.PointValue;
inputEquip.Config.Updown_P19_NGL = updownAxisP19.PointValue;
inputEquip.Config.Middle_P9_NG = mideleAxisP9.PointValue;
inputEquip.Config.Inout_P7 = inoutAxisP7.PointValue;
StoreManager.SaveInputEquipConfig(inputEquip.Config); StoreManager.SaveInputEquipConfig(inputEquip.Config);
MessageBox.Show("保存成功"); MessageBox.Show("保存成功");
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!