Skip to content

张东亮 / SO1057-XLRStore

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

Merge branch 'master' of http://106.15.194.121:8083/zdl/SO1057-XLRStore

2 个父辈 a43875ff f9488a26
内嵌 并排
正在显示 17 个修改的文件 包含 290 行增加 和 225 行删除
source/DeviceLibrary/baan/AxisBean.cs
...@@ -339,7 +339,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -339,7 +339,7 @@ namespace OnlineStore.DeviceLibrary
{ {
axisCheckTimer = new System.Timers.Timer(); axisCheckTimer = new System.Timers.Timer();
axisCheckTimer.AutoReset = true; axisCheckTimer.AutoReset = true;
axisCheckTimer.Interval += 5; axisCheckTimer.Interval += 10;
axisCheckTimer.Elapsed += CheckTimer_Elapsed; axisCheckTimer.Elapsed += CheckTimer_Elapsed;
axisCheckTimer.Enabled = false; axisCheckTimer.Enabled = false;
} }
...@@ -359,21 +359,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -359,21 +359,18 @@ namespace OnlineStore.DeviceLibrary
return true; return true;
} }
private bool IsInProcess = false; private bool IsInProcess = false;
private DateTime lastOkTime = DateTime.Now;
private void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) private void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{ {
TimeSpan pan = DateTime.Now - lastOkTime; if (IsInProcess ) { return; }
if (IsInProcess && pan.TotalMilliseconds < 100) { return; }
try try
{ {
IsInProcess = true; IsInProcess = true;
lastOkTime = DateTime.Now;
if (IOManager.IOValue(TargetIoType, 0).Equals(TargetIoValue)) if (IOManager.IOValue(TargetIoType, 0).Equals(TargetIoValue))
{ {
AxisStopCheckMove();
LogUtil.info(AxisName + "上料轴，检测到 " + TargetIoType + "=" + TargetIoValue + "，停止运动,AclPosition=" + GetAclPosition().ToString());
SuddenStop(); SuddenStop();
LogUtil.info(AxisName + "上料轴，检测到 " + TargetIoType + "=" + TargetIoValue + "，停止运动,AclPosition=" + GetAclPosition().ToString());
AxisStopCheckMove();
} }
} }
catch (Exception ex) catch (Exception ex)
......
source/DeviceLibrary/manager/StoreManager.cs
...@@ -118,6 +118,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -118,6 +118,26 @@ namespace OnlineStore.DeviceLibrary
//CSVPositionReader<DrawerPosition>.AddCSVFile(drawConfigFile); //CSVPositionReader<DrawerPosition>.AddCSVFile(drawConfigFile);
XLRStore = new XLRStoreBean(Config, inputConfig, boxConfig); XLRStore = new XLRStoreBean(Config, inputConfig, boxConfig);
//for (int i = 0; i < 60; i++)
//{
// var height = i;
// int LastHeight = 0;
// List<int> heightList = StoreManager.GetTrayList();
// heightList = (from m in heightList orderby m descending select m).ToList<int>();
// float minCha = height;
// foreach (int h in heightList)
// {
// //取差值最小的接近值
// float cha = Math.Abs(h - (height - 4));
// if (cha < minCha)
// {
// LastHeight = h;
// minCha = cha;
// }
// }
// LogUtil.info($"height:{height}, cha:{minCha}, 对应高度:{LastHeight}");
//}
LogUtil.info("加载 完成！"); LogUtil.info("加载 完成！");
return true; return true;
} }
......
source/DeviceLibrary/manager/model/DeviceBase.cs
...@@ -184,7 +184,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -184,7 +184,7 @@ namespace OnlineStore.DeviceLibrary
{ {
mainTimer = new System.Timers.Timer(); mainTimer = new System.Timers.Timer();
mainTimer.Enabled = false; mainTimer.Enabled = false;
mainTimer.Interval = 300; mainTimer.Interval = 200;
mainTimer.Elapsed += mainTimer_Elapsed; mainTimer.Elapsed += mainTimer_Elapsed;
mainTimer.AutoReset = true; mainTimer.AutoReset = true;
......
source/DeviceLibrary/storeBean/XLRStoreBean.cs
...@@ -46,7 +46,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,7 +46,6 @@ namespace OnlineStore.DeviceLibrary
Name = ($" {title}_" + " ").ToUpper(); Name = ($" {title}_" + " ").ToUpper();
MoveInfo = new DeviceMoveInfo(Name); MoveInfo = new DeviceMoveInfo(Name);
List<string> ioList = new List<string>(); List<string> ioList = new List<string>();
ioList = new List<string>(DeviceConfig.ProIOIpMap.Values); ioList = new List<string>(DeviceConfig.ProIOIpMap.Values);
......
source/DeviceLibrary/storeBean/boxBean/AutoInoutInfo.cs
...@@ -46,16 +46,34 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,16 +46,34 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
//是否自动进入出库状态 if (StoreManager.XLRStore.boxEquip.paresetReset)
if (!autoNext)
{ {
return; if (storeMoveType == MoveType.InStore)
{
StoreManager.XLRStore.boxEquip.paresetReset = false;
boxBean.LogInfo($"上料机构复位时请求料仓复位");
boxBean.Reset();
CurrInOutCount = 0;
}
} }
CurrInOutCount++; CurrInOutCount++;
if (CurrInOutCount >= boxBean.Config.Box_ResetCount) if (CurrInOutCount >= boxBean.Config.Box_ResetCount)
{ {
boxBean.LogInfo($"存储机构出入库达到{CurrInOutCount}次数，需要复位"); boxBean.LogInfo($"存储机构出入库达到{CurrInOutCount}次数，需要复位");
boxBean.Reset();
//if (storeMoveType == MoveType.InStore)
//{
// boxBean.Reset();
//}
//if (storeMoveType == MoveType.OutStore)
//{
// boxBean.Reset();
//}
}
//是否自动进入出库状态
if (!autoNext)
{
return;
} }
if (storeMoveType.Equals(MoveType.InStore)) if (storeMoveType.Equals(MoveType.InStore))
{ {
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -99,7 +99,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -99,7 +99,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// B面等待出库的队列 /// B面等待出库的队列
/// </summary> /// </summary>
//public ConcurrentQueue<InOutParam> waitBOutStoreList = new ConcurrentQueue<InOutParam>(); public ConcurrentQueue<InOutParam> waitBOutStoreList = new ConcurrentQueue<InOutParam>();
//库位表 //库位表
public List<string> PositionNumList; public List<string> PositionNumList;
/// <summary> /// <summary>
...@@ -294,7 +294,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -294,7 +294,19 @@ namespace OnlineStore.DeviceLibrary
SetAllTimer(true); SetAllTimer(true);
return true; return true;
} }
public bool paresetReset = false;
public void SafeReset() {
if (MoveInfo.MoveStep == StepEnum.Wait)
{
LogInfo("料仓没有动作 开始重置");
Reset();
}
else
{
LogInfo("料仓正在动作 结束后重置");
paresetReset = true;
}
}
public override bool Reset() public override bool Reset()
{ {
StopMove(); StopMove();
...@@ -752,9 +764,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -752,9 +764,13 @@ namespace OnlineStore.DeviceLibrary
private DateTime errUpperB = DateTime.Now; private DateTime errUpperB = DateTime.Now;
private DateTime errUnderA = DateTime.Now; private DateTime errUnderA = DateTime.Now;
private DateTime errUnderB = DateTime.Now; private DateTime errUnderB = DateTime.Now;
int SigLastTime = 2;//5秒 int SigLastTime = 7;//5秒
protected override void OnTimerProcess() protected override void OnTimerProcess()
{ {
if (ExecuteOutListProcess()) {
LogInfo("优先出库执行");
return;
}
//if (!runStatus.Equals(RunStatus.Runing)) //if (!runStatus.Equals(RunStatus.Runing))
// return; // return;
TimeSpan timeSpanA = DateTime.Now - dtUpperA; TimeSpan timeSpanA = DateTime.Now - dtUpperA;
...@@ -840,13 +856,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -840,13 +856,13 @@ namespace OnlineStore.DeviceLibrary
dtUpperB = DateTime.Now; dtUpperB = DateTime.Now;
} }
} }
private void ExecuteOutListProcess() private bool ExecuteOutListProcess()
{ {
try try
{ {
if (InDoorSigCheck()) if (InDoorSigCheck())
{ {
return; return false;
} }
if (waitAOutStoreList.Count > 0)// if (waitAOutStoreList.Count > 0)//
{ {
...@@ -858,10 +874,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -858,10 +874,10 @@ namespace OnlineStore.DeviceLibrary
{ {
bool rtn = StartExecuctOut(param); bool rtn = StartExecuctOut(param);
if (rtn) waitAOutStoreList.TryDequeue(out _); if (rtn) waitAOutStoreList.TryDequeue(out _);
return; return rtn;
} }
} }
else //if (CheckAOutDoor()) else if (CheckAOutDoor())
{ {
InOutParam param = null; InOutParam param = null;
bool result = waitAOutStoreList.TryPeek(out param); bool result = waitAOutStoreList.TryPeek(out param);
...@@ -869,40 +885,39 @@ namespace OnlineStore.DeviceLibrary ...@@ -869,40 +885,39 @@ namespace OnlineStore.DeviceLibrary
{ {
bool rtn = StartExecuctOut(param); bool rtn = StartExecuctOut(param);
if (rtn) waitAOutStoreList.TryDequeue(out _); if (rtn) waitAOutStoreList.TryDequeue(out _);
return; return rtn;
}
}
}
if (waitBOutStoreList.Count > 0)//
{
if (CloseOutStoreCheck)
{
InOutParam param = null;
bool result = waitBOutStoreList.TryDequeue(out param);
if (result && param != null)
{
LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
return StartExecuctOut(param);
}
}
else if (CheckBOutDoor())
{
InOutParam param = null;
bool result = waitBOutStoreList.TryDequeue(out param);
if (result && param != null)
{
LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
return StartExecuctOut(param);
} }
} }
} }
//if (waitBOutStoreList.Count > 0)//
//{
// if (CloseOutStoreCheck)
// {
// InOutParam param = null;
// bool result = waitBOutStoreList.TryDequeue(out param);
// if (result && param != null)
// {
// LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
// StartExecuctOut(param);
// return;
// }
// }
// else if (CheckBOutDoor())
// {
// InOutParam param = null;
// bool result = waitBOutStoreList.TryDequeue(out param);
// if (result && param != null)
// {
// LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
// StartExecuctOut(param);
// return;
// }
// }
//}
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(Name + "处理出库排队列表出错：" + ex.ToString()); LogUtil.error(Name + "处理出库排队列表出错：" + ex.ToString());
} }
return false;
} }
protected override void BaseTimerProcess() protected override void BaseTimerProcess()
{ {
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs
...@@ -408,7 +408,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -408,7 +408,7 @@ namespace OnlineStore.DeviceLibrary
//判断排队列表中是否已存在 //判断排队列表中是否已存在
List<InOutParam> reviceList = new List<InOutParam>(); List<InOutParam> reviceList = new List<InOutParam>();
reviceList.AddRange(waitAOutStoreList); reviceList.AddRange(waitAOutStoreList);
// reviceList.AddRange(waitBOutStoreList); reviceList.AddRange(waitBOutStoreList);
reviceList = (from m in reviceList where m.PosInfo.PosId.Equals(posId) select m).ToList<InOutParam>(); reviceList = (from m in reviceList where m.PosInfo.PosId.Equals(posId) select m).ToList<InOutParam>();
if (reviceList.Count > 0) if (reviceList.Count > 0)
{ {
...@@ -417,8 +417,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -417,8 +417,8 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
waitAOutStoreList.Enqueue(inoutParam); //waitAOutStoreList.Enqueue(inoutParam);
LogUtil.info($"加入出库队列：{inoutParam.PosInfo.ToStr()}"); //LogUtil.info($"加入出库队列：{inoutParam.PosInfo.ToStr()}");
} }
} }
...@@ -426,7 +426,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -426,7 +426,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.error(Name + "验证出库【" + inoutParam.PosInfo.ToStr() + "】是否重复出错：" + ex.ToString()); LogUtil.error(Name + "验证出库【" + inoutParam.PosInfo.ToStr() + "】是否重复出错：" + ex.ToString());
} }
//StartExecuctOut(inoutParam); StartExecuctOut(inoutParam);
} }
TimeSpan span = DateTime.Now - time; TimeSpan span = DateTime.Now - time;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
...@@ -459,14 +459,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -459,14 +459,14 @@ namespace OnlineStore.DeviceLibrary
inOut.PosInfo.IsNG = true; inOut.PosInfo.IsNG = true;
inOut.PosInfo.NgMsg = "验证入库完成失败"; 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())
{ {
waitAOutStoreList.Enqueue(inOut); waitAOutStoreList.Enqueue(inOut);
} }
//else else
//{ {
// waitBOutStoreList.Enqueue(inOut); waitBOutStoreList.Enqueue(inOut);
//} }
} }
break; break;
case StepEnum.SI_19_InoutBack: case StepEnum.SI_19_InoutBack:
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
...@@ -184,52 +184,52 @@ namespace OnlineStore.DeviceLibrary ...@@ -184,52 +184,52 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.SO_13_InoutBack: case StepEnum.SO_13_InoutBack:
//检查另一面是否有出库任务 //检查另一面是否有出库任务
//if (MoveInfo.MoveParam.PosInfoBack == null) if (MoveInfo.MoveParam.PosInfoBack == null)
//{ {
// if (CheckASide(MoveInfo.MoveParam)) if (CheckASide(MoveInfo.MoveParam))
// { {
// if (waitBOutStoreList.Count > 0 && CheckBOutDoor()) if (waitBOutStoreList.Count > 0 && CheckBOutDoor())
// { {
// if (waitBOutStoreList.TryDequeue(out InOutParam inOutParam))//B面料叉空且B面出料口无料，有出库任务 if (waitBOutStoreList.TryDequeue(out InOutParam inOutParam))//B面料叉空且B面出料口无料，有出库任务
// { {
// MoveInfo.NextMoveStep(StepEnum.SO_01_PullAxis_Ready); MoveInfo.NextMoveStep(StepEnum.SO_01_PullAxis_Ready);
// LogInfo($"存储机构-出库 {MoveInfo.SLog}：A面切换到B面，B面取料[{inOutParam.PosInfo.barcode}]"); LogInfo($"存储机构-出库 {MoveInfo.SLog}：A面切换到B面，B面取料[{inOutParam.PosInfo.barcode}]");
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
// MoveInfo.MoveParam.PosInfoBack = MoveInfo.MoveParam.PosInfo.ToCopy(); MoveInfo.MoveParam.PosInfoBack = MoveInfo.MoveParam.PosInfo.ToCopy();
// MoveInfo.MoveParam.PosInfo = inOutParam.PosInfo.ToCopy(); MoveInfo.MoveParam.PosInfo = inOutParam.PosInfo.ToCopy();
// MoveInfo.MoveParam.MoveP = new LineMoveP(Config, inOutParam.PosInfo.PosId); MoveInfo.MoveParam.MoveP = new LineMoveP(Config, inOutParam.PosInfo.PosId);
// PullAxis_Inout_To_Cam(); PullAxis_Inout_To_Cam();
// return; return;
// } }
// } }
// } }
// else else
// { {
// if (waitAOutStoreList.Count > 0 && CheckAOutDoor()) if (waitAOutStoreList.Count > 0 && CheckAOutDoor())
// { {
// if (waitAOutStoreList.TryDequeue(out InOutParam inOutParam)) if (waitAOutStoreList.TryDequeue(out InOutParam inOutParam))
// { {
// MoveInfo.NextMoveStep(StepEnum.SO_01_PullAxis_Ready); MoveInfo.NextMoveStep(StepEnum.SO_01_PullAxis_Ready);
// LogInfo($"存储机构-出库 {MoveInfo.SLog}：B面切换到A面，A面取料[{inOutParam.PosInfo.barcode}]"); LogInfo($"存储机构-出库 {MoveInfo.SLog}：B面切换到A面，A面取料[{inOutParam.PosInfo.barcode}]");
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
// MoveInfo.MoveParam.PosInfoBack = MoveInfo.MoveParam.PosInfo.ToCopy(); MoveInfo.MoveParam.PosInfoBack = MoveInfo.MoveParam.PosInfo.ToCopy();
// MoveInfo.MoveParam.PosInfo = inOutParam.PosInfo.ToCopy(); MoveInfo.MoveParam.PosInfo = inOutParam.PosInfo.ToCopy();
// MoveInfo.MoveParam.MoveP = new LineMoveP(Config, inOutParam.PosInfo.PosId); MoveInfo.MoveParam.MoveP = new LineMoveP(Config, inOutParam.PosInfo.PosId);
// PullAxis_Inout_To_Cam(); PullAxis_Inout_To_Cam();
// return; return;
// } }
// } }
// } }
//} }
//else//两夹爪都有料 else//两夹爪都有料
//{ {
// if(MoveInfo.MoveParam.PosInfoBack.PlateW==MoveInfo.MoveParam.PosInfo.PlateW && if (MoveInfo.MoveParam.PosInfoBack.PlateW == MoveInfo.MoveParam.PosInfo.PlateW &&
// MoveInfo.MoveParam.PosInfoBack.PlateH == MoveInfo.MoveParam.PosInfo.PlateH) MoveInfo.MoveParam.PosInfoBack.PlateH == MoveInfo.MoveParam.PosInfo.PlateH)
// { {
// MoveInfo.NextMoveStep(StepEnum.SOB_14_GetReels_Ready); MoveInfo.NextMoveStep(StepEnum.SOB_14_GetReels_Ready);
// return; return;
// } }
//} }
//直接出库，执行该步骤的情况：1.另一个料叉有料；2.另一面有出库任务但出料口有料；3.另一面没有出库任务; //直接出库，执行该步骤的情况：1.另一个料叉有料；2.另一面有出库任务但出料口有料；3.另一面没有出库任务;
MoveInfo.NextMoveStep(StepEnum.SO_14_GetReels_Ready); MoveInfo.NextMoveStep(StepEnum.SO_14_GetReels_Ready);
MoveAxisToP1(); MoveAxisToP1();
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
...@@ -1202,35 +1202,35 @@ namespace OnlineStore.DeviceLibrary ...@@ -1202,35 +1202,35 @@ namespace OnlineStore.DeviceLibrary
{ {
bool result = false; bool result = false;
result = StartOutstore(param); result = StartOutstore(param);
return result; if (!result)
//if (!result) {
//{ lock (outStoreObject)
// lock (outStoreObject) {
// { if (MoveInfo.MoveType.Equals(MoveType.OutStore) && MoveInfo.MoveParam.PosInfo.PosId.Equals(param.PosInfo.PosId))
// if (MoveInfo.MoveType.Equals(MoveType.OutStore) && MoveInfo.MoveParam.PosInfo.PosId.Equals(param.PosInfo.PosId)) {
// { LogUtil.error(Name + " 出库命令【" + param.PosInfo.ToStr() + "】重复，【" + MoveInfo.MoveParam.PosInfo.PosId + "】出库执行中");
// LogUtil.error(Name + " 出库命令【" + param.PosInfo.ToStr() + "】重复，【" + MoveInfo.MoveParam.PosInfo.PosId + "】出库执行中"); return false;
// return false; }
// }
// List<InOutParam> reviceList = new List<InOutParam>(); List<InOutParam> reviceList = new List<InOutParam>();
// reviceList.AddRange(waitAOutStoreList); reviceList.AddRange(waitAOutStoreList);
// //reviceList.AddRange(waitBOutStoreList); reviceList.AddRange(waitBOutStoreList);
// reviceList = (from m in reviceList where m.PosInfo.PosId.Equals(param.PosInfo.PosId) select m).ToList<InOutParam>(); reviceList = (from m in reviceList where m.PosInfo.PosId.Equals(param.PosInfo.PosId) select m).ToList<InOutParam>();
// if (reviceList.Count == 0) if (reviceList.Count == 0)
// { {
// //LogInfo(" 执行出库【" + param.PosInfo.ToStr() + "】失败，加入等待队列"); LogInfo(" 执行出库【" + param.PosInfo.ToStr() + "】失败，加入等待队列");
// // if (param.PosInfo.GetPosSide().Equals("A")) if (param.PosInfo.GetPosSide().Equals("A"))
// { {
// waitAOutStoreList.Enqueue(param); waitAOutStoreList.Enqueue(param);
// } }
// //else if (param.PosInfo.GetPosSide().Equals("B")) else if (param.PosInfo.GetPosSide().Equals("B"))
// //{ {
// // waitBOutStoreList.Enqueue(param); waitBOutStoreList.Enqueue(param);
// //} }
// } }
// } }
//} }
return result;
} }
private DateTime startOutStoreTime = DateTime.Now; private DateTime startOutStoreTime = DateTime.Now;
/// <summary> /// <summary>
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs
...@@ -345,7 +345,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -345,7 +345,10 @@ namespace OnlineStore.DeviceLibrary
targetP2 = Config.BatchAxisP2; targetP2 = Config.BatchAxisP2;
} }
} }
targetSpeed = Robot.Config.BatchAxis_P3Speed/2; targetSpeed = Robot.Config.BatchAxis_P3Speed;
}
else {
targetSpeed = Robot.Config.BatchAxis_P1Speed;
} }
// 需要增加定时器，获取验证信号并停止伺服 // 需要增加定时器，获取验证信号并停止伺服
StartMovePosition = BatchAxis.GetAclPosition(); StartMovePosition = BatchAxis.GetAclPosition();
...@@ -365,7 +368,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -365,7 +368,7 @@ namespace OnlineStore.DeviceLibrary
public void BatchAxisDown() public void BatchAxisDown()
{ {
int targetP1 = Config.BatchAxisP1; int targetP1 = Config.BatchAxisP1;
int targetSpeed = Robot.Config.BatchAxis_P3Speed / 2; int targetSpeed = Robot.Config.BatchAxis_P1Speed;
{ {
MoveInfo.TimeOutSeconds = 200; MoveInfo.TimeOutSeconds = 200;
MoveInfo.CanWhileCount = 0; MoveInfo.CanWhileCount = 0;
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs
...@@ -312,7 +312,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -312,7 +312,12 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StepEnum.IB16_SaveHight); MoveInfo.NextMoveStep(StepEnum.IB16_SaveHight);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
LastHeight = GetHeight(); int width = 7;
if (StoreManager.XLRStore.inputEquip.IOValue(IO_Type.Feeding_Reel_13_Check).Equals(IO_VALUE.HIGH))
{
width = 13;
}
LastHeight = GetHeight(width);
} }
else if (MoveInfo.IsStep(StepEnum.IB17_WaitReelLeave)) else if (MoveInfo.IsStep(StepEnum.IB17_WaitReelLeave))
{ {
...@@ -558,7 +563,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -558,7 +563,7 @@ namespace OnlineStore.DeviceLibrary
public int EndMovePosition = 0; public int EndMovePosition = 0;
internal int LastHeight = 0; internal int LastHeight = 0;
string[] cames; string[] cames;
public int GetHeight() public int GetHeight(int width=7)
{ {
CodeManager.CameraCheckHeight(cames?.ToList(), Name); CodeManager.CameraCheckHeight(cames?.ToList(), Name);
LogUtil.info($"{Name} 采集料盘抓走后的图片，开始计算高度"); LogUtil.info($"{Name} 采集料盘抓走后的图片，开始计算高度");
...@@ -574,6 +579,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -574,6 +579,12 @@ namespace OnlineStore.DeviceLibrary
isLast = true; isLast = true;
} }
float height = (float)(1F * Math.Abs(EndMovePosition - StartMovePosition) / AxisChangeValue);//Math.Ceiling float height = (float)(1F * Math.Abs(EndMovePosition - StartMovePosition) / AxisChangeValue);//Math.Ceiling
if (width >= 13) {
height = height - 2;
LogUtil.info($"检测为13寸高度-2={height}");
}
string buchongStr = ""; string buchongStr = "";
if (isLast) if (isLast)
{ {
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
...@@ -153,11 +153,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -153,11 +153,12 @@ namespace OnlineStore.DeviceLibrary
void InoutEndEvent() void InoutEndEvent()
{ {
inoutCnt++; inoutCnt++;
if (inoutCnt > resetCnt) if (inoutCnt > resetCnt && BatchMove_A.MoveInfo.ShelfNoTray && BatchMove_B.MoveInfo.ShelfNoTray)
{ {
OnlyResetInputAxis = true; OnlyResetInputAxis = true;
LogUtil.info($"入料机构出入库到达{resetCnt}，准备复位"); LogUtil.info($"入料机构出入库到达{resetCnt}，准备复位");
Reset(); Reset();
StoreManager.XLRStore.boxEquip.SafeReset();
} }
} }
public override bool Reset() public override bool Reset()
......
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(1000, 643); this.tabControl1.Size = new System.Drawing.Size(1000, 649);
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);
...@@ -129,9 +129,9 @@ ...@@ -129,9 +129,9 @@
// tabPage1 // tabPage1
// //
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, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(992, 607); this.tabPage1.Size = new System.Drawing.Size(992, 616);
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(981, 596); this.logBox.Size = new System.Drawing.Size(981, 605);
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);
...@@ -152,9 +152,9 @@ ...@@ -152,9 +152,9 @@
// tabPage2 // tabPage2
// //
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, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(992, 607); this.tabPage2.Size = new System.Drawing.Size(992, 616);
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(992, 607); this.panel1.Size = new System.Drawing.Size(992, 616);
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(992, 607); this.tableLayoutPanel1.Size = new System.Drawing.Size(992, 616);
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, 378); this.InputControl.Location = new System.Drawing.Point(4, 383);
this.InputControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.InputControl.Margin = new System.Windows.Forms.Padding(4);
this.InputControl.MoveInfo = "暂无出入库"; this.InputControl.MoveInfo = "暂无出入库";
this.InputControl.Name = "InputControl"; this.InputControl.Name = "InputControl";
this.InputControl.Size = new System.Drawing.Size(984, 107); this.InputControl.Size = new System.Drawing.Size(984, 109);
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, 206); this.ReelControlA1.Location = new System.Drawing.Point(4, 209);
this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlA1.Name = "ReelControlA1"; this.ReelControlA1.Name = "ReelControlA1";
this.ReelControlA1.ReelText = "暂存区物料"; this.ReelControlA1.ReelText = "暂存区物料";
this.ReelControlA1.Size = new System.Drawing.Size(488, 78); this.ReelControlA1.Size = new System.Drawing.Size(488, 79);
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, 292); this.ReelControlA2.Location = new System.Drawing.Point(4, 296);
this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlA2.Name = "ReelControlA2"; this.ReelControlA2.Name = "ReelControlA2";
this.ReelControlA2.ReelText = "暂存区物料"; this.ReelControlA2.ReelText = "暂存区物料";
this.ReelControlA2.Size = new System.Drawing.Size(488, 78); this.ReelControlA2.Size = new System.Drawing.Size(488, 79);
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(500, 206); this.ReelControlB1.Location = new System.Drawing.Point(500, 209);
this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlB1.Name = "ReelControlB1"; this.ReelControlB1.Name = "ReelControlB1";
this.ReelControlB1.ReelText = "暂存区物料"; this.ReelControlB1.ReelText = "暂存区物料";
this.ReelControlB1.Size = new System.Drawing.Size(488, 78); this.ReelControlB1.Size = new System.Drawing.Size(488, 79);
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(500, 292); this.ReelControlB2.Location = new System.Drawing.Point(500, 296);
this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4);
this.ReelControlB2.Name = "ReelControlB2"; this.ReelControlB2.Name = "ReelControlB2";
this.ReelControlB2.ReelText = "暂存区物料"; this.ReelControlB2.ReelText = "暂存区物料";
this.ReelControlB2.Size = new System.Drawing.Size(488, 78); this.ReelControlB2.Size = new System.Drawing.Size(488, 79);
this.ReelControlB2.TabIndex = 3; this.ReelControlB2.TabIndex = 3;
// //
// BoxControl // BoxControl
...@@ -270,10 +270,10 @@ ...@@ -270,10 +270,10 @@
this.BoxControl.Dock = System.Windows.Forms.DockStyle.Fill; this.BoxControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.BoxControl.EquipText = "存储机构"; this.BoxControl.EquipText = "存储机构";
this.BoxControl.Location = new System.Drawing.Point(4, 4); this.BoxControl.Location = new System.Drawing.Point(4, 4);
this.BoxControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.BoxControl.Margin = new System.Windows.Forms.Padding(4);
this.BoxControl.MoveInfo = "暂无出入库"; this.BoxControl.MoveInfo = "暂无出入库";
this.BoxControl.Name = "BoxControl"; this.BoxControl.Name = "BoxControl";
this.BoxControl.Size = new System.Drawing.Size(984, 194); this.BoxControl.Size = new System.Drawing.Size(984, 197);
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, 493); this.ShelfAControl.Location = new System.Drawing.Point(4, 500);
this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4);
this.ShelfAControl.MoveInfo = "暂无出入库"; this.ShelfAControl.MoveInfo = "暂无出入库";
this.ShelfAControl.Name = "ShelfAControl"; this.ShelfAControl.Name = "ShelfAControl";
this.ShelfAControl.Size = new System.Drawing.Size(488, 110); this.ShelfAControl.Size = new System.Drawing.Size(488, 112);
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(500, 493); this.ShelfBControl.Location = new System.Drawing.Point(500, 500);
this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4);
this.ShelfBControl.MoveInfo = "暂无出入库"; this.ShelfBControl.MoveInfo = "暂无出入库";
this.ShelfBControl.Name = "ShelfBControl"; this.ShelfBControl.Name = "ShelfBControl";
this.ShelfBControl.Size = new System.Drawing.Size(488, 110); this.ShelfBControl.Size = new System.Drawing.Size(488, 112);
this.ShelfBControl.TabIndex = 7; this.ShelfBControl.TabIndex = 7;
this.ShelfBControl.WorkStatus = "暂未启动"; this.ShelfBControl.WorkStatus = "暂未启动";
// //
...@@ -324,24 +324,24 @@ ...@@ -324,24 +324,24 @@
this.toolStripSeparator8, this.toolStripSeparator8,
this.toolStripMenuItem1}); this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(125, 74); this.contextMenuStrip1.Size = new System.Drawing.Size(113, 62);
// //
// 显示ToolStripMenuItem // 显示ToolStripMenuItem
// //
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem"; this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(124, 32); this.显示ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.显示ToolStripMenuItem.Text = "显示"; this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click); this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
// //
// toolStripSeparator8 // toolStripSeparator8
// //
this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(121, 6); this.toolStripSeparator8.Size = new System.Drawing.Size(109, 6);
// //
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 32); this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26);
this.toolStripMenuItem1.Text = "退出"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
// //
...@@ -364,68 +364,68 @@ ...@@ -364,68 +364,68 @@
this.toolStripSeparator2, this.toolStripSeparator2,
this.退出ToolStripMenuItem}); this.退出ToolStripMenuItem});
this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem"; this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem";
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(118, 31); this.操作ToolStripMenuItem.Size = new System.Drawing.Size(96, 25);
this.操作ToolStripMenuItem.Text = " 设备操作 "; this.操作ToolStripMenuItem.Text = " 设备操作 ";
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(215, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(173, 6);
// //
// 启动AToolStripMenuItem // 启动AToolStripMenuItem
// //
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem"; this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(218, 32); this.启动AToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.启动AToolStripMenuItem.Text = "启动 "; this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click); this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(215, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(173, 6);
// //
// 复位RToolStripMenuItem // 复位RToolStripMenuItem
// //
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem"; this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(218, 32); this.复位RToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.复位RToolStripMenuItem.Text = "复位"; this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click); this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(215, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(173, 6);
// //
// 停止TToolStripMenuItem // 停止TToolStripMenuItem
// //
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem"; this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(218, 32); this.停止TToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.停止TToolStripMenuItem.Text = "停止"; this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click); this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(215, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(173, 6);
// //
// 启用配置模式ToolStripMenuItem // 启用配置模式ToolStripMenuItem
// //
this.启用配置模式ToolStripMenuItem.Enabled = false; this.启用配置模式ToolStripMenuItem.Enabled = false;
this.启用配置模式ToolStripMenuItem.Name = "启用配置模式ToolStripMenuItem"; this.启用配置模式ToolStripMenuItem.Name = "启用配置模式ToolStripMenuItem";
this.启用配置模式ToolStripMenuItem.Size = new System.Drawing.Size(218, 32); this.启用配置模式ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.启用配置模式ToolStripMenuItem.Text = "启用配置模式"; this.启用配置模式ToolStripMenuItem.Text = "启用配置模式";
this.启用配置模式ToolStripMenuItem.Click += new System.EventHandler(this.启用配置模式ToolStripMenuItem_Click); this.启用配置模式ToolStripMenuItem.Click += new System.EventHandler(this.启用配置模式ToolStripMenuItem_Click);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(215, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator2.Visible = false; this.toolStripSeparator2.Visible = false;
// //
// 退出ToolStripMenuItem // 退出ToolStripMenuItem
// //
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem"; this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(218, 32); this.退出ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.退出ToolStripMenuItem.Text = "退出"; this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1); this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
// //
...@@ -446,85 +446,85 @@ ...@@ -446,85 +446,85 @@
this.toolStripSeparator9, this.toolStripSeparator9,
this.解锁舱门ToolStripMenuItem}); this.解锁舱门ToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem"; this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(112, 31); this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25);
this.设置TToolStripMenuItem.Text = "设备调试 "; this.设置TToolStripMenuItem.Text = "设备调试 ";
// //
// 忽略当次料叉检查ToolStripMenuItem // 忽略当次料叉检查ToolStripMenuItem
// //
this.忽略当次料叉检查ToolStripMenuItem.Name = "忽略当次料叉检查ToolStripMenuItem"; this.忽略当次料叉检查ToolStripMenuItem.Name = "忽略当次料叉检查ToolStripMenuItem";
this.忽略当次料叉检查ToolStripMenuItem.Size = new System.Drawing.Size(258, 32); this.忽略当次料叉检查ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.忽略当次料叉检查ToolStripMenuItem.Text = "忽略当次料叉检查"; this.忽略当次料叉检查ToolStripMenuItem.Text = "忽略当次料叉检查";
this.忽略当次料叉检查ToolStripMenuItem.Click += new System.EventHandler(this.忽略当次料叉检查ToolStripMenuItem_Click); this.忽略当次料叉检查ToolStripMenuItem.Click += new System.EventHandler(this.忽略当次料叉检查ToolStripMenuItem_Click);
// //
// toolStripSeparator13 // toolStripSeparator13
// //
this.toolStripSeparator13.Name = "toolStripSeparator13"; this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(255, 6); this.toolStripSeparator13.Size = new System.Drawing.Size(205, 6);
// //
// a料口重置料串ToolStripMenuItem // a料口重置料串ToolStripMenuItem
// //
this.a料口重置料串ToolStripMenuItem.Name = "a料口重置料串ToolStripMenuItem"; this.a料口重置料串ToolStripMenuItem.Name = "a料口重置料串ToolStripMenuItem";
this.a料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(258, 32); this.a料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.a料口重置料串ToolStripMenuItem.Text = "A料口重置料串"; this.a料口重置料串ToolStripMenuItem.Text = "A料口重置料串";
this.a料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.a料口重置料串ToolStripMenuItem_Click); this.a料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.a料口重置料串ToolStripMenuItem_Click);
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(255, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(205, 6);
this.toolStripSeparator6.Visible = false; this.toolStripSeparator6.Visible = false;
// //
// b料口重置料串ToolStripMenuItem // b料口重置料串ToolStripMenuItem
// //
this.b料口重置料串ToolStripMenuItem.Name = "b料口重置料串ToolStripMenuItem"; this.b料口重置料串ToolStripMenuItem.Name = "b料口重置料串ToolStripMenuItem";
this.b料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(258, 32); this.b料口重置料串ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.b料口重置料串ToolStripMenuItem.Text = "B料口重置料串"; this.b料口重置料串ToolStripMenuItem.Text = "B料口重置料串";
this.b料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.b料口重置料串ToolStripMenuItem_Click); this.b料口重置料串ToolStripMenuItem.Click += new System.EventHandler(this.b料口重置料串ToolStripMenuItem_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(255, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(205, 6);
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(258, 32); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习"; this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click); this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(255, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(205, 6);
// //
// 托盘初始化ToolStripMenuItem // 托盘初始化ToolStripMenuItem
// //
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem"; this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(258, 32); this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码"; this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
// //
// toolStripSeparator16 // toolStripSeparator16
// //
this.toolStripSeparator16.Name = "toolStripSeparator16"; this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(255, 6); this.toolStripSeparator16.Size = new System.Drawing.Size(205, 6);
// //
// toolStripMenuItem3 // toolStripMenuItem3
// //
this.toolStripMenuItem3.Name = "toolStripMenuItem3"; this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(258, 32); this.toolStripMenuItem3.Size = new System.Drawing.Size(208, 26);
this.toolStripMenuItem3.Text = "脆盘料号配置"; this.toolStripMenuItem3.Text = "脆盘料号配置";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click); this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(255, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(205, 6);
// //
// 解锁舱门ToolStripMenuItem // 解锁舱门ToolStripMenuItem
// //
this.解锁舱门ToolStripMenuItem.Name = "解锁舱门ToolStripMenuItem"; this.解锁舱门ToolStripMenuItem.Name = "解锁舱门ToolStripMenuItem";
this.解锁舱门ToolStripMenuItem.Size = new System.Drawing.Size(258, 32); this.解锁舱门ToolStripMenuItem.Size = new System.Drawing.Size(208, 26);
this.解锁舱门ToolStripMenuItem.Text = "解锁舱门"; this.解锁舱门ToolStripMenuItem.Text = "解锁舱门";
this.解锁舱门ToolStripMenuItem.Click += new System.EventHandler(this.解锁舱门ToolStripMenuItem_Click); this.解锁舱门ToolStripMenuItem.Click += new System.EventHandler(this.解锁舱门ToolStripMenuItem_Click);
// //
...@@ -537,37 +537,37 @@ ...@@ -537,37 +537,37 @@
this.toolStripSeparator11, this.toolStripSeparator11,
this.版本号ToolStripMenuItem}); this.版本号ToolStripMenuItem});
this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem"; this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(84, 31); this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25);
this.帮助ToolStripMenuItem.Text = " 系统 "; this.帮助ToolStripMenuItem.Text = " 系统 ";
// //
// 清空日志ToolStripMenuItem // 清空日志ToolStripMenuItem
// //
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem"; this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32); this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.清空日志ToolStripMenuItem.Text = "清空日志"; this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click); this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
// //
// toolStripSeparator10 // toolStripSeparator10
// //
this.toolStripSeparator10.Name = "toolStripSeparator10"; this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(175, 6); this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6);
// //
// 复制日志ToolStripMenuItem // 复制日志ToolStripMenuItem
// //
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem"; this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32); this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复制日志ToolStripMenuItem.Text = "复制日志"; this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click); this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
// //
// toolStripSeparator11 // toolStripSeparator11
// //
this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(175, 6); this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6);
// //
// 版本号ToolStripMenuItem // 版本号ToolStripMenuItem
// //
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem"; this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(178, 32); this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Text = "关于软件"; this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click); this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
// //
...@@ -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(1006, 35); this.menuStrip1.Size = new System.Drawing.Size(1006, 29);
this.menuStrip1.TabIndex = 4; this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
...@@ -599,37 +599,37 @@ ...@@ -599,37 +599,37 @@
this.禁用安全光栅ToolStripMenuItem, this.禁用安全光栅ToolStripMenuItem,
this.启用门禁ToolStripMenuItem}); this.启用门禁ToolStripMenuItem});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem"; this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(106, 31); this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.运行参数ToolStripMenuItem.Text = "运行参数"; this.运行参数ToolStripMenuItem.Text = "运行参数";
// //
// 开机自动启动ToolStripMenuItem // 开机自动启动ToolStripMenuItem
// //
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem"; this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(254, 32); this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.开机自动启动ToolStripMenuItem.Text = "开机自动启动"; this.开机自动启动ToolStripMenuItem.Text = "开机自动启动";
this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click); this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click);
// //
// toolStripSeparator15 // toolStripSeparator15
// //
this.toolStripSeparator15.Name = "toolStripSeparator15"; this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(251, 6); this.toolStripSeparator15.Size = new System.Drawing.Size(203, 6);
// //
// 启用蜂鸣器ToolStripMenuItem // 启用蜂鸣器ToolStripMenuItem
// //
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem"; this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(254, 32); this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器"; this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click); this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
// //
// toolStripSeparator25 // toolStripSeparator25
// //
this.toolStripSeparator25.Name = "toolStripSeparator25"; this.toolStripSeparator25.Name = "toolStripSeparator25";
this.toolStripSeparator25.Size = new System.Drawing.Size(251, 6); this.toolStripSeparator25.Size = new System.Drawing.Size(203, 6);
// //
// aGVCancelStateToolStripMenuItem // aGVCancelStateToolStripMenuItem
// //
this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem"; this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem";
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(254, 32); this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState"; this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
this.aGVCancelStateToolStripMenuItem.Visible = false; this.aGVCancelStateToolStripMenuItem.Visible = false;
this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click); this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click);
...@@ -637,20 +637,20 @@ ...@@ -637,20 +637,20 @@
// toolStripSeparator17 // toolStripSeparator17
// //
this.toolStripSeparator17.Name = "toolStripSeparator17"; this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(251, 6); this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6);
this.toolStripSeparator17.Visible = false; this.toolStripSeparator17.Visible = false;
// //
// 禁用安全光栅ToolStripMenuItem // 禁用安全光栅ToolStripMenuItem
// //
this.禁用安全光栅ToolStripMenuItem.Name = "禁用安全光栅ToolStripMenuItem"; this.禁用安全光栅ToolStripMenuItem.Name = "禁用安全光栅ToolStripMenuItem";
this.禁用安全光栅ToolStripMenuItem.Size = new System.Drawing.Size(254, 32); this.禁用安全光栅ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.禁用安全光栅ToolStripMenuItem.Text = "启用安全光栅"; this.禁用安全光栅ToolStripMenuItem.Text = "启用安全光栅";
this.禁用安全光栅ToolStripMenuItem.Click += new System.EventHandler(this.启用安全光栅ToolStripMenuItem_Click); this.禁用安全光栅ToolStripMenuItem.Click += new System.EventHandler(this.启用安全光栅ToolStripMenuItem_Click);
// //
// 启用门禁ToolStripMenuItem // 启用门禁ToolStripMenuItem
// //
this.启用门禁ToolStripMenuItem.Name = "启用门禁ToolStripMenuItem"; this.启用门禁ToolStripMenuItem.Name = "启用门禁ToolStripMenuItem";
this.启用门禁ToolStripMenuItem.Size = new System.Drawing.Size(254, 32); this.启用门禁ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用门禁ToolStripMenuItem.Text = "启用门禁"; this.启用门禁ToolStripMenuItem.Text = "启用门禁";
this.启用门禁ToolStripMenuItem.Click += new System.EventHandler(this.启用门禁ToolStripMenuItem_Click); this.启用门禁ToolStripMenuItem.Click += new System.EventHandler(this.启用门禁ToolStripMenuItem_Click);
// //
...@@ -661,12 +661,12 @@ ...@@ -661,12 +661,12 @@
this.tableLayoutPanel2.Controls.Add(this.tabControl1, 0, 1); this.tableLayoutPanel2.Controls.Add(this.tabControl1, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 0, 0); this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 35); this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 29);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
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(1006, 686); this.tableLayoutPanel2.Size = new System.Drawing.Size(1006, 692);
this.tableLayoutPanel2.TabIndex = 97; this.tableLayoutPanel2.TabIndex = 97;
// //
// tableLayoutPanel3 // tableLayoutPanel3
...@@ -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, 695); this.statusStrip1.Location = new System.Drawing.Point(0, 697);
this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1006, 26); this.statusStrip1.Size = new System.Drawing.Size(1006, 24);
this.statusStrip1.TabIndex = 98; this.statusStrip1.TabIndex = 98;
this.statusStrip1.Text = "statusStrip1"; this.statusStrip1.Text = "statusStrip1";
// //
...@@ -720,7 +720,7 @@ ...@@ -720,7 +720,7 @@
// //
this.lblStatus.ForeColor = System.Drawing.Color.Green; this.lblStatus.ForeColor = System.Drawing.Color.Green;
this.lblStatus.Name = "lblStatus"; this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(69, 20); this.lblStatus.Size = new System.Drawing.Size(61, 19);
this.lblStatus.Text = "等待启动"; this.lblStatus.Text = "等待启动";
// //
// FrmXLRStore // FrmXLRStore
......
source/XLRStoreClient/FrmXLRStore.cs
...@@ -68,7 +68,7 @@ namespace OnlineStore.XLRStore ...@@ -68,7 +68,7 @@ namespace OnlineStore.XLRStore
{ {
启用门禁ToolStripMenuItem.Text = "禁用门禁"; 启用门禁ToolStripMenuItem.Text = "禁用门禁";
} }
//tabControl1.TabPages.Remove(tabPage5); tabControl1.TabPages.Remove(tabPage1);
timer1.Start(); timer1.Start();
启用配置模式ToolStripMenuItem.Enabled = true; 启用配置模式ToolStripMenuItem.Enabled = true;
} }
......
source/XLRStoreClient/XLRStore.csproj
...@@ -280,6 +280,7 @@ ...@@ -280,6 +280,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="useControl\AxisMoveControl.resx"> <EmbeddedResource Include="useControl\AxisMoveControl.resx">
<DependentUpon>AxisMoveControl.cs</DependentUpon> <DependentUpon>AxisMoveControl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="inputForm\FrmInputEquip.resx"> <EmbeddedResource Include="inputForm\FrmInputEquip.resx">
<DependentUpon>FrmInputEquip.cs</DependentUpon> <DependentUpon>FrmInputEquip.cs</DependentUpon>
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
...@@ -189,15 +189,15 @@ namespace OnlineStore.XLRStore ...@@ -189,15 +189,15 @@ namespace OnlineStore.XLRStore
text += param.PosInfo.ToStr() + "\r"; text += param.PosInfo.ToStr() + "\r";
} }
} }
//List<InOutParam> psB = new List<InOutParam>(boxBean.waitBOutStoreList); List<InOutParam> psB = new List<InOutParam>(boxBean.waitBOutStoreList);
//if (psB.Count > 0) if (psB.Count > 0)
//{ {
// text = "B面等待出库列表：\r"; text = "B面等待出库列表：\r";
// foreach (InOutParam param in psB) foreach (InOutParam param in psB)
// { {
// text += param.PosInfo.ToStr() + "\r"; text += param.PosInfo.ToStr() + "\r";
// } }
//} }
} }
} }
if (!lblInstoreList.Text.Equals(text)) if (!lblInstoreList.Text.Equals(text))
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!