Skip to content

张东亮 / SO1131-XLRStore

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

改造修改

1 个父辈 3f0ee496
内嵌 并排
正在显示 4 个修改的文件 包含 766 行增加 和 79 行删除
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
...@@ -41,8 +41,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -41,8 +41,24 @@ namespace OnlineStore.DeviceLibrary
ConfigIO configIo = GetDO(ioType, subType); ConfigIO configIo = GetDO(ioType, subType);
if (configIo != null) if (configIo != null)
{ {
//instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
//Thread.Sleep(20);
int tryCount = 1;
if (subType == 1)
{
tryCount = 5;
}
while (!IOValue(ioType, subType).Equals(ioValue))
{
instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue); instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
Thread.Sleep(10); Thread.Sleep(20);
tryCount--;
if (tryCount <= 0)
{
LogUtil.error("IO操作失败，未能设置到目标值[" + ioValue + "]，请检查设备连接或配置！[" + ioType + "][" + subType + "]");
break;
}
}
} }
else else
{ {
......
source/DeviceLibrary/storeBean/inputBean/TurnoverBox.cs.cs
...@@ -40,6 +40,33 @@ namespace OnlineStore.DeviceLibrary ...@@ -40,6 +40,33 @@ namespace OnlineStore.DeviceLibrary
/// 周转箱线体末端周转箱检测 /// 周转箱线体末端周转箱检测
/// </summary> /// </summary>
string DI_InPlaceCheck = "TurnoverBoxA_InPlaceCheck"; string DI_InPlaceCheck = "TurnoverBoxA_InPlaceCheck";
/// <summary>
/// 线体挡停上升端
/// </summary>
string DI_StopUpCheck = "TurnoverBoxA_StopUpCheck";
/// <summary>
/// 线体挡停下降端
/// </summary>
string DI_StopDownCheck = "TurnoverBoxA_StopDownCheck";
/// <summary>
/// 线体横移顶升上升端
/// </summary>
string DI_TranverseUpCheck = "TurnoverBoxA_TranverseUpCheck";
/// <summary>
/// 线体横移顶升下降端
/// </summary>
string DI_TranverseDownCheck = "TurnoverBoxA_TranverseDownCheck";
/// <summary>
/// 体缓存前端检测
/// </summary>
string DI_CacheFrontCheck = "TurnoverBoxA_CacheFrontCheck";
/// <summary>
/// 线体缓存后端检测
/// </summary>
string DI_CacheBackCheck = "TurnoverBoxA_CacheBackCheck";
/// <summary> /// <summary>
/// 周转箱线体正转 /// 周转箱线体正转
/// </summary> /// </summary>
...@@ -48,7 +75,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -48,7 +75,23 @@ namespace OnlineStore.DeviceLibrary
/// 周转箱线体反转 /// 周转箱线体反转
/// </summary> /// </summary>
string DO_LineBackRun = "TurnoverBoxA_LineBackRun"; string DO_LineBackRun = "TurnoverBoxA_LineBackRun";
string DO_StopUp = "TurnoverBoxA_StopUp";
string DO_StopDown = "TurnoverBoxA_StopDown";
string DO_TranverseUp = "TurnoverBoxA_TranverseUp";
string DO_TranverseDown = "TurnoverBoxA_TranverseDown";
string DO_TranverseRun = "TurnoverBoxA_TranverseRun";
string DO_TranverseBackRun = "TurnoverBoxA_TranverseBackRun";
string DO_Transition_RollerRun = "Transition_RollerRun";
string DO_Transition_RollerBackRun = "Transition_RollerBackRun";
public string outLet = "A"; public string outLet = "A";
/// <summary>
/// 另一边的周转箱线体
/// </summary>
TurnoverBox otherTurnoverBox { get { return turnoverBoxes.Find(s => !outLet.Equals(s.outLet)); } }
static List<TurnoverBox> turnoverBoxes = new List<TurnoverBox>();
public TurnoverBox(string name, string rfidIp, InputEquip_Config inputEquip_Config) public TurnoverBox(string name, string rfidIp, InputEquip_Config inputEquip_Config)
{ {
Name = name; Name = name;
...@@ -61,11 +104,191 @@ namespace OnlineStore.DeviceLibrary ...@@ -61,11 +104,191 @@ namespace OnlineStore.DeviceLibrary
DO_LineRun = "TurnoverBoxB_LineRun"; DO_LineRun = "TurnoverBoxB_LineRun";
DO_LineBackRun = "TurnoverBoxB_LineBackRun"; DO_LineBackRun = "TurnoverBoxB_LineBackRun";
DI_StopUpCheck = "TurnoverBoxB_StopUpCheck";
DI_StopDownCheck = "TurnoverBoxB_StopDownCheck";
DI_TranverseUpCheck = "TurnoverBoxB_TranverseUpCheck";
DI_TranverseDownCheck = "TurnoverBoxB_TranverseDownCheck";
DI_CacheFrontCheck = "TurnoverBoxB_CacheFrontCheck";
DI_CacheBackCheck = "TurnoverBoxB_CacheBackCheck";
DO_StopUp = "TurnoverBoxB_StopUp";
DO_StopDown = "TurnoverBoxB_StopDown";
DO_TranverseUp = "TurnoverBoxB_TranverseUp";
DO_TranverseDown = "TurnoverBoxB_TranverseDown";
//以A方向的正转，对于B就是反转
DO_TranverseRun = "TurnoverBoxB_TranverseBackRun";
DO_TranverseBackRun = "TurnoverBoxB_TranverseRun";
DO_Transition_RollerRun = "Transition_RollerBackRun";
DO_Transition_RollerBackRun = "Transition_RollerRun";
} }
RFID_IP = rfidIp; RFID_IP = rfidIp;
config = inputEquip_Config; config = inputEquip_Config;
MoveInfo = new DeviceMoveInfo(Name); MoveInfo = new DeviceMoveInfo(Name);
turnoverBoxes.Add(this);
} }
#region 改造线体
/// <summary>
/// 线体挡停上升
/// </summary>
/// <param name="moveInfo"></param>
public void StopUp(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_StopDown, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_StopUp, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_StopDown, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_StopUp, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DI_StopUpCheck, IO_VALUE.HIGH));
}
}
/// <summary>
/// 线体挡停下降
/// </summary>
/// <param name="moveInfo"></param>
public void StopDown(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_StopUp, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_StopDown, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_StopUp, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_StopDown, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DI_StopDownCheck, IO_VALUE.HIGH));
}
}
/// <summary>
/// 横移上升
/// </summary>
/// <param name="moveInfo"></param>
public void TranverseUp(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_TranverseDown, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_TranverseUp, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseDown, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseUp, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DI_TranverseUpCheck, IO_VALUE.HIGH));
}
}
/// <summary>
/// 横移下降
/// </summary>
/// <param name="moveInfo"></param>
public void TranverseDown(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_TranverseUp, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_TranverseDown, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseUp, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseDown, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DI_TranverseDownCheck, IO_VALUE.HIGH));
}
}
/// <summary>
/// 横移正转
/// </summary>
/// <param name="moveInfo"></param>
public void TranverseRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_TranverseBackRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_TranverseRun, IO_VALUE.HIGH, config.Id);
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseBackRun, IO_VALUE.LOW));
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseRun, IO_VALUE.HIGH));
//}
}
/// <summary>
/// 横移反转
/// </summary>
/// <param name="moveInfo"></param>
public void TranverseBackRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_TranverseRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_TranverseBackRun, IO_VALUE.HIGH, config.Id);
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseRun, IO_VALUE.LOW));
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseBackRun, IO_VALUE.HIGH));
//}
}
public void TranverseStopRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_TranverseRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_TranverseBackRun, IO_VALUE.LOW, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseBackRun, IO_VALUE.LOW));
}
}
/// <summary>
/// 过渡滚筒正转
/// </summary>
/// <param name="moveInfo"></param>
public void Transition_RollerRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.HIGH));
}
}
/// <summary>
/// 过渡滚筒反转
/// </summary>
/// <param name="moveInfo"></param>
public void Transition_RollerBackRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.HIGH));
}
}
public void Transition_RollerStopRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.LOW, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.LOW));
}
}
public bool CacheFrontCheck(IO_VALUE iO_VALUE)
{
bool result = IOManager.IOValue(DI_CacheFrontCheck, config.Id).Equals(iO_VALUE);
return result;
}
public bool CacheBackCheck(IO_VALUE iO_VALUE)
{
bool result = IOManager.IOValue(DI_CacheBackCheck, config.Id).Equals(iO_VALUE);
return result;
}
public bool InPlaceCheck(IO_VALUE iO_VALUE)
{
bool result = IOManager.IOValue(DI_InPlaceCheck, config.Id).Equals(iO_VALUE);
return result;
}
public bool FrontCheck(IO_VALUE iO_VALUE)
{
bool result = IOManager.IOValue(DI_FrontCheck, config.Id).Equals(iO_VALUE);
return result;
}
#endregion
public string GetMoveStr() public string GetMoveStr()
{ {
return $"料箱：{BoxId} " + $"【格口最大数量：{MaxCntOnSide}】【" + (BoxTaskInfo?.ToStr() ?? "") + "】"; return $"料箱：{BoxId} " + $"【格口最大数量：{MaxCntOnSide}】【" + (BoxTaskInfo?.ToStr() ?? "") + "】";
...@@ -86,6 +309,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -86,6 +309,26 @@ namespace OnlineStore.DeviceLibrary
SetToNone(); SetToNone();
Task.Factory.StartNew(delegate Task.Factory.StartNew(delegate
{ {
Transition_RollerStopRun();
Thread.Sleep(100);
TranverseStopRun();
Thread.Sleep(100);
TranverseDown();
Thread.Sleep(100);
if (InPlaceCheck(IO_VALUE.HIGH))//末端有料箱
{
if (CacheFrontCheck(IO_VALUE.HIGH) || CacheBackCheck(IO_VALUE.HIGH) || FrontCheck(IO_VALUE.HIGH))
{
StopUp();
}
}
else //末端没料箱
{
if (CacheFrontCheck(IO_VALUE.HIGH) || CacheBackCheck(IO_VALUE.HIGH) || FrontCheck(IO_VALUE.HIGH))
{
StopDown();
}
}
LineRun(); LineRun();
Thread.Sleep(10000); Thread.Sleep(10000);
LineStopRun(); LineStopRun();
...@@ -93,7 +336,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -93,7 +336,7 @@ namespace OnlineStore.DeviceLibrary
if (needLeave) if (needLeave)
{ {
NeedLeave(); NeedLeave();
LogUtil.info($"复位 {Name}已满/无剩余任务，需要离开。{BoxTaskInfo?.ToStr()??""}"); LogUtil.info($"复位 {Name}已满/无剩余任务，需要离开。{BoxTaskInfo?.ToStr() ?? ""}");
} }
}); });
...@@ -159,6 +402,106 @@ namespace OnlineStore.DeviceLibrary ...@@ -159,6 +402,106 @@ namespace OnlineStore.DeviceLibrary
{ {
return IOManager.IOValue(iotype, config.Id).Equals(iO_VALUE); return IOManager.IOValue(iotype, config.Id).Equals(iO_VALUE);
} }
/// <summary>
/// 转移到另一侧
/// </summary>
void BoxTranverse(string logname)
{
if (outLet.Equals("A"))
{
AToB(logname, true);
}
else
{
BToA(logname, true);
}
}
/// <summary>
/// 转移回来
/// </summary>
void BoxTranverseBack(string logname)
{
if (outLet.Equals("A"))
{
BToA(logname, false);
}
else
{
AToB(logname, false);
}
}
/// <summary>
/// A->B
/// </summary>
void AToB(string logname, bool istranverse)
{
TurnoverBox from = null;
TurnoverBox to = null;
if (outLet.Equals("A"))
{
from = this;
to = otherTurnoverBox;
}
else
{
to = this;
from = otherTurnoverBox;
}
tranverseProcess(logname + $" A开始横移到B:", from, to, istranverse);
}
/// <summary>
/// B->A
/// </summary>
void BToA(string logname, bool istranverse)
{
TurnoverBox from = null;
TurnoverBox to = null;
if (outLet.Equals("A"))
{
to = this;
from = otherTurnoverBox;
}
else
{
from = this;
to = otherTurnoverBox;
}
tranverseProcess(logname + $" B开始横移到A:", from, to, istranverse);
}
void tranverseProcess(string logname, TurnoverBox from, TurnoverBox to, bool istranverse)
{
LogUtil.info(logname + "横移上升");
from.TranverseUp();
to.TranverseUp();
LogUtil.info(logname + "横移正转");
from.TranverseRun();
from.Transition_RollerRun();
to.TranverseBackRun();
bool result = WaitIo(to.DI_CacheBackCheck, IO_VALUE.HIGH, 600_000);
if (!result)
{
LogUtil.error(logname + $" 等待 {to.DI_CacheBackCheck} =High 超时");
}
else
{
LogUtil.info(logname + $"已收到 {to.DI_CacheBackCheck} =High ");
}
LogUtil.info(logname + "横移停止");
from.TranverseStopRun();
to.TranverseStopRun();
from.Transition_RollerStopRun();
from.TranverseDown();
if (!istranverse)
{
to.TranverseDown();
}
else
{
LogUtil.info(logname + "转移目的地，横移不下降");
}
}
void BoxOutProcess() void BoxOutProcess()
{ {
//AGV已到达，将料串送入AGV中 //AGV已到达，将料串送入AGV中
...@@ -167,10 +510,35 @@ namespace OnlineStore.DeviceLibrary ...@@ -167,10 +510,35 @@ namespace OnlineStore.DeviceLibrary
string logName = Name + " 料箱" + BoxId + "[" + AgvNode.name + "->AGV ] "; string logName = Name + " 料箱" + BoxId + "[" + AgvNode.name + "->AGV ] ";
try try
{ {
bool isTranverse = false;
if (CacheFrontCheck(IO_VALUE.HIGH) || CacheBackCheck(IO_VALUE.HIGH))//横移处有料箱
{
if (otherTurnoverBox.CacheFrontCheck(IO_VALUE.LOW) && otherTurnoverBox.CacheBackCheck(IO_VALUE.LOW))
{
BoxTranverse(logName);
isTranverse = true;
LogUtil.info(logName + " 另一侧没有料箱，可以横移过去");
}
else
{
LogUtil.info(logName + " 另一侧有料箱，不能横移过去，等待处理");
}
}
if (DIValue(DI_FrontCheck, IO_VALUE.HIGH) || DIValue(DI_InPlaceCheck, IO_VALUE.HIGH)) if (DIValue(DI_FrontCheck, IO_VALUE.HIGH) || DIValue(DI_InPlaceCheck, IO_VALUE.HIGH))
{ {
LogUtil.info(logName + " 开始出料箱");
ProcessShelfOut = true; ProcessShelfOut = true;
LogUtil.info(logName + " 横移停止运行");
TranverseStopRun();
LogUtil.info(logName + " 横移下降");
TranverseDown();
LogUtil.info(logName + " 阻挡下降");
StopDown();
LogUtil.info(logName + " 允许离开");
MayLeave(); MayLeave();
LogUtil.info(logName + " 线体反转");
LineBackRun(); LineBackRun();
bool result = WaitIo(DI_InPlaceCheck, IO_VALUE.LOW, 60000); bool result = WaitIo(DI_InPlaceCheck, IO_VALUE.LOW, 60000);
if (!result) if (!result)
...@@ -203,6 +571,49 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,6 +571,49 @@ namespace OnlineStore.DeviceLibrary
BoxTaskInfo = new BoxTaskInfo(); BoxTaskInfo = new BoxTaskInfo();
LogUtil.info(logName + "结束,停止转动，清空料箱[" + BoxId + "] "); LogUtil.info(logName + "结束,停止转动，清空料箱[" + BoxId + "] ");
BoxId = ""; BoxId = "";
if (!isTranverse)
{
if (otherTurnoverBox.CacheBackCheck(IO_VALUE.HIGH) || otherTurnoverBox.CacheFrontCheck(IO_VALUE.HIGH))
{
LogUtil.info(logName + " 没有横移过去料箱，但另一侧有料箱，可以横移过来");
isTranverse = true;
}
}
if (isTranverse)
{
BoxTranverseBack(logName);
LogUtil.info(logName + " 结束横移回转");
//让料箱流到位置
LogUtil.info(logName + " 开始进料箱");
ProcessShelfEnter = true;
LogUtil.info(logName + " 横移停止运行");
TranverseStopRun();
LogUtil.info(logName + " 横移下降");
TranverseDown();
LogUtil.info(logName + " 阻挡下降");
StopDown();
LogUtil.info(logName + " 线体正转");
LineRun();
result = WaitIo(DI_InPlaceCheck, IO_VALUE.HIGH, 60000);
if (!result)
{
LogUtil.error(logName + $" 等待 {DI_CacheFrontCheck} =High 超时");
}
else
{
LogUtil.info(logName + $"已收到 {DI_CacheFrontCheck} =High ");
}
Thread.Sleep(3000);
LogUtil.info(logName + "等待3000后，停止链条转动");
LineStopRun();
GetBoxTaskInfo();
}
else
{
LogUtil.info(logName + " 无横移，直接结束");
}
} }
else else
{ {
...@@ -238,11 +649,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -238,11 +649,21 @@ namespace OnlineStore.DeviceLibrary
string logName = Name + "料箱 " + BoxId + " [AGV->" + AgvNode.name + "] "; string logName = Name + "料箱 " + BoxId + " [AGV->" + AgvNode.name + "] ";
try try
{ {
if (DIValue(DI_FrontCheck, IO_VALUE.LOW) && DIValue(DI_InPlaceCheck, IO_VALUE.LOW)) //确保当前横移和另一个地方横移都没料箱
if (DIValue(DI_FrontCheck, IO_VALUE.LOW) && DIValue(DI_CacheFrontCheck, IO_VALUE.LOW)
&& DIValue(DI_CacheBackCheck, IO_VALUE.LOW) && otherTurnoverBox.CacheBackCheck(IO_VALUE.LOW) && otherTurnoverBox.CacheFrontCheck(IO_VALUE.LOW))
{ {
LogUtil.info(logName + " 开始转动线体"); LogUtil.info(logName + " 开始进料箱");
ProcessShelfEnter = true; ProcessShelfEnter = true;
LogUtil.info(logName + " 横移停止运行");
TranverseStopRun();
LogUtil.info(logName + " 横移下降");
TranverseDown();
LogUtil.info(logName + " 阻挡上升");
StopUp();
LogUtil.info(logName + " 允许进入");
MayEnter(); MayEnter();
LogUtil.info(logName + " 线体正转");
LineRun(); LineRun();
//等待进料检测信号 //等待进料检测信号
...@@ -250,21 +671,33 @@ namespace OnlineStore.DeviceLibrary ...@@ -250,21 +671,33 @@ namespace OnlineStore.DeviceLibrary
if (!result) if (!result)
{ {
LogUtil.error(logName + $" 等待{DI_FrontCheck}=High 超时， 等待 {DI_InPlaceCheck} 信号"); LogUtil.error(logName + $" 等待{DI_FrontCheck}=High 超时");
} }
else else
{ {
LogUtil.info(logName + $"已收到 {DI_FrontCheck}=High ， 等待 {DI_InPlaceCheck} 信号"); LogUtil.info(logName + $"已收到 {DI_FrontCheck}=High ");
} }
result = WaitIo(DI_InPlaceCheck, IO_VALUE.HIGH, 60000);
result = WaitIo(DI_CacheFrontCheck, IO_VALUE.HIGH, 60000);
if (!result)
{
LogUtil.error(logName + $" 等待 {DI_CacheFrontCheck} =High 超时");
}
else
{
LogUtil.info(logName + $"已收到 {DI_CacheFrontCheck} =High ");
}
result = WaitIo(DI_CacheBackCheck, IO_VALUE.HIGH, 60000);
if (!result) if (!result)
{ {
LogUtil.error(logName + $" 等待 {DI_InPlaceCheck} =High 超时，等待3000后停止转动"); LogUtil.error(logName + $" 等待 {DI_CacheBackCheck} =High 超时");
} }
else else
{ {
LogUtil.info(logName + $"已收到 {DI_InPlaceCheck} =High ，等待3000后停止转动"); LogUtil.info(logName + $"已收到 {DI_CacheBackCheck} =High");
} }
DateTime dateTime = DateTime.Now; DateTime dateTime = DateTime.Now;
if (ConfigHelper.Config.Get("BoxEnterNeedCompleSig", true)) if (ConfigHelper.Config.Get("BoxEnterNeedCompleSig", true))
...@@ -282,7 +715,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -282,7 +715,7 @@ namespace OnlineStore.DeviceLibrary
//Thread.Sleep(3000); //Thread.Sleep(3000);
LogUtil.info(logName + "等待3000后，停止链条转动"); LogUtil.info(logName + "等待3000后，停止链条转动");
LineStopRun(); LineStopRun();
GetBoxTaskInfo(); //GetBoxTaskInfo();
//if (ReadBoxId()) //if (ReadBoxId())
//{ //{
...@@ -292,6 +725,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -292,6 +725,7 @@ namespace OnlineStore.DeviceLibrary
//} //}
ProcessShelfEnter = false; ProcessShelfEnter = false;
BoxTranverse(logName);
LogUtil.info(logName + " 结束"); LogUtil.info(logName + " 结束");
} }
else else
...@@ -506,7 +940,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -506,7 +940,7 @@ namespace OnlineStore.DeviceLibrary
else if (rtn || !hasRemain) else if (rtn || !hasRemain)
{ {
NeedLeave(); NeedLeave();
LogUtil.info($"{Name}已满/无剩余任务，需要离开。{BoxTaskInfo?.ToStr()??""}"); LogUtil.info($"{Name}已满/无剩余任务，需要离开。{BoxTaskInfo?.ToStr() ?? ""}");
} }
} }
......
source/XLRStoreClient/inputForm/FrmInputEquip.Designer.cs
...@@ -23,6 +23,17 @@ namespace OnlineStore.XLRStore ...@@ -23,6 +23,17 @@ namespace OnlineStore.XLRStore
this.btnScan = new System.Windows.Forms.Button(); this.btnScan = new System.Windows.Forms.Button();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupDO = new System.Windows.Forms.GroupBox(); this.groupDO = new System.Windows.Forms.GroupBox();
this.button15 = new System.Windows.Forms.Button();
this.button14 = new System.Windows.Forms.Button();
this.button13 = new System.Windows.Forms.Button();
this.button12 = new System.Windows.Forms.Button();
this.button11 = new System.Windows.Forms.Button();
this.button10 = new System.Windows.Forms.Button();
this.btnTranverBackRun = new System.Windows.Forms.Button();
this.btnTranverRun = new System.Windows.Forms.Button();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.btnTranverDown = new System.Windows.Forms.Button();
this.btnTranverUp = new System.Windows.Forms.Button();
this.button8 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button(); this.button6 = new System.Windows.Forms.Button();
...@@ -126,16 +137,27 @@ namespace OnlineStore.XLRStore ...@@ -126,16 +137,27 @@ namespace OnlineStore.XLRStore
this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(986, 558); this.tabPage1.Size = new System.Drawing.Size(986, 561);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// groupDO // groupDO
// //
this.groupDO.Controls.Add(this.button15);
this.groupDO.Controls.Add(this.button14);
this.groupDO.Controls.Add(this.button13);
this.groupDO.Controls.Add(this.button12);
this.groupDO.Controls.Add(this.button11);
this.groupDO.Controls.Add(this.button10);
this.groupDO.Controls.Add(this.btnTranverBackRun);
this.groupDO.Controls.Add(this.btnTranverRun);
this.groupDO.Controls.Add(this.comboBox1);
this.groupDO.Controls.Add(this.btnTranverDown);
this.groupDO.Controls.Add(this.btnTranverUp);
this.groupDO.Controls.Add(this.button8); this.groupDO.Controls.Add(this.button8);
this.groupDO.Controls.Add(this.button7); this.groupDO.Controls.Add(this.button7);
this.groupDO.Controls.Add(this.button6); this.groupDO.Controls.Add(this.button6);
...@@ -162,6 +184,146 @@ namespace OnlineStore.XLRStore ...@@ -162,6 +184,146 @@ namespace OnlineStore.XLRStore
this.groupDO.TabIndex = 255; this.groupDO.TabIndex = 255;
this.groupDO.TabStop = false; this.groupDO.TabStop = false;
this.groupDO.Text = "IO操作测试"; this.groupDO.Text = "IO操作测试";
this.groupDO.Enter += new System.EventHandler(this.groupDO_Enter);
//
// button15
//
this.button15.BackColor = System.Drawing.Color.White;
this.button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button15.Location = new System.Drawing.Point(215, 303);
this.button15.Name = "button15";
this.button15.Size = new System.Drawing.Size(92, 34);
this.button15.TabIndex = 312;
this.button15.Text = "过渡滚筒停止";
this.button15.UseVisualStyleBackColor = false;
this.button15.Click += new System.EventHandler(this.button15_Click);
//
// button14
//
this.button14.BackColor = System.Drawing.Color.White;
this.button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button14.Location = new System.Drawing.Point(117, 303);
this.button14.Name = "button14";
this.button14.Size = new System.Drawing.Size(92, 34);
this.button14.TabIndex = 311;
this.button14.Text = "过渡滚筒反转";
this.button14.UseVisualStyleBackColor = false;
this.button14.Click += new System.EventHandler(this.button14_Click);
//
// button13
//
this.button13.BackColor = System.Drawing.Color.White;
this.button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button13.Location = new System.Drawing.Point(12, 303);
this.button13.Name = "button13";
this.button13.Size = new System.Drawing.Size(99, 34);
this.button13.TabIndex = 310;
this.button13.Text = "过渡滚筒正转";
this.button13.UseVisualStyleBackColor = false;
this.button13.Click += new System.EventHandler(this.button13_Click);
//
// button12
//
this.button12.BackColor = System.Drawing.Color.White;
this.button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button12.Location = new System.Drawing.Point(163, 383);
this.button12.Name = "button12";
this.button12.Size = new System.Drawing.Size(135, 34);
this.button12.TabIndex = 309;
this.button12.Text = "周转箱阻挡下降";
this.button12.UseVisualStyleBackColor = false;
this.button12.Click += new System.EventHandler(this.button12_Click);
//
// button11
//
this.button11.BackColor = System.Drawing.Color.White;
this.button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button11.Location = new System.Drawing.Point(163, 343);
this.button11.Name = "button11";
this.button11.Size = new System.Drawing.Size(135, 34);
this.button11.TabIndex = 308;
this.button11.Text = "周转箱阻挡上升";
this.button11.UseVisualStyleBackColor = false;
this.button11.Click += new System.EventHandler(this.button11_Click);
//
// button10
//
this.button10.BackColor = System.Drawing.Color.White;
this.button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button10.Location = new System.Drawing.Point(332, 303);
this.button10.Name = "button10";
this.button10.Size = new System.Drawing.Size(110, 34);
this.button10.TabIndex = 307;
this.button10.Text = "周转箱横移停止";
this.button10.UseVisualStyleBackColor = false;
this.button10.Click += new System.EventHandler(this.button10_Click_1);
//
// btnTranverBackRun
//
this.btnTranverBackRun.BackColor = System.Drawing.Color.White;
this.btnTranverBackRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTranverBackRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTranverBackRun.Location = new System.Drawing.Point(307, 383);
this.btnTranverBackRun.Name = "btnTranverBackRun";
this.btnTranverBackRun.Size = new System.Drawing.Size(135, 34);
this.btnTranverBackRun.TabIndex = 306;
this.btnTranverBackRun.Text = "周转箱横移反转";
this.btnTranverBackRun.UseVisualStyleBackColor = false;
this.btnTranverBackRun.Click += new System.EventHandler(this.btnTranverBackRun_Click);
//
// btnTranverRun
//
this.btnTranverRun.BackColor = System.Drawing.Color.White;
this.btnTranverRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTranverRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTranverRun.Location = new System.Drawing.Point(307, 343);
this.btnTranverRun.Name = "btnTranverRun";
this.btnTranverRun.Size = new System.Drawing.Size(135, 34);
this.btnTranverRun.TabIndex = 305;
this.btnTranverRun.Text = "周转箱横移正转";
this.btnTranverRun.UseVisualStyleBackColor = false;
this.btnTranverRun.Click += new System.EventHandler(this.btnTranverRun_Click);
//
// comboBox1
//
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(312, 273);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(121, 25);
this.comboBox1.TabIndex = 304;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// btnTranverDown
//
this.btnTranverDown.BackColor = System.Drawing.Color.White;
this.btnTranverDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTranverDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTranverDown.Location = new System.Drawing.Point(12, 383);
this.btnTranverDown.Name = "btnTranverDown";
this.btnTranverDown.Size = new System.Drawing.Size(135, 34);
this.btnTranverDown.TabIndex = 303;
this.btnTranverDown.Text = "周转箱横移下降";
this.btnTranverDown.UseVisualStyleBackColor = false;
this.btnTranverDown.Click += new System.EventHandler(this.btnTranverDown_Click);
//
// btnTranverUp
//
this.btnTranverUp.BackColor = System.Drawing.Color.White;
this.btnTranverUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTranverUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTranverUp.Location = new System.Drawing.Point(12, 343);
this.btnTranverUp.Name = "btnTranverUp";
this.btnTranverUp.Size = new System.Drawing.Size(135, 34);
this.btnTranverUp.TabIndex = 302;
this.btnTranverUp.Text = "周转箱横移顶升";
this.btnTranverUp.UseVisualStyleBackColor = false;
this.btnTranverUp.Click += new System.EventHandler(this.button10_Click);
// //
// button8 // button8
// //
...@@ -194,7 +356,7 @@ namespace OnlineStore.XLRStore ...@@ -194,7 +356,7 @@ namespace OnlineStore.XLRStore
this.button6.BackColor = System.Drawing.Color.White; this.button6.BackColor = System.Drawing.Color.White;
this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button6.Location = new System.Drawing.Point(305, 205); this.button6.Location = new System.Drawing.Point(307, 182);
this.button6.Name = "button6"; this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(135, 34); this.button6.Size = new System.Drawing.Size(135, 34);
this.button6.TabIndex = 299; this.button6.TabIndex = 299;
...@@ -207,7 +369,7 @@ namespace OnlineStore.XLRStore ...@@ -207,7 +369,7 @@ namespace OnlineStore.XLRStore
this.button5.BackColor = System.Drawing.Color.White; this.button5.BackColor = System.Drawing.Color.White;
this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.Location = new System.Drawing.Point(9, 206); this.button5.Location = new System.Drawing.Point(11, 183);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(135, 34); this.button5.Size = new System.Drawing.Size(135, 34);
this.button5.TabIndex = 298; this.button5.TabIndex = 298;
...@@ -220,7 +382,7 @@ namespace OnlineStore.XLRStore ...@@ -220,7 +382,7 @@ namespace OnlineStore.XLRStore
this.button4.BackColor = System.Drawing.Color.White; this.button4.BackColor = System.Drawing.Color.White;
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(10, 166); this.button4.Location = new System.Drawing.Point(12, 143);
this.button4.Name = "button4"; this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(135, 34); this.button4.Size = new System.Drawing.Size(135, 34);
this.button4.TabIndex = 297; this.button4.TabIndex = 297;
...@@ -233,7 +395,7 @@ namespace OnlineStore.XLRStore ...@@ -233,7 +395,7 @@ namespace OnlineStore.XLRStore
this.button3.BackColor = System.Drawing.Color.White; this.button3.BackColor = System.Drawing.Color.White;
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button3.Location = new System.Drawing.Point(10, 126); this.button3.Location = new System.Drawing.Point(12, 103);
this.button3.Name = "button3"; this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(135, 34); this.button3.Size = new System.Drawing.Size(135, 34);
this.button3.TabIndex = 296; this.button3.TabIndex = 296;
...@@ -246,7 +408,7 @@ namespace OnlineStore.XLRStore ...@@ -246,7 +408,7 @@ namespace OnlineStore.XLRStore
this.button2.BackColor = System.Drawing.Color.White; this.button2.BackColor = System.Drawing.Color.White;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(305, 165); this.button2.Location = new System.Drawing.Point(307, 142);
this.button2.Name = "button2"; this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(135, 34); this.button2.Size = new System.Drawing.Size(135, 34);
this.button2.TabIndex = 295; this.button2.TabIndex = 295;
...@@ -259,7 +421,7 @@ namespace OnlineStore.XLRStore ...@@ -259,7 +421,7 @@ namespace OnlineStore.XLRStore
this.button1.BackColor = System.Drawing.Color.White; this.button1.BackColor = System.Drawing.Color.White;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(304, 126); this.button1.Location = new System.Drawing.Point(306, 103);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(135, 34); this.button1.Size = new System.Drawing.Size(135, 34);
this.button1.TabIndex = 294; this.button1.TabIndex = 294;
...@@ -272,7 +434,7 @@ namespace OnlineStore.XLRStore ...@@ -272,7 +434,7 @@ namespace OnlineStore.XLRStore
this.btnLabelBack.BackColor = System.Drawing.Color.White; this.btnLabelBack.BackColor = System.Drawing.Color.White;
this.btnLabelBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLabelBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLabelBack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLabelBack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLabelBack.Location = new System.Drawing.Point(162, 259); this.btnLabelBack.Location = new System.Drawing.Point(164, 223);
this.btnLabelBack.Name = "btnLabelBack"; this.btnLabelBack.Name = "btnLabelBack";
this.btnLabelBack.Size = new System.Drawing.Size(135, 34); this.btnLabelBack.Size = new System.Drawing.Size(135, 34);
this.btnLabelBack.TabIndex = 293; this.btnLabelBack.TabIndex = 293;
...@@ -285,7 +447,7 @@ namespace OnlineStore.XLRStore ...@@ -285,7 +447,7 @@ namespace OnlineStore.XLRStore
this.btnLabelFwd.BackColor = System.Drawing.Color.White; this.btnLabelFwd.BackColor = System.Drawing.Color.White;
this.btnLabelFwd.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLabelFwd.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLabelFwd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLabelFwd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLabelFwd.Location = new System.Drawing.Point(6, 259); this.btnLabelFwd.Location = new System.Drawing.Point(12, 223);
this.btnLabelFwd.Name = "btnLabelFwd"; this.btnLabelFwd.Name = "btnLabelFwd";
this.btnLabelFwd.Size = new System.Drawing.Size(135, 34); this.btnLabelFwd.Size = new System.Drawing.Size(135, 34);
this.btnLabelFwd.TabIndex = 292; this.btnLabelFwd.TabIndex = 292;
...@@ -298,7 +460,7 @@ namespace OnlineStore.XLRStore ...@@ -298,7 +460,7 @@ namespace OnlineStore.XLRStore
this.btnPrint.BackColor = System.Drawing.Color.White; this.btnPrint.BackColor = System.Drawing.Color.White;
this.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPrint.Location = new System.Drawing.Point(305, 259); this.btnPrint.Location = new System.Drawing.Point(307, 223);
this.btnPrint.Name = "btnPrint"; this.btnPrint.Name = "btnPrint";
this.btnPrint.Size = new System.Drawing.Size(135, 34); this.btnPrint.Size = new System.Drawing.Size(135, 34);
this.btnPrint.TabIndex = 290; this.btnPrint.TabIndex = 290;
...@@ -311,7 +473,7 @@ namespace OnlineStore.XLRStore ...@@ -311,7 +473,7 @@ namespace OnlineStore.XLRStore
this.btnPrintTest.BackColor = System.Drawing.Color.White; this.btnPrintTest.BackColor = System.Drawing.Color.White;
this.btnPrintTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnPrintTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPrintTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnPrintTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPrintTest.Location = new System.Drawing.Point(305, 338); this.btnPrintTest.Location = new System.Drawing.Point(12, 263);
this.btnPrintTest.Name = "btnPrintTest"; this.btnPrintTest.Name = "btnPrintTest";
this.btnPrintTest.Size = new System.Drawing.Size(135, 34); this.btnPrintTest.Size = new System.Drawing.Size(135, 34);
this.btnPrintTest.TabIndex = 289; this.btnPrintTest.TabIndex = 289;
...@@ -324,7 +486,7 @@ namespace OnlineStore.XLRStore ...@@ -324,7 +486,7 @@ namespace OnlineStore.XLRStore
this.btnClampRelax.BackColor = System.Drawing.Color.White; this.btnClampRelax.BackColor = System.Drawing.Color.White;
this.btnClampRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampRelax.Location = new System.Drawing.Point(162, 299); this.btnClampRelax.Location = new System.Drawing.Point(319, 61);
this.btnClampRelax.Name = "btnClampRelax"; this.btnClampRelax.Name = "btnClampRelax";
this.btnClampRelax.Size = new System.Drawing.Size(135, 34); this.btnClampRelax.Size = new System.Drawing.Size(135, 34);
this.btnClampRelax.TabIndex = 288; this.btnClampRelax.TabIndex = 288;
...@@ -337,7 +499,7 @@ namespace OnlineStore.XLRStore ...@@ -337,7 +499,7 @@ namespace OnlineStore.XLRStore
this.btnClampWork.BackColor = System.Drawing.Color.White; this.btnClampWork.BackColor = System.Drawing.Color.White;
this.btnClampWork.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClampWork.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClampWork.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClampWork.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClampWork.Location = new System.Drawing.Point(6, 299); this.btnClampWork.Location = new System.Drawing.Point(319, 22);
this.btnClampWork.Name = "btnClampWork"; this.btnClampWork.Name = "btnClampWork";
this.btnClampWork.Size = new System.Drawing.Size(135, 34); this.btnClampWork.Size = new System.Drawing.Size(135, 34);
this.btnClampWork.TabIndex = 287; this.btnClampWork.TabIndex = 287;
...@@ -350,7 +512,7 @@ namespace OnlineStore.XLRStore ...@@ -350,7 +512,7 @@ namespace OnlineStore.XLRStore
this.LineStop_A.BackColor = System.Drawing.Color.White; this.LineStop_A.BackColor = System.Drawing.Color.White;
this.LineStop_A.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.LineStop_A.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.LineStop_A.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.LineStop_A.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LineStop_A.Location = new System.Drawing.Point(161, 206); this.LineStop_A.Location = new System.Drawing.Point(163, 183);
this.LineStop_A.Name = "LineStop_A"; this.LineStop_A.Name = "LineStop_A";
this.LineStop_A.Size = new System.Drawing.Size(135, 34); this.LineStop_A.Size = new System.Drawing.Size(135, 34);
this.LineStop_A.TabIndex = 283; this.LineStop_A.TabIndex = 283;
...@@ -363,7 +525,7 @@ namespace OnlineStore.XLRStore ...@@ -363,7 +525,7 @@ namespace OnlineStore.XLRStore
this.LineBack_A.BackColor = System.Drawing.Color.White; this.LineBack_A.BackColor = System.Drawing.Color.White;
this.LineBack_A.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.LineBack_A.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.LineBack_A.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.LineBack_A.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LineBack_A.Location = new System.Drawing.Point(161, 126); this.LineBack_A.Location = new System.Drawing.Point(163, 103);
this.LineBack_A.Name = "LineBack_A"; this.LineBack_A.Name = "LineBack_A";
this.LineBack_A.Size = new System.Drawing.Size(135, 34); this.LineBack_A.Size = new System.Drawing.Size(135, 34);
this.LineBack_A.TabIndex = 282; this.LineBack_A.TabIndex = 282;
...@@ -402,7 +564,7 @@ namespace OnlineStore.XLRStore ...@@ -402,7 +564,7 @@ namespace OnlineStore.XLRStore
this.LineStart_A.BackColor = System.Drawing.Color.White; this.LineStart_A.BackColor = System.Drawing.Color.White;
this.LineStart_A.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.LineStart_A.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.LineStart_A.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.LineStart_A.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LineStart_A.Location = new System.Drawing.Point(162, 166); this.LineStart_A.Location = new System.Drawing.Point(164, 143);
this.LineStart_A.Name = "LineStart_A"; this.LineStart_A.Name = "LineStart_A";
this.LineStart_A.Size = new System.Drawing.Size(135, 34); this.LineStart_A.Size = new System.Drawing.Size(135, 34);
this.LineStart_A.TabIndex = 255; this.LineStart_A.TabIndex = 255;
...@@ -415,7 +577,7 @@ namespace OnlineStore.XLRStore ...@@ -415,7 +577,7 @@ namespace OnlineStore.XLRStore
this.btnCloseAll.BackColor = System.Drawing.Color.Red; this.btnCloseAll.BackColor = System.Drawing.Color.Red;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(303, 378); this.btnCloseAll.Location = new System.Drawing.Point(163, 263);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(135, 34); this.btnCloseAll.Size = new System.Drawing.Size(135, 34);
this.btnCloseAll.TabIndex = 259; this.btnCloseAll.TabIndex = 259;
...@@ -457,7 +619,7 @@ namespace OnlineStore.XLRStore ...@@ -457,7 +619,7 @@ namespace OnlineStore.XLRStore
this.txtDOIndex.Location = new System.Drawing.Point(386, 47); this.txtDOIndex.Location = new System.Drawing.Point(386, 47);
this.txtDOIndex.MaxLength = 10; this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex"; this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(47, 27); this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
this.txtDOIndex.TabIndex = 260; this.txtDOIndex.TabIndex = 260;
this.txtDOIndex.Text = "0"; this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false; this.txtDOIndex.Visible = false;
...@@ -469,7 +631,7 @@ namespace OnlineStore.XLRStore ...@@ -469,7 +631,7 @@ namespace OnlineStore.XLRStore
this.txtDoName.Location = new System.Drawing.Point(386, 64); this.txtDoName.Location = new System.Drawing.Point(386, 64);
this.txtDoName.MaxLength = 10; this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName"; this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(53, 27); this.txtDoName.Size = new System.Drawing.Size(53, 23);
this.txtDoName.TabIndex = 259; this.txtDoName.TabIndex = 259;
this.txtDoName.Text = "0"; this.txtDoName.Text = "0";
this.txtDoName.Visible = false; this.txtDoName.Visible = false;
...@@ -481,7 +643,7 @@ namespace OnlineStore.XLRStore ...@@ -481,7 +643,7 @@ namespace OnlineStore.XLRStore
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(364, 27); this.lblAddr.Location = new System.Drawing.Point(364, 27);
this.lblAddr.Name = "lblAddr"; this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(56, 20); this.lblAddr.Size = new System.Drawing.Size(46, 17);
this.lblAddr.TabIndex = 258; this.lblAddr.TabIndex = 258;
this.lblAddr.Text = "设备IP:"; this.lblAddr.Text = "设备IP:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -505,7 +667,7 @@ namespace OnlineStore.XLRStore ...@@ -505,7 +667,7 @@ namespace OnlineStore.XLRStore
this.txtSlaveId.Location = new System.Drawing.Point(427, 24); this.txtSlaveId.Location = new System.Drawing.Point(427, 24);
this.txtSlaveId.MaxLength = 10; this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId"; this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 27); this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
this.txtSlaveId.TabIndex = 255; this.txtSlaveId.TabIndex = 255;
this.txtSlaveId.Text = "0"; this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false; this.txtSlaveId.Visible = false;
...@@ -545,7 +707,7 @@ namespace OnlineStore.XLRStore ...@@ -545,7 +707,7 @@ namespace OnlineStore.XLRStore
this.txtWriteTime.Location = new System.Drawing.Point(82, 61); this.txtWriteTime.Location = new System.Drawing.Point(82, 61);
this.txtWriteTime.MaxLength = 10; this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime"; this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(60, 27); this.txtWriteTime.Size = new System.Drawing.Size(60, 23);
this.txtWriteTime.TabIndex = 238; this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0"; this.txtWriteTime.Text = "0";
// //
...@@ -556,7 +718,7 @@ namespace OnlineStore.XLRStore ...@@ -556,7 +718,7 @@ namespace OnlineStore.XLRStore
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(17, 64); this.label5.Location = new System.Drawing.Point(17, 64);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(74, 20); this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237; this.label5.TabIndex = 237;
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -621,9 +783,9 @@ namespace OnlineStore.XLRStore ...@@ -621,9 +783,9 @@ namespace OnlineStore.XLRStore
// //
this.tabPage3.Controls.Add(this.panBase); this.tabPage3.Controls.Add(this.panBase);
this.tabPage3.Controls.Add(this.groupBox6); this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 29); this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(986, 558); this.tabPage3.Size = new System.Drawing.Size(986, 561);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "状态信息"; this.tabPage3.Text = "状态信息";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -664,7 +826,7 @@ namespace OnlineStore.XLRStore ...@@ -664,7 +826,7 @@ namespace OnlineStore.XLRStore
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(454, 11); this.chbMoveStop.Location = new System.Drawing.Point(454, 11);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(104, 28); this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 262; this.chbMoveStop.TabIndex = 262;
this.chbMoveStop.Text = "暂停运动"; this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
...@@ -688,7 +850,7 @@ namespace OnlineStore.XLRStore ...@@ -688,7 +850,7 @@ namespace OnlineStore.XLRStore
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(365, 11); this.chbDebug.Location = new System.Drawing.Point(365, 11);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(104, 28); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247; this.chbDebug.TabIndex = 247;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -703,7 +865,7 @@ namespace OnlineStore.XLRStore ...@@ -703,7 +865,7 @@ namespace OnlineStore.XLRStore
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(543, 13); this.lblStoreStatus.Location = new System.Drawing.Point(543, 13);
this.lblStoreStatus.Name = "lblStoreStatus"; this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(82, 24); this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245; this.lblStoreStatus.TabIndex = 245;
this.lblStoreStatus.Text = "等待启动"; this.lblStoreStatus.Text = "等待启动";
this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -850,7 +1012,7 @@ namespace OnlineStore.XLRStore ...@@ -850,7 +1012,7 @@ namespace OnlineStore.XLRStore
this.lblNGState.AutoSize = true; this.lblNGState.AutoSize = true;
this.lblNGState.Location = new System.Drawing.Point(576, 77); this.lblNGState.Location = new System.Drawing.Point(576, 77);
this.lblNGState.Name = "lblNGState"; this.lblNGState.Name = "lblNGState";
this.lblNGState.Size = new System.Drawing.Size(77, 20); this.lblNGState.Size = new System.Drawing.Size(63, 17);
this.lblNGState.TabIndex = 292; this.lblNGState.TabIndex = 292;
this.lblNGState.Text = "NG箱状态"; this.lblNGState.Text = "NG箱状态";
// //
...@@ -863,7 +1025,7 @@ namespace OnlineStore.XLRStore ...@@ -863,7 +1025,7 @@ namespace OnlineStore.XLRStore
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(566, 30); this.checkBox1.Location = new System.Drawing.Point(566, 30);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(194, 28); this.checkBox1.Size = new System.Drawing.Size(154, 24);
this.checkBox1.TabIndex = 291; this.checkBox1.TabIndex = 291;
this.checkBox1.Text = "检测到料串自动入库"; this.checkBox1.Text = "检测到料串自动入库";
this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.UseVisualStyleBackColor = true;
...@@ -876,7 +1038,7 @@ namespace OnlineStore.XLRStore ...@@ -876,7 +1038,7 @@ namespace OnlineStore.XLRStore
this.cmbOutstorePos.FormattingEnabled = true; this.cmbOutstorePos.FormattingEnabled = true;
this.cmbOutstorePos.Location = new System.Drawing.Point(104, 70); this.cmbOutstorePos.Location = new System.Drawing.Point(104, 70);
this.cmbOutstorePos.Name = "cmbOutstorePos"; this.cmbOutstorePos.Name = "cmbOutstorePos";
this.cmbOutstorePos.Size = new System.Drawing.Size(142, 31); this.cmbOutstorePos.Size = new System.Drawing.Size(142, 28);
this.cmbOutstorePos.TabIndex = 290; this.cmbOutstorePos.TabIndex = 290;
// //
// cmbInstorePos // cmbInstorePos
...@@ -886,7 +1048,7 @@ namespace OnlineStore.XLRStore ...@@ -886,7 +1048,7 @@ namespace OnlineStore.XLRStore
this.cmbInstorePos.FormattingEnabled = true; this.cmbInstorePos.FormattingEnabled = true;
this.cmbInstorePos.Location = new System.Drawing.Point(266, 28); this.cmbInstorePos.Location = new System.Drawing.Point(266, 28);
this.cmbInstorePos.Name = "cmbInstorePos"; this.cmbInstorePos.Name = "cmbInstorePos";
this.cmbInstorePos.Size = new System.Drawing.Size(142, 31); this.cmbInstorePos.Size = new System.Drawing.Size(142, 28);
this.cmbInstorePos.TabIndex = 289; this.cmbInstorePos.TabIndex = 289;
// //
// btnOutStoreTest // btnOutStoreTest
...@@ -912,7 +1074,7 @@ namespace OnlineStore.XLRStore ...@@ -912,7 +1074,7 @@ namespace OnlineStore.XLRStore
"B下暂存区"}); "B下暂存区"});
this.cmbOutStartP.Location = new System.Drawing.Point(9, 70); this.cmbOutStartP.Location = new System.Drawing.Point(9, 70);
this.cmbOutStartP.Name = "cmbOutStartP"; this.cmbOutStartP.Name = "cmbOutStartP";
this.cmbOutStartP.Size = new System.Drawing.Size(90, 31); this.cmbOutStartP.Size = new System.Drawing.Size(90, 28);
this.cmbOutStartP.TabIndex = 287; this.cmbOutStartP.TabIndex = 287;
this.cmbOutStartP.SelectedIndexChanged += new System.EventHandler(this.cmbOutShelf_SelectedIndexChanged); this.cmbOutStartP.SelectedIndexChanged += new System.EventHandler(this.cmbOutShelf_SelectedIndexChanged);
// //
...@@ -922,7 +1084,7 @@ namespace OnlineStore.XLRStore ...@@ -922,7 +1084,7 @@ namespace OnlineStore.XLRStore
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(251, 74); this.label2.Location = new System.Drawing.Point(251, 74);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(39, 24); this.label2.Size = new System.Drawing.Size(31, 20);
this.label2.TabIndex = 286; this.label2.TabIndex = 286;
this.label2.Text = "-->"; this.label2.Text = "-->";
// //
...@@ -938,7 +1100,7 @@ namespace OnlineStore.XLRStore ...@@ -938,7 +1100,7 @@ namespace OnlineStore.XLRStore
"B周转箱外侧"}); "B周转箱外侧"});
this.cmbOutShelf.Location = new System.Drawing.Point(287, 70); this.cmbOutShelf.Location = new System.Drawing.Point(287, 70);
this.cmbOutShelf.Name = "cmbOutShelf"; this.cmbOutShelf.Name = "cmbOutShelf";
this.cmbOutShelf.Size = new System.Drawing.Size(121, 31); this.cmbOutShelf.Size = new System.Drawing.Size(121, 28);
this.cmbOutShelf.TabIndex = 285; this.cmbOutShelf.TabIndex = 285;
// //
// BtnInStoreTest // BtnInStoreTest
...@@ -964,7 +1126,7 @@ namespace OnlineStore.XLRStore ...@@ -964,7 +1126,7 @@ namespace OnlineStore.XLRStore
"B上暂存区"}); "B上暂存区"});
this.cmbInstoreTargetP.Location = new System.Drawing.Point(171, 28); this.cmbInstoreTargetP.Location = new System.Drawing.Point(171, 28);
this.cmbInstoreTargetP.Name = "cmbInstoreTargetP"; this.cmbInstoreTargetP.Name = "cmbInstoreTargetP";
this.cmbInstoreTargetP.Size = new System.Drawing.Size(90, 31); this.cmbInstoreTargetP.Size = new System.Drawing.Size(90, 28);
this.cmbInstoreTargetP.TabIndex = 2; this.cmbInstoreTargetP.TabIndex = 2;
this.cmbInstoreTargetP.SelectedIndexChanged += new System.EventHandler(this.cmbInstoreTargetP_SelectedIndexChanged); this.cmbInstoreTargetP.SelectedIndexChanged += new System.EventHandler(this.cmbInstoreTargetP_SelectedIndexChanged);
// //
...@@ -974,7 +1136,7 @@ namespace OnlineStore.XLRStore ...@@ -974,7 +1136,7 @@ namespace OnlineStore.XLRStore
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(135, 32); this.label1.Location = new System.Drawing.Point(135, 32);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(39, 24); this.label1.Size = new System.Drawing.Size(31, 20);
this.label1.TabIndex = 1; this.label1.TabIndex = 1;
this.label1.Text = "-->"; this.label1.Text = "-->";
// //
...@@ -987,7 +1149,7 @@ namespace OnlineStore.XLRStore ...@@ -987,7 +1149,7 @@ namespace OnlineStore.XLRStore
"上料口"}); "上料口"});
this.cmbInstoreShelf.Location = new System.Drawing.Point(9, 28); this.cmbInstoreShelf.Location = new System.Drawing.Point(9, 28);
this.cmbInstoreShelf.Name = "cmbInstoreShelf"; this.cmbInstoreShelf.Name = "cmbInstoreShelf";
this.cmbInstoreShelf.Size = new System.Drawing.Size(121, 31); this.cmbInstoreShelf.Size = new System.Drawing.Size(121, 28);
this.cmbInstoreShelf.TabIndex = 0; this.cmbInstoreShelf.TabIndex = 0;
// //
// tabControl1 // tabControl1
...@@ -1006,7 +1168,7 @@ namespace OnlineStore.XLRStore ...@@ -1006,7 +1168,7 @@ namespace OnlineStore.XLRStore
// //
// FrmInputEquip // FrmInputEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1000, 596); this.ClientSize = new System.Drawing.Size(1000, 596);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
...@@ -1110,6 +1272,17 @@ namespace OnlineStore.XLRStore ...@@ -1110,6 +1272,17 @@ namespace OnlineStore.XLRStore
private System.Windows.Forms.Button button7; private System.Windows.Forms.Button button7;
private System.Windows.Forms.Label lblNGState; private System.Windows.Forms.Label lblNGState;
private System.Windows.Forms.Button button9; private System.Windows.Forms.Button button9;
private System.Windows.Forms.Button btnTranverUp;
private System.Windows.Forms.Button btnTranverDown;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Button btnTranverBackRun;
private System.Windows.Forms.Button btnTranverRun;
private System.Windows.Forms.Button button10;
private System.Windows.Forms.Button button14;
private System.Windows.Forms.Button button13;
private System.Windows.Forms.Button button12;
private System.Windows.Forms.Button button11;
private System.Windows.Forms.Button button15;
} }
} }
source/XLRStoreClient/inputForm/FrmInputEquip.cs
...@@ -32,6 +32,11 @@ namespace OnlineStore.XLRStore ...@@ -32,6 +32,11 @@ namespace OnlineStore.XLRStore
Control.CheckForIllegalCrossThreadCalls = false; Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent(); InitializeComponent();
LoadIOList(); LoadIOList();
this.inputEquip.turnoverBoxes.ForEach(box =>
{
comboBox1.Items.Add(box.Name);
});
comboBox1.SelectedIndex = 0;
} }
protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>(); protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>(); protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
...@@ -180,9 +185,9 @@ namespace OnlineStore.XLRStore ...@@ -180,9 +185,9 @@ namespace OnlineStore.XLRStore
{ {
this.Invoke(new Action(() => this.Invoke(new Action(() =>
{ {
if(inputEquip.GetNGBoxState(out string state)) if (inputEquip.GetNGBoxState(out string state))
{ {
lblNGState.BackColor =Color.White; lblNGState.BackColor = Color.White;
} }
else else
{ {
...@@ -540,32 +545,6 @@ namespace OnlineStore.XLRStore ...@@ -540,32 +545,6 @@ namespace OnlineStore.XLRStore
} }
private void Shelf_StopUp_B_Click(object sender, EventArgs e)
{
}
private void Shelf_StopDown_B_Click(object sender, EventArgs e)
{
}
private void LineStart_B_Click(object sender, EventArgs e)
{
}
private void LineBack_B_Click(object sender, EventArgs e)
{
}
private void LineStop_B_Click(object sender, EventArgs e)
{
}
private void btnSave_Click(object sender, EventArgs e) private void btnSave_Click(object sender, EventArgs e)
{ {
StoreManager.SaveInputEquipConfig(inputEquip.Config); StoreManager.SaveInputEquipConfig(inputEquip.Config);
...@@ -773,6 +752,91 @@ namespace OnlineStore.XLRStore ...@@ -773,6 +752,91 @@ namespace OnlineStore.XLRStore
{ {
inputEquip.ClearNGBoxCnt(); inputEquip.ClearNGBoxCnt();
} }
private void groupDO_Enter(object sender, EventArgs e)
{
}
private void button10_Click(object sender, EventArgs e)
{
turnoverBox?.TranverseUp();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
TurnoverBox turnoverBox;
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if(comboBox1.SelectedIndex>=0)
{
turnoverBox = inputEquip.turnoverBoxes[comboBox1.SelectedIndex];
LogUtil.info(inputEquip.BatchMove.Name + "选择：" + turnoverBox?.Name);
}
}
private void btnTranverRun_Click(object sender, EventArgs e)
{
turnoverBox?.TranverseRun();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void btnTranverBackRun_Click(object sender, EventArgs e)
{
turnoverBox?.TranverseBackRun();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void btnTranverDown_Click(object sender, EventArgs e)
{
turnoverBox?.TranverseDown();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void button13_Click(object sender, EventArgs e)
{
turnoverBox?.Transition_RollerRun();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void button14_Click(object sender, EventArgs e)
{
turnoverBox?.Transition_RollerBackRun();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void button15_Click(object sender, EventArgs e)
{
turnoverBox?.Transition_RollerStopRun();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void button10_Click_1(object sender, EventArgs e)
{
turnoverBox?.Transition_RollerStopRun();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void button11_Click(object sender, EventArgs e)
{
turnoverBox?.StopUp();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void button12_Click(object sender, EventArgs e)
{
turnoverBox?.StopDown();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!