Skip to content

李娜 / SO827-OutletEquip

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

界面调整。1024X768

1 个父辈 98426437
内嵌 并排
正在显示 19 个修改的文件 包含 439 行增加 和 451 行删除
source/DeviceLibrary/StoreConfig/StoreConfig.csv
......@@ -38,8 +38,8 @@ PRO,0,上料口工位3料架RFIDIP,RFID_IP3,192.168.103.13,,,,,,,,,,,,
PRO,0,上料口工位1AGV节点名称,AgvName1,D1,,,,,,,,,,,,
PRO,0,上料口工位2AGV节点名称,AgvName2,D2,,,,,,,,,,,,
PRO,0,上料口工位3AGV节点名称,AgvName3,D3,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,,
PRO,0,出出料多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,,
PRO,0,出出料多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,,
PRO,0,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,,,,,,
PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,,
PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,,,,,,
......
source/DeviceLibrary/agvClient/AgvClient.cs
......@@ -105,7 +105,7 @@ namespace OnlineStore.DeviceLibrary
UpdateAction(id, ClientAction.Ready);
// RFIDData data = new RFIDData(content);
LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + rfid + "] ");
WorkStation equip = getFeedEquip(id);
WorkStation equip = getWorkStation(id);
if (equip == null)
{
......@@ -120,7 +120,7 @@ namespace OnlineStore.DeviceLibrary
UpdateAction(id, ClientAction.Arrive);
// RFIDData data = new RFIDData(content);
LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + rfid + "] ");
WorkStation equip = getFeedEquip(id);
WorkStation equip = getWorkStation(id);
if (equip == null)
{
LogUtil.error("收到 AgvClient_Ready [" + id + "] [" + rfid + "] 未找到对应的设备 ，暂不处理 ");
......@@ -129,9 +129,9 @@ namespace OnlineStore.DeviceLibrary
equip.AgvArrive(id, rfid);
}
private static WorkStation getFeedEquip(string nodeId)
private static WorkStation getWorkStation(string nodeId)
{
foreach (WorkStation shelf in EquipManager.Equip.ShelfMap.Values)
foreach (WorkStation shelf in EquipManager.Equip.StationMap.Values)
{
if (shelf.AgvName.Equals(nodeId) )
{
......
source/DeviceLibrary/bean/EquipBean.cs
......@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary
private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
private System.Timers.Timer ledProcessTimer = new System.Timers.Timer();
public Dictionary<int, WorkStation> ShelfMap = new Dictionary<int, WorkStation>();
public Dictionary<int, WorkStation> StationMap = new Dictionary<int, WorkStation>();
public void InitTimer()
{
......@@ -90,10 +90,10 @@ namespace OnlineStore.DeviceLibrary
AgvClient.NodeList.Add(config.AgvName1);
AgvClient.NodeList.Add(config.AgvName2);
AgvClient.NodeList.Add(config.AgvName3);
ShelfMap = new Dictionary<int, WorkStation>();
ShelfMap.Add(1, new WorkStation("S1_", config.AgvName1,config.RFID_IP1));
ShelfMap.Add(2, new WorkStation("S2_", config.AgvName2,config.RFID_IP2));
ShelfMap.Add(3, new WorkStation("S3_", config.AgvName3,config.RFID_IP3));
StationMap = new Dictionary<int, WorkStation>();
StationMap.Add(1, new WorkStation("S1_", config.AgvName1,config.RFID_IP1));
StationMap.Add(2, new WorkStation("S2_", config.AgvName2,config.RFID_IP2));
StationMap.Add(3, new WorkStation("S3_", config.AgvName3,config.RFID_IP3));
HCBoardManager.InitConfig();
IOManager.Init();
......@@ -266,7 +266,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(MoveStep.R03_InOutToP1);
LogInfo( "" + MoveInfo.MoveType + "：进出轴到待机点P1["+ Config.InOutAxis_P1 + "]，料架开始复位");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
foreach(WorkStation obj in ShelfMap.Values)
foreach(WorkStation obj in StationMap.Values)
{
obj.CurrShelf.IsBusy = false;
obj.Reset();
......@@ -754,7 +754,7 @@ namespace OnlineStore.DeviceLibrary
ShowTimeLog("轴报警检测完成");
}
foreach (WorkStation shelf in ShelfMap.Values)
foreach (WorkStation shelf in StationMap.Values)
{
shelf.TimerProcess();
}
......@@ -813,7 +813,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error(Name + "处理出入库排队列表出错：" + ex.ToString());
LogUtil.error(Name + "InShelfProcess：" + ex.ToString());
}
}
internal string GetShelfPosId()
......@@ -822,7 +822,7 @@ namespace OnlineStore.DeviceLibrary
if (CurrTray != null)
{
foreach (WorkStation obj in ShelfMap.Values)
foreach (WorkStation obj in StationMap.Values)
{
if (obj.IsRightShelf(CurrTray, out str))
{
......@@ -837,7 +837,7 @@ namespace OnlineStore.DeviceLibrary
private string ReadyShelf()
{
string str = "";
foreach (WorkStation shelf in ShelfMap.Values)
foreach (WorkStation shelf in StationMap.Values)
{
if (shelf.IsReady())
{
......@@ -849,7 +849,7 @@ namespace OnlineStore.DeviceLibrary
private void StartMove()
{
LogInfo("开始执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】");
bool result = StartInStoreMove(new InOutParam(LineConnect.DoorPosInfo));
bool result = StartOutMove(new InOutParam(LineConnect.DoorPosInfo));
if (!result)
{
LogInfo(" 执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】失败");
......@@ -952,7 +952,7 @@ namespace OnlineStore.DeviceLibrary
msg += "状态： " + storeRunStatus + "\t " + " " + storeStatus + "\n";
msg += "alarm： " + alarmType + "\n";
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + "\n";
foreach(WorkStation shelf in ShelfMap.Values)
foreach(WorkStation shelf in StationMap.Values)
{
msg += shelf.Name + ": " + shelf.CurrShelf.ToStr()+"\r\n";
}
......@@ -960,8 +960,7 @@ namespace OnlineStore.DeviceLibrary
}
#region 入库命令处理
#region 出料命令处理
public void CylinderMove(string IoLowType, string IoHighType, StoreMoveInfo moveInfo = null)
{
......@@ -1034,7 +1033,7 @@ namespace OnlineStore.DeviceLibrary
// 绿 黄 红
//机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭
//机器出入库中 闪 闪 灭
//机器出出料中 闪 闪 灭
//温湿度超限报警中 亮 闪 灭
//温湿度超限报警中超过30分钟 亮 闪 闪
//机器未启动 灭 灭 灭
......@@ -1093,7 +1092,7 @@ namespace OnlineStore.DeviceLibrary
}
}
//忙碌中，判断是否有移栽在出入库执行，绿灯闪烁
//忙碌中，判断是否有移栽在出出料执行，绿灯闪烁
if (isInOut)
{
if (IsDoValue(IO_Type.AutoRun_HddLed, IO_VALUE.LOW))
......
source/DeviceLibrary/bean/EquipBean_Partial.cs
......@@ -11,7 +11,7 @@ namespace OnlineStore.DeviceLibrary
partial class EquipBean
{
#region 自动入库参数
#region 自动出料参数
public List<string> PositionNumList = new List<string>();
public bool autoNext = false;
......@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
public int AutoStartIndex = -1;
#endregion
#region 入库参数
#region 出料参数
private int CurrInOutCount = 0;
......@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary
ShelfPosition position = param.GetACPosition();
if (position == null)
{
LogUtil.error( Name + "入库时发现param中取到的Position=null,没有库位不能执行入库");
LogUtil.error( Name + "出料时发现param中取到的Position=null,没有库位不能执行出料");
return false;
}
......@@ -85,7 +85,7 @@ namespace OnlineStore.DeviceLibrary
ShelfPosition position = param.GetACPosition();
if (position == null)
{
LogUtil.error( Name + "入库时发现param中取到的Position=null,没有库位不能执行入库");
LogUtil.error( Name + "出料时发现param中取到的Position=null,没有库位不能执行出料");
return false;
}
if (param.PosInfo.PlateH <= 0)
......@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
#endregion
#region 入库结果验证
#region 出料结果验证
private DateTime preRWTime = DateTime.Now;
public void CheckWait(StoreMoveInfo checkmove)
......@@ -243,27 +243,27 @@ namespace OnlineStore.DeviceLibrary
#endregion
#region 入库
#region 出料
private DateTime startInStoreTime = DateTime.Now;
private DateTime startMoveTime = DateTime.Now;
public override bool StartInStoreMove(InOutParam param)
public override bool StartOutMove(InOutParam param)
{
startInStoreTime = DateTime.Now;
startMoveTime = DateTime.Now;
string posId = param != null ? param.PosInfo.ShelfPosId : "";
if (storeRunStatus == StoreRunStatus.Runing)
{
if (!LoadParamPosition(param))
{
LogUtil.error(Name + " 启动入库【" + posId + "】出错，找不到库位信息");
LogUtil.error(Name + " 启动出料【" + posId + "】出错，找不到库位信息");
return false ;
}
if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
LogUtil.error(Name + " 启动入库【" + posId + "】出错，叉子料盘检测有料");
LogUtil.error(Name + " 启动出料【" + posId + "】出错，叉子料盘检测有料");
return false ;
}
LogInfo( " 启动入库【" + posId + "】");
LogInfo( " 启动出料【" + posId + "】");
storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute;
MoveInfo.NewMove(StoreMoveType.InStore, param);
......@@ -282,7 +282,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.error(Name + " 启动【" + posId + "】入库出错，当前状态，storeStatus=" + storeRunStatus);
LogUtil.error(Name + " 启动【" + posId + "】出料出错，当前状态，storeStatus=" + storeRunStatus);
}
return false;
}
......@@ -327,10 +327,10 @@ namespace OnlineStore.DeviceLibrary
//判断仓门是否打开
MoveInfo.NextMoveStep(MoveStep.SI_14_InoutToP2);
InStoreLog(" 叉子进入入料口，进出轴至P2(进料口取料点) "+ movep.InOut_P2);
InStoreLog(" 叉子进入出料口，进出轴至P2(进料口取料点) "+ movep.InOut_P2);
ACAxisMove(Config.InOut_Axis, movep.InOut_P2, Config.InOutAxis_P2_Speed);
}
protected override void InStoreProcess()
protected override void OutProcess()
{
LineMoveP moveP = MoveInfo.MoveParam.MoveP;
if (MoveInfo.IsInWait)
......@@ -472,7 +472,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(MoveStep.SI_25_GoBack);
InStoreLog(" 返回待机点，轴2/轴1/轴4动作至P1，判断料架是否需要离开");
foreach(WorkStation obj in ShelfMap.Values)
foreach(WorkStation obj in StationMap.Values)
{
if (obj.CurrShelf.IsBusy)
{
......@@ -493,7 +493,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsStep(MoveStep.SI_26_WaitNoReel))
{
TimeSpan span = DateTime.Now - startInStoreTime;
TimeSpan span = DateTime.Now - startMoveTime;
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ShelfPosId : "";
LogInfo(" 【" + posId + "】 整个流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveInfo.EndMove();
......@@ -541,7 +541,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsStep(MoveStep.SI_36_WaitNoReel))
{
TimeSpan span = DateTime.Now - startInStoreTime;
TimeSpan span = DateTime.Now - startMoveTime;
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ShelfPosId : "";
LogInfo(" 【" + posId + "】 整个流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveInfo.EndMove();
......@@ -578,13 +578,13 @@ namespace OnlineStore.DeviceLibrary
if (AutoStartIndex >= 0 && AutoStartIndex < PositionNumList.Count)
{
newIndex = AutoStartIndex;
LogInfo("下一个索引不存在，重新开始自动入库，索引【" + AutoStartIndex + "】");
LogInfo("下一个索引不存在，重新开始自动出料，索引【" + AutoStartIndex + "】");
}
else
{
autoNext = false;
autoMsg = "自动入库结束！";
LogInfo("下一个索引不存在，自动 入库结束！");
autoMsg = "自动出料结束！";
LogInfo("下一个索引不存在，自动 出料结束！");
return;
}
}
......@@ -592,9 +592,9 @@ namespace OnlineStore.DeviceLibrary
string posid = PositionNumList[autoPositionIndex];
InOutPosInfo inoutinfo = new InOutPosInfo(autoCode, posid);
LogInfo("自动进入下一个入库：posid=" + posid);
autoMsg = "自动入库：" + posid;
StartInStoreMove(new InOutParam(inoutinfo));
LogInfo("自动进入下一个出料：posid=" + posid);
autoMsg = "自动出料：" + posid;
StartOutMove(new InOutParam(inoutinfo));
}
......
source/DeviceLibrary/lineConnect/LineConnect.cs
......@@ -130,7 +130,7 @@ namespace OnlineStore.DeviceLibrary
LastUpdateTime = DateTime.Now;
if (cmd.Equals(cmd_startIn))
{
LogUtil.info("[" + CID + "]收到流水线入库消息：" + message);
LogUtil.info("[" + CID + "]收到流水线消息：" + message);
InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.IsNg, reviceInfo.PosId,reviceInfo.rfid);
string logName = "收到流水线命令【 " + inout.ToStr() + "】：";
......@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (cmd.Equals(cmd_checStartIn))
{
LogUtil.info("[" + CID + "]收到流水线入库库位验证消息：" + message);
LogUtil.info("[" + CID + "]收到流水线验证消息：" + message);
}
}
}
......
source/DeviceLibrary/mananger/RFIDManager.cs
......@@ -72,7 +72,10 @@ namespace OnlineStore.DeviceLibrary
{
try
{
readAll.Stop();
if (readAll != null)
{
readAll.Stop();
}
}
catch (Exception ex)
{
......
source/DeviceLibrary/model/EquipBase.cs
......@@ -16,9 +16,9 @@ namespace OnlineStore.DeviceLibrary
public abstract class EquipBase
{
/// <summary>
///1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///1=设备联机（正常就绪）（出料后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///2=急停，3=故障，4=警告，5=调试
/// 6=入库执行中,7=入仓完成，8=入仓失败
/// 6=出料执行中,7=入仓完成，8=入仓失败
/// 9=出库执行，10=出仓完成，11=出库失败
/// </summary>
public StoreStatus storeStatus = StoreStatus.ResetMove;
......@@ -72,7 +72,7 @@ namespace OnlineStore.DeviceLibrary
switch (MoveInfo.MoveType)
{
case StoreMoveType.InStore:
InStoreProcess();
OutProcess();
isInPro = false;
break;
......@@ -269,9 +269,9 @@ namespace OnlineStore.DeviceLibrary
protected abstract void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e);
#region 入库
public abstract bool StartInStoreMove(InOutParam param);
protected abstract void InStoreProcess();
#region 出料
public abstract bool StartOutMove(InOutParam param);
protected abstract void OutProcess();
#endregion
......@@ -300,7 +300,7 @@ namespace OnlineStore.DeviceLibrary
}
if (storeRunStatus > StoreRunStatus.Wait)
{
//"0":"急停中", "1":"设备联机", "2":"故障中", "3":"入库执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中",
//"0":"急停中", "1":"设备联机", "2":"故障中", "3":"出料执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中",
switch (storeStatus)
{
case StoreStatus.Debugging:
......@@ -310,7 +310,7 @@ namespace OnlineStore.DeviceLibrary
aa = "料盘入仓位完成";
break;
case StoreStatus.InStoreExecute:
aa = "入库执行中";
aa = "出料执行中";
break;
case StoreStatus.InTrouble:
aa = "故障中";
......@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
aa = "出库完成";
break;
case StoreStatus.InStoreFaild:
aa = "入库失败（" + WarnMsg + "）";
aa = "出料失败（" + WarnMsg + "）";
break;
case StoreStatus.OutStoreFaild:
aa = "出库失败（" + WarnMsg + "）";
......@@ -346,7 +346,7 @@ namespace OnlineStore.DeviceLibrary
string inout = "";
if (MoveInfo.MoveType.Equals(StoreMoveType.InStore)&& MoveInfo.MoveParam!=null&& MoveInfo.MoveParam.PosInfo!=null)
{
inout = "_入库："+MoveInfo.MoveParam.PosInfo.ToStr();
inout = "_出料："+MoveInfo.MoveParam.PosInfo.ToStr();
}
else
......
source/DeviceLibrary/model/StoreMoveInfo.cs
......@@ -10,7 +10,7 @@ using System.Text;
namespace OnlineStore.DeviceLibrary
{
/// <summary>
/// 料仓当前运动信息类（出入库状态，步骤记录）
/// 料仓当前运动信息类（出出料状态，步骤记录）
/// </summary>
public class StoreMoveInfo
{
......@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
/// <summary>
///出入库参数
///出出料参数
/// </summary>
public InOutParam MoveParam { get; set; }
/// <summary>
......@@ -149,7 +149,7 @@ namespace OnlineStore.DeviceLibrary
public List<WaitResultInfo> WaitList = new List<WaitResultInfo>();
/// <summary>
/// 重置之后继续出入库时，退回上一个步骤执行
/// 重置之后继续出出料时，退回上一个步骤执行
/// </summary>
public void BackStep()
{
......@@ -349,7 +349,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
None = 0,
/// <summary>
/// 入库
/// 出料
/// </summary>
InStore = 1,
......
source/DeviceLibrary/model/StoreStep.cs
......@@ -45,9 +45,9 @@ namespace OnlineStore.DeviceLibrary
}
/// <summary>
///1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///1=设备联机（正常就绪）（出料后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///2=急停，3=故障，4=警告，5=调试
/// 6=入库执行中,7=入仓完成，8=入仓失败
/// 6=出料执行中,7=入仓完成，8=入仓失败
/// 9=出库执行，10=出仓完成，11=出库失败
/// 12=重置中（原点返回和重置都发此状态）
/// 13=库位盘点中
......@@ -55,7 +55,7 @@ namespace OnlineStore.DeviceLibrary
public enum StoreStatus
{
/// <summary>
/// 1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
/// 1=设备联机（正常就绪）（出料后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
/// </summary>
StoreOnline = 1,
/// <summary>
......@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
Debugging = 5,
/// <summary>
/// 6=入库执行中
/// 6=出料执行中
/// </summary>
InStoreExecute = 6,
/// <summary>
......@@ -83,7 +83,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
InStoreEnd = 7,
/// <summary>
/// 8=入库失败
/// 8=出料失败
/// </summary>
InStoreFaild = 8,
/// <summary>
......@@ -160,77 +160,77 @@ namespace OnlineStore.DeviceLibrary
#region 入料
#region 出料
/// <summary>
/// 入料：等待入口检测有料
/// 出料：等待入口检测有料
/// </summary>
SI_01_TrayCheck = 201,
/// <summary>
///入料：获取料架库位号
///出料：获取料架库位号
/// </summary>
SI_02_GetPosition,
/// <summary>
///入料：等待料架准备完成
///出料：等待料架准备完成
/// </summary>
SI_03_WaitShelf,
/// <summary>
///入料：顶升气缸上升
///出料：顶升气缸上升
/// </summary>
SI_04_LocationUp,
/// <summary>
/// 入料：进出轴（叉子）先返回P1
/// 出料：进出轴（叉子）先返回P1
/// </summary>
SI_11_InOutToP1 = 211,
/// <summary>
/// 入料：所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
/// 出料：所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
/// </summary>
SI_12_AxisToP1,
/// <summary>
/// 入料：压紧物品 压紧轴到P3(压紧前点)
/// 出料：压紧物品 压紧轴到P3(压紧前点)
/// </summary>
SI_13_ComToP3,
/// <summary>
/// 入料：叉子进入入料口，进出轴到P2
/// 出料：叉子进入出料口，进出轴到P2
/// </summary>
SI_14_InoutToP2,
/// <summary>
/// 入料：把物品放入叉子上，升降轴到P2,压紧物品，压紧轴到P2(压紧点)
/// 出料：把物品放入叉子上，升降轴到P2,压紧物品，压紧轴到P2(压紧点)
/// </summary>
SI_15_GetReel,
/// <summary>
/// 入料： 进出轴到P1（ 待机点）
/// 出料： 进出轴到P1（ 待机点）
/// </summary>
SI_16_InoutBack,
/// <summary>
/// 入料：等待检测到料盘
/// 出料：等待检测到料盘
/// </summary>
SI_17_TrayCheck,
/// <summary>
/// 入料到料架：移动到库位点，旋转轴到P2（ 库位点）升降轴到P3
/// 出料到料架：移动到库位点，旋转轴到P2（ 库位点）升降轴到P3
/// </summary>
SI_21_MoveToBag=221,
/// <summary>
/// 入料到料架：叉子进入库位中，进出轴到P3
/// 出料到料架：叉子进出料位中，进出轴到P3
/// </summary>
SI_22_InoutToP3,
/// <summary>
/// 入料到料架：放下物品，升降轴到P4 ,压紧轴到P3（ 压紧前点）
/// 出料到料架：放下物品，升降轴到P4 ,压紧轴到P3（ 压紧前点）
/// </summary>
SI_23_PutReel,
/// <summary>
/// 入料到料架：叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）
/// 出料到料架：叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）
/// </summary>
SI_24_InoutBack,
/// <summary>
/// 入料到料架：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
/// 出料到料架：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
/// </summary>
SI_25_GoBack,
/// <summary>
///入料到料架：等待叉子无信号
///出料到料架：等待叉子无信号
/// </summary>
SI_26_WaitNoReel,
......@@ -265,25 +265,7 @@ namespace OnlineStore.DeviceLibrary
#endregion
#region 料仓库位盘点
///// <summary>
///// 盘点 料叉回原点P1
///// </summary>
//SC_01_InOutAxisHome,
///// <summary>
///// 料叉背面移动到库位低点
///// </summary>
//SC_02_MoveToLBag,
///// <summary>
///// 料叉背面移动到库位高点
///// </summary>
//SC_03_MoveToHBag,
///// <summary>
///// 盘点仓位
///// </summary>
//SC_04_Inventory,
#endregion
#region 料仓校准位置
/// <summary>
......
source/HCSingleStore/FrmAxisDebug.Designer.cs
......@@ -68,7 +68,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(317, 77);
this.label1.Location = new System.Drawing.Point(299, 77);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(92, 17);
this.label1.TabIndex = 0;
......@@ -77,7 +77,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(317, 134);
this.label2.Location = new System.Drawing.Point(299, 134);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(92, 17);
this.label2.TabIndex = 1;
......@@ -86,7 +86,7 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(317, 192);
this.label3.Location = new System.Drawing.Point(299, 192);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(92, 17);
this.label3.TabIndex = 2;
......@@ -97,7 +97,7 @@
this.btnMiddleMove.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleMove.Location = new System.Drawing.Point(495, 63);
this.btnMiddleMove.Location = new System.Drawing.Point(477, 63);
this.btnMiddleMove.Name = "btnMiddleMove";
this.btnMiddleMove.Size = new System.Drawing.Size(140, 45);
this.btnMiddleMove.TabIndex = 4;
......@@ -110,7 +110,7 @@
//
this.txtMiddleSpeed.Enabled = false;
this.txtMiddleSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleSpeed.Location = new System.Drawing.Point(411, 72);
this.txtMiddleSpeed.Location = new System.Drawing.Point(393, 72);
this.txtMiddleSpeed.MaxLength = 10;
this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(81, 26);
......@@ -120,7 +120,7 @@
//
this.txtUpDownSpeed.Enabled = false;
this.txtUpDownSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownSpeed.Location = new System.Drawing.Point(411, 129);
this.txtUpDownSpeed.Location = new System.Drawing.Point(393, 129);
this.txtUpDownSpeed.MaxLength = 10;
this.txtUpDownSpeed.Name = "txtUpDownSpeed";
this.txtUpDownSpeed.Size = new System.Drawing.Size(81, 26);
......@@ -130,7 +130,7 @@
//
this.txtInOutSpeed.Enabled = false;
this.txtInOutSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutSpeed.Location = new System.Drawing.Point(411, 187);
this.txtInOutSpeed.Location = new System.Drawing.Point(393, 187);
this.txtInOutSpeed.MaxLength = 10;
this.txtInOutSpeed.Name = "txtInOutSpeed";
this.txtInOutSpeed.Size = new System.Drawing.Size(81, 26);
......@@ -141,7 +141,7 @@
this.btnUpDownMove.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownMove.Location = new System.Drawing.Point(495, 120);
this.btnUpDownMove.Location = new System.Drawing.Point(477, 120);
this.btnUpDownMove.Name = "btnUpDownMove";
this.btnUpDownMove.Size = new System.Drawing.Size(140, 45);
this.btnUpDownMove.TabIndex = 9;
......@@ -155,7 +155,7 @@
this.btnInOutMove.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutMove.Location = new System.Drawing.Point(495, 178);
this.btnInOutMove.Location = new System.Drawing.Point(477, 178);
this.btnInOutMove.Name = "btnInOutMove";
this.btnInOutMove.Size = new System.Drawing.Size(140, 45);
this.btnInOutMove.TabIndex = 10;
......@@ -169,7 +169,7 @@
this.btnInOutMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutMovej.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutMovej.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutMovej.Location = new System.Drawing.Point(638, 178);
this.btnInOutMovej.Location = new System.Drawing.Point(620, 178);
this.btnInOutMovej.Name = "btnInOutMovej";
this.btnInOutMovej.Size = new System.Drawing.Size(140, 45);
this.btnInOutMovej.TabIndex = 14;
......@@ -183,7 +183,7 @@
this.btnUpDownMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownMovej.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownMovej.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownMovej.Location = new System.Drawing.Point(638, 120);
this.btnUpDownMovej.Location = new System.Drawing.Point(620, 120);
this.btnUpDownMovej.Name = "btnUpDownMovej";
this.btnUpDownMovej.Size = new System.Drawing.Size(140, 45);
this.btnUpDownMovej.TabIndex = 13;
......@@ -197,7 +197,7 @@
this.btnMiddleMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleMovej.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleMovej.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleMovej.Location = new System.Drawing.Point(638, 63);
this.btnMiddleMovej.Location = new System.Drawing.Point(620, 63);
this.btnMiddleMovej.Name = "btnMiddleMovej";
this.btnMiddleMovej.Size = new System.Drawing.Size(140, 45);
this.btnMiddleMovej.TabIndex = 12;
......@@ -209,7 +209,7 @@
// button1
//
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(797, 358);
this.button1.Location = new System.Drawing.Point(779, 358);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37);
this.button1.TabIndex = 16;
......@@ -221,7 +221,7 @@
//
this.txtInOutPosition.Enabled = false;
this.txtInOutPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutPosition.Location = new System.Drawing.Point(782, 187);
this.txtInOutPosition.Location = new System.Drawing.Point(764, 187);
this.txtInOutPosition.MaxLength = 20;
this.txtInOutPosition.Name = "txtInOutPosition";
this.txtInOutPosition.Size = new System.Drawing.Size(108, 26);
......@@ -231,7 +231,7 @@
//
this.txtUpdownPosition.Enabled = false;
this.txtUpdownPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownPosition.Location = new System.Drawing.Point(782, 129);
this.txtUpdownPosition.Location = new System.Drawing.Point(764, 129);
this.txtUpdownPosition.MaxLength = 20;
this.txtUpdownPosition.Name = "txtUpdownPosition";
this.txtUpdownPosition.Size = new System.Drawing.Size(108, 26);
......@@ -241,7 +241,7 @@
//
this.txtMiddlePosition.Enabled = false;
this.txtMiddlePosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddlePosition.Location = new System.Drawing.Point(782, 72);
this.txtMiddlePosition.Location = new System.Drawing.Point(764, 72);
this.txtMiddlePosition.MaxLength = 20;
this.txtMiddlePosition.Name = "txtMiddlePosition";
this.txtMiddlePosition.Size = new System.Drawing.Size(108, 26);
......@@ -250,7 +250,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(421, 29);
this.label5.Location = new System.Drawing.Point(403, 29);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 20;
......@@ -259,7 +259,7 @@
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(804, 29);
this.label6.Location = new System.Drawing.Point(786, 29);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(56, 17);
this.label6.TabIndex = 21;
......@@ -274,7 +274,7 @@
//
this.txtComPosition.Enabled = false;
this.txtComPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComPosition.Location = new System.Drawing.Point(782, 247);
this.txtComPosition.Location = new System.Drawing.Point(764, 247);
this.txtComPosition.MaxLength = 20;
this.txtComPosition.Name = "txtComPosition";
this.txtComPosition.Size = new System.Drawing.Size(108, 26);
......@@ -285,7 +285,7 @@
this.btnComMovej.BackColor = System.Drawing.SystemColors.Control;
this.btnComMovej.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComMovej.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComMovej.Location = new System.Drawing.Point(638, 238);
this.btnComMovej.Location = new System.Drawing.Point(620, 238);
this.btnComMovej.Name = "btnComMovej";
this.btnComMovej.Size = new System.Drawing.Size(140, 45);
this.btnComMovej.TabIndex = 25;
......@@ -299,7 +299,7 @@
this.btnComMove.BackColor = System.Drawing.SystemColors.Control;
this.btnComMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComMove.Location = new System.Drawing.Point(495, 238);
this.btnComMove.Location = new System.Drawing.Point(477, 238);
this.btnComMove.Name = "btnComMove";
this.btnComMove.Size = new System.Drawing.Size(140, 45);
this.btnComMove.TabIndex = 24;
......@@ -312,7 +312,7 @@
//
this.txtComSpeed.Enabled = false;
this.txtComSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComSpeed.Location = new System.Drawing.Point(411, 247);
this.txtComSpeed.Location = new System.Drawing.Point(393, 247);
this.txtComSpeed.MaxLength = 10;
this.txtComSpeed.Name = "txtComSpeed";
this.txtComSpeed.Size = new System.Drawing.Size(81, 26);
......@@ -321,7 +321,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(317, 252);
this.label4.Location = new System.Drawing.Point(299, 252);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(92, 17);
this.label4.TabIndex = 22;
......@@ -330,7 +330,7 @@
// lblSpeed
//
this.lblSpeed.AutoSize = true;
this.lblSpeed.Location = new System.Drawing.Point(591, 378);
this.lblSpeed.Location = new System.Drawing.Point(573, 378);
this.lblSpeed.Name = "lblSpeed";
this.lblSpeed.Size = new System.Drawing.Size(142, 17);
this.lblSpeed.TabIndex = 30;
......@@ -339,7 +339,7 @@
// trackBar1
//
this.trackBar1.LargeChange = 2;
this.trackBar1.Location = new System.Drawing.Point(320, 326);
this.trackBar1.Location = new System.Drawing.Point(302, 326);
this.trackBar1.Minimum = 1;
this.trackBar1.Name = "trackBar1";
this.trackBar1.Size = new System.Drawing.Size(366, 45);
......@@ -350,7 +350,7 @@
// btnMCopy
//
this.btnMCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMCopy.Location = new System.Drawing.Point(893, 71);
this.btnMCopy.Location = new System.Drawing.Point(875, 71);
this.btnMCopy.Name = "btnMCopy";
this.btnMCopy.Size = new System.Drawing.Size(69, 28);
this.btnMCopy.TabIndex = 31;
......@@ -361,7 +361,7 @@
// btnUCopy
//
this.btnUCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUCopy.Location = new System.Drawing.Point(893, 128);
this.btnUCopy.Location = new System.Drawing.Point(875, 128);
this.btnUCopy.Name = "btnUCopy";
this.btnUCopy.Size = new System.Drawing.Size(69, 28);
this.btnUCopy.TabIndex = 32;
......@@ -372,7 +372,7 @@
// btnICopy
//
this.btnICopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnICopy.Location = new System.Drawing.Point(893, 186);
this.btnICopy.Location = new System.Drawing.Point(875, 186);
this.btnICopy.Name = "btnICopy";
this.btnICopy.Size = new System.Drawing.Size(69, 28);
this.btnICopy.TabIndex = 33;
......@@ -383,7 +383,7 @@
// btnCCopy
//
this.btnCCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCCopy.Location = new System.Drawing.Point(893, 246);
this.btnCCopy.Location = new System.Drawing.Point(875, 246);
this.btnCCopy.Name = "btnCCopy";
this.btnCCopy.Size = new System.Drawing.Size(69, 28);
this.btnCCopy.TabIndex = 34;
......@@ -394,9 +394,9 @@
// picAxis
//
this.picAxis.Image = ((System.Drawing.Image)(resources.GetObject("picAxis.Image")));
this.picAxis.Location = new System.Drawing.Point(11, 17);
this.picAxis.Location = new System.Drawing.Point(7, 12);
this.picAxis.Name = "picAxis";
this.picAxis.Size = new System.Drawing.Size(302, 419);
this.picAxis.Size = new System.Drawing.Size(288, 452);
this.picAxis.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picAxis.TabIndex = 35;
this.picAxis.TabStop = false;
......@@ -405,7 +405,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(975, 481);
this.ClientSize = new System.Drawing.Size(961, 481);
this.Controls.Add(this.picAxis);
this.Controls.Add(this.btnCCopy);
this.Controls.Add(this.btnICopy);
......
source/HCSingleStore/FrmEquip.Designer.cs
......@@ -146,7 +146,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.panel2.Location = new System.Drawing.Point(1056, 20);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(53, 42);
this.panel2.Size = new System.Drawing.Size(0, 42);
this.panel2.TabIndex = 273;
//
// tabControl1
......@@ -159,7 +159,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 47);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1109, 627);
this.tabControl1.Size = new System.Drawing.Size(992, 627);
this.tabControl1.TabIndex = 272;
//
// tabPage2
......@@ -172,7 +172,7 @@
this.tabPage2.Controls.Add(this.lblWarnMsg);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1140, 594);
this.tabPage2.Size = new System.Drawing.Size(984, 594);
this.tabPage2.TabIndex = 3;
this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -185,7 +185,7 @@
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(4, 127);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1131, 448);
this.logBox.Size = new System.Drawing.Size(970, 458);
this.logBox.TabIndex = 278;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -292,16 +292,16 @@
this.tabPage3.Controls.Add(this.btnAxisOff);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1101, 594);
this.tabPage3.Size = new System.Drawing.Size(983, 594);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位调试 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(532, 5);
this.axisMoveControl1.Location = new System.Drawing.Point(484, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(561, 404);
this.axisMoveControl1.Size = new System.Drawing.Size(493, 404);
this.axisMoveControl1.TabIndex = 218;
//
// btnAxisP
......@@ -309,7 +309,7 @@
this.btnAxisP.BackColor = System.Drawing.Color.White;
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisP.Location = new System.Drawing.Point(685, 415);
this.btnAxisP.Location = new System.Drawing.Point(645, 415);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(132, 39);
this.btnAxisP.TabIndex = 8;
......@@ -362,9 +362,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(8, 6);
this.groupInout.Location = new System.Drawing.Point(5, 6);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(516, 573);
this.groupInout.Size = new System.Drawing.Size(475, 581);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "设备操作";
......@@ -374,7 +374,7 @@
this.btnNGMove.BackColor = System.Drawing.Color.White;
this.btnNGMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNGMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNGMove.Location = new System.Drawing.Point(92, 502);
this.btnNGMove.Location = new System.Drawing.Point(83, 502);
this.btnNGMove.Name = "btnNGMove";
this.btnNGMove.Size = new System.Drawing.Size(132, 39);
this.btnNGMove.TabIndex = 299;
......@@ -392,9 +392,9 @@
"出料口1",
"出料口2",
"出料口3"});
this.cmbWork.Location = new System.Drawing.Point(14, 29);
this.cmbWork.Location = new System.Drawing.Point(5, 29);
this.cmbWork.Name = "cmbWork";
this.cmbWork.Size = new System.Drawing.Size(102, 28);
this.cmbWork.Size = new System.Drawing.Size(97, 28);
this.cmbWork.TabIndex = 298;
this.cmbWork.SelectedIndexChanged += new System.EventHandler(this.cmbWork_SelectedIndexChanged);
//
......@@ -405,11 +405,11 @@
this.txtInoutP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP4.Location = new System.Drawing.Point(163, 444);
this.txtInoutP4.Location = new System.Drawing.Point(154, 444);
this.txtInoutP4.MaxLength = 20;
this.txtInoutP4.Name = "txtInoutP4";
this.txtInoutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInoutP4.Size = new System.Drawing.Size(85, 23);
this.txtInoutP4.Size = new System.Drawing.Size(80, 23);
this.txtInoutP4.TabIndex = 295;
this.txtInoutP4.Text = "-17000";
//
......@@ -422,12 +422,12 @@
this.btnInoutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP4.ForeColor = System.Drawing.Color.Green;
this.btnInoutP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP4.Location = new System.Drawing.Point(15, 439);
this.btnInoutP4.Location = new System.Drawing.Point(6, 439);
this.btnInoutP4.Name = "btnInoutP4";
this.btnInoutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP4.Size = new System.Drawing.Size(144, 33);
this.btnInoutP4.TabIndex = 294;
this.btnInoutP4.Text = "进出轴NG口放料点P4:";
this.btnInoutP4.Text = "进出轴NG口出料点P4:";
this.btnInoutP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP4.UseVisualStyleBackColor = false;
//
......@@ -438,11 +438,11 @@
this.txtMiddleP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP3.Location = new System.Drawing.Point(163, 405);
this.txtMiddleP3.Location = new System.Drawing.Point(154, 405);
this.txtMiddleP3.MaxLength = 20;
this.txtMiddleP3.Name = "txtMiddleP3";
this.txtMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP3.Size = new System.Drawing.Size(85, 23);
this.txtMiddleP3.Size = new System.Drawing.Size(80, 23);
this.txtMiddleP3.TabIndex = 293;
this.txtMiddleP3.Text = "-12388";
//
......@@ -454,12 +454,12 @@
this.btnMiddleP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP3.Location = new System.Drawing.Point(15, 400);
this.btnMiddleP3.Location = new System.Drawing.Point(6, 400);
this.btnMiddleP3.Name = "btnMiddleP3";
this.btnMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP3.Size = new System.Drawing.Size(144, 33);
this.btnMiddleP3.TabIndex = 292;
this.btnMiddleP3.Text = "旋转轴NG口放料点P3:";
this.btnMiddleP3.Text = "旋转轴NG口出料点P3:";
this.btnMiddleP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP3.UseVisualStyleBackColor = false;
//
......@@ -467,7 +467,7 @@
//
this.lblSize.AutoSize = true;
this.lblSize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblSize.Location = new System.Drawing.Point(242, 35);
this.lblSize.Location = new System.Drawing.Point(220, 35);
this.lblSize.Name = "lblSize";
this.lblSize.Size = new System.Drawing.Size(68, 17);
this.lblSize.TabIndex = 291;
......@@ -478,22 +478,22 @@
this.lblAutoMsg.AutoSize = true;
this.lblAutoMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAutoMsg.ForeColor = System.Drawing.Color.Green;
this.lblAutoMsg.Location = new System.Drawing.Point(130, 85);
this.lblAutoMsg.Location = new System.Drawing.Point(121, 85);
this.lblAutoMsg.Name = "lblAutoMsg";
this.lblAutoMsg.Size = new System.Drawing.Size(135, 20);
this.lblAutoMsg.TabIndex = 223;
this.lblAutoMsg.Text = "没有开启自动出入库";
this.lblAutoMsg.Text = "没有开启自动出出料";
//
// btnStartAuTo
//
this.btnStartAuTo.BackColor = System.Drawing.Color.White;
this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(366, 69);
this.btnStartAuTo.Location = new System.Drawing.Point(336, 69);
this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(132, 39);
this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "开始自动入库";
this.btnStartAuTo.Text = "开始自动出料";
this.btnStartAuTo.UseVisualStyleBackColor = false;
this.btnStartAuTo.Click += new System.EventHandler(this.btnStartAuTo_Click);
//
......@@ -501,7 +501,7 @@
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(15, 87);
this.label9.Location = new System.Drawing.Point(6, 87);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(59, 17);
this.label9.TabIndex = 220;
......@@ -512,7 +512,7 @@
this.btnSavePosition.BackColor = System.Drawing.Color.White;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(265, 502);
this.btnSavePosition.Location = new System.Drawing.Point(248, 502);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(132, 39);
this.btnSavePosition.TabIndex = 217;
......@@ -522,7 +522,7 @@
//
// txtJiange
//
this.txtJiange.Location = new System.Drawing.Point(86, 82);
this.txtJiange.Location = new System.Drawing.Point(77, 82);
this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(40, 26);
this.txtJiange.TabIndex = 221;
......@@ -535,11 +535,11 @@
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(163, 352);
this.txtComP1.Location = new System.Drawing.Point(154, 352);
this.txtComP1.MaxLength = 20;
this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP1.Size = new System.Drawing.Size(85, 23);
this.txtComP1.Size = new System.Drawing.Size(80, 23);
this.txtComP1.TabIndex = 214;
this.txtComP1.Text = "-12388";
//
......@@ -550,11 +550,11 @@
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(163, 311);
this.txtInOutP2.Location = new System.Drawing.Point(154, 311);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(85, 23);
this.txtInOutP2.Size = new System.Drawing.Size(80, 23);
this.txtInOutP2.TabIndex = 212;
this.txtInOutP2.Text = "-17000";
//
......@@ -565,11 +565,11 @@
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(163, 271);
this.txtInOutP1.Location = new System.Drawing.Point(154, 271);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(85, 23);
this.txtInOutP1.Size = new System.Drawing.Size(80, 23);
this.txtInOutP1.TabIndex = 210;
this.txtInOutP1.Text = "3000";
//
......@@ -580,11 +580,11 @@
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(163, 232);
this.txtMiddleP1.Location = new System.Drawing.Point(154, 232);
this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP1.Size = new System.Drawing.Size(85, 23);
this.txtMiddleP1.Size = new System.Drawing.Size(80, 23);
this.txtMiddleP1.TabIndex = 208;
this.txtMiddleP1.Text = "-52388";
//
......@@ -595,11 +595,11 @@
this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(163, 143);
this.txtUpDownP1.Location = new System.Drawing.Point(154, 143);
this.txtUpDownP1.MaxLength = 20;
this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP1.Size = new System.Drawing.Size(85, 23);
this.txtUpDownP1.Size = new System.Drawing.Size(80, 23);
this.txtUpDownP1.TabIndex = 200;
this.txtUpDownP1.Text = "-816491";
//
......@@ -610,11 +610,11 @@
this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP2.Location = new System.Drawing.Point(163, 183);
this.txtUpDownP2.Location = new System.Drawing.Point(154, 183);
this.txtUpDownP2.MaxLength = 20;
this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP2.Size = new System.Drawing.Size(85, 23);
this.txtUpDownP2.Size = new System.Drawing.Size(80, 23);
this.txtUpDownP2.TabIndex = 202;
this.txtUpDownP2.Text = "-836025";
//
......@@ -625,11 +625,11 @@
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(413, 311);
this.txtComP3.Location = new System.Drawing.Point(389, 311);
this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3.Size = new System.Drawing.Size(85, 23);
this.txtComP3.Size = new System.Drawing.Size(80, 23);
this.txtComP3.TabIndex = 198;
this.txtComP3.Text = "-12388";
//
......@@ -640,11 +640,11 @@
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(413, 352);
this.txtComP2.Location = new System.Drawing.Point(389, 352);
this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP2.Size = new System.Drawing.Size(85, 23);
this.txtComP2.Size = new System.Drawing.Size(80, 23);
this.txtComP2.TabIndex = 196;
this.txtComP2.Text = "-12388";
//
......@@ -655,11 +655,11 @@
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(413, 271);
this.txtInOutP3.Location = new System.Drawing.Point(389, 271);
this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(85, 23);
this.txtInOutP3.Size = new System.Drawing.Size(80, 23);
this.txtInOutP3.TabIndex = 194;
this.txtInOutP3.Text = "-12388";
//
......@@ -670,11 +670,11 @@
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(413, 232);
this.txtMiddleP2.Location = new System.Drawing.Point(389, 232);
this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP2.Size = new System.Drawing.Size(85, 23);
this.txtMiddleP2.Size = new System.Drawing.Size(80, 23);
this.txtMiddleP2.TabIndex = 192;
this.txtMiddleP2.Text = "-12388";
//
......@@ -685,11 +685,11 @@
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(413, 405);
this.txtUpDownP5.Location = new System.Drawing.Point(389, 405);
this.txtUpDownP5.MaxLength = 20;
this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP5.Size = new System.Drawing.Size(85, 23);
this.txtUpDownP5.Size = new System.Drawing.Size(80, 23);
this.txtUpDownP5.TabIndex = 188;
this.txtUpDownP5.Text = "-16388";
//
......@@ -700,11 +700,11 @@
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(413, 445);
this.txtUpDownP6.Location = new System.Drawing.Point(389, 445);
this.txtUpDownP6.MaxLength = 20;
this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP6.Size = new System.Drawing.Size(85, 23);
this.txtUpDownP6.Size = new System.Drawing.Size(80, 23);
this.txtUpDownP6.TabIndex = 190;
this.txtUpDownP6.Text = "-12388";
//
......@@ -713,9 +713,9 @@
this.cmbPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPosition.FormattingEnabled = true;
this.cmbPosition.Location = new System.Drawing.Point(122, 29);
this.cmbPosition.Location = new System.Drawing.Point(113, 29);
this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(102, 28);
this.cmbPosition.Size = new System.Drawing.Size(97, 28);
this.cmbPosition.TabIndex = 174;
this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
//
......@@ -726,11 +726,11 @@
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(413, 143);
this.txtUpDownP3.Location = new System.Drawing.Point(389, 143);
this.txtUpDownP3.MaxLength = 20;
this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP3.Size = new System.Drawing.Size(85, 23);
this.txtUpDownP3.Size = new System.Drawing.Size(80, 23);
this.txtUpDownP3.TabIndex = 162;
this.txtUpDownP3.Text = "-16388";
//
......@@ -739,11 +739,11 @@
this.btnInStore.BackColor = System.Drawing.Color.White;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(366, 24);
this.btnInStore.Location = new System.Drawing.Point(336, 24);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(132, 39);
this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试";
this.btnInStore.Text = "出料测试";
this.btnInStore.UseVisualStyleBackColor = false;
this.btnInStore.Click += new System.EventHandler(this.btnInStore_Click);
//
......@@ -754,11 +754,11 @@
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(413, 183);
this.txtUpDownP4.Location = new System.Drawing.Point(389, 183);
this.txtUpDownP4.MaxLength = 20;
this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP4.Size = new System.Drawing.Size(85, 23);
this.txtUpDownP4.Size = new System.Drawing.Size(80, 23);
this.txtUpDownP4.TabIndex = 166;
this.txtUpDownP4.Text = "-12388";
//
......@@ -771,7 +771,7 @@
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(15, 347);
this.btnComP1.Location = new System.Drawing.Point(6, 347);
this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(144, 33);
......@@ -790,7 +790,7 @@
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(15, 306);
this.btnInOutP2.Location = new System.Drawing.Point(6, 306);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(144, 33);
......@@ -809,7 +809,7 @@
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(15, 266);
this.btnInOutP1.Location = new System.Drawing.Point(6, 266);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(144, 33);
......@@ -828,7 +828,7 @@
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(15, 227);
this.btnMiddleP1.Location = new System.Drawing.Point(6, 227);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(145, 33);
......@@ -847,7 +847,7 @@
this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(15, 138);
this.btnUpDownP1.Location = new System.Drawing.Point(6, 138);
this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(144, 33);
......@@ -866,7 +866,7 @@
this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.Location = new System.Drawing.Point(15, 178);
this.btnUpDownP2.Location = new System.Drawing.Point(6, 178);
this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(144, 33);
......@@ -884,7 +884,7 @@
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(265, 306);
this.btnComP3.Location = new System.Drawing.Point(241, 306);
this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(144, 33);
......@@ -902,7 +902,7 @@
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(265, 347);
this.btnComP2.Location = new System.Drawing.Point(241, 347);
this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(144, 33);
......@@ -920,12 +920,12 @@
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(265, 266);
this.btnInOutP3.Location = new System.Drawing.Point(241, 266);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(144, 33);
this.btnInOutP3.TabIndex = 193;
this.btnInOutP3.Text = "进出轴库位放料点P3:";
this.btnInOutP3.Text = "进出轴库位出料点P3:";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.UseVisualStyleBackColor = false;
this.btnInOutP3.Click += new System.EventHandler(this.btnInOutP3_Click);
......@@ -938,7 +938,7 @@
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(265, 227);
this.btnMiddleP2.Location = new System.Drawing.Point(241, 227);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(144, 33);
......@@ -956,7 +956,7 @@
this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(265, 400);
this.btnUpDownP5.Location = new System.Drawing.Point(241, 400);
this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(144, 33);
......@@ -974,7 +974,7 @@
this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(265, 440);
this.btnUpDownP6.Location = new System.Drawing.Point(241, 440);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(144, 33);
......@@ -992,7 +992,7 @@
this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(265, 138);
this.btnUpDownP3.Location = new System.Drawing.Point(241, 138);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(144, 33);
......@@ -1010,7 +1010,7 @@
this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(265, 178);
this.btnUpDownP4.Location = new System.Drawing.Point(241, 178);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(144, 33);
......@@ -1025,7 +1025,7 @@
this.btnUpdown.BackColor = System.Drawing.Color.White;
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdown.Location = new System.Drawing.Point(685, 460);
this.btnUpdown.Location = new System.Drawing.Point(645, 460);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(132, 39);
this.btnUpdown.TabIndex = 14;
......@@ -1038,7 +1038,7 @@
this.btnAxisOn.BackColor = System.Drawing.Color.White;
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOn.Location = new System.Drawing.Point(539, 415);
this.btnAxisOn.Location = new System.Drawing.Point(499, 415);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(132, 39);
this.btnAxisOn.TabIndex = 10;
......@@ -1051,7 +1051,7 @@
this.btnAxisOff.BackColor = System.Drawing.Color.White;
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOff.Location = new System.Drawing.Point(539, 459);
this.btnAxisOff.Location = new System.Drawing.Point(499, 459);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(132, 39);
this.btnAxisOff.TabIndex = 11;
......@@ -1070,7 +1070,7 @@
this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1114, 29);
this.menuStrip1.Size = new System.Drawing.Size(1004, 29);
this.menuStrip1.TabIndex = 275;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -1346,7 +1346,7 @@
// FrmEquip
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.ClientSize = new System.Drawing.Size(1114, 683);
this.ClientSize = new System.Drawing.Size(1004, 683);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.panel2);
......
source/HCSingleStore/FrmEquip.cs
......@@ -175,7 +175,7 @@ namespace OnlineStore.ACSingleStore
if (equip.storeRunStatus > StoreRunStatus.Wait)
{
lblWarnMsg.Text = equip.WarnMsg;
//如果不在入库中，且叉子上有信号，需要提示检查叉子
//如果不在出料中，且叉子上有信号，需要提示检查叉子
if (equip.storeRunStatus.Equals(StoreRunStatus.Runing) && equip.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 叉子料盘检测有料，请检查";
......@@ -198,7 +198,7 @@ namespace OnlineStore.ACSingleStore
try
{
msg = msg.Replace("自动出库：", "");
msg = msg.Replace("自动入库：", "");
msg = msg.Replace("自动出料：", "");
msg = msg.Replace("自动盘点：", "");
int index = equip.PositionNumList.IndexOf(msg);
if (index >= 0 && (!msg.Equals("")))
......@@ -210,10 +210,10 @@ namespace OnlineStore.ACSingleStore
}
else
{
// lblMsg.Text = "没有开启自动入库";
if (btnStartAuTo.Text.Equals("停止自动入库"))
// lblMsg.Text = "没有开启自动出料";
if (btnStartAuTo.Text.Equals("停止自动出料"))
{
btnStartAuTo.Text = "开始自动入库";
btnStartAuTo.Text = "开始自动出料";
}
}
}
......@@ -221,7 +221,7 @@ namespace OnlineStore.ACSingleStore
{
lblThisSta.Text = "等待启动";
lblWarnMsg.Text = "";
btnStartAuTo.Text = "开始自动入库";
btnStartAuTo.Text = "开始自动出料";
}
}
private void FrmTest_FormClosing(object sender, FormClosingEventArgs e)
......@@ -238,10 +238,10 @@ namespace OnlineStore.ACSingleStore
{
if (equip.storeRunStatus >= StoreRunStatus.HomeMoving)
{
LogUtil.info(equip.Name + "点击：入库测试");
LogUtil.info(equip.Name + "点击：出料测试");
string selectPositionNum = cmbPosition.Text;
LineMoveP ktk = LoadPostion();
equip.StartInStoreMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk));
equip.StartOutMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk));
}
else
{
......@@ -475,11 +475,11 @@ namespace OnlineStore.ACSingleStore
if (equip.autoNext)
{
equip.autoNext = false;
btnStartAuTo.Text = "开始自动入库";
btnStartAuTo.Text = "开始自动出料";
}
else
{
DialogResult res = MessageBox.Show("确定开始自动入库？", "提示", MessageBoxButtons.YesNo);
DialogResult res = MessageBox.Show("确定开始自动出料？", "提示", MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes))
{
equip.autoNext = true;
......@@ -492,11 +492,11 @@ namespace OnlineStore.ACSingleStore
equip.AutoStartIndex = currIndex;
string poText = cmbPosition.Text;
equip.autoMsg = "自动出库：" + poText;
LogUtil.info( equip.Name + "开启自动入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
LogUtil.info( equip.Name + "开启自动出料模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，出料开始！");
//store.StartOutStoreMove(new InOutStoreParam("", poText));
equip.StartInStoreMove(new InOutParam(new InOutPosInfo("AUTOINOUT", poText)));
equip.StartOutMove(new InOutParam(new InOutPosInfo("AUTOINOUT", poText)));
}
btnStartAuTo.Text = "停止自动入库";
btnStartAuTo.Text = "停止自动出料";
}
}
}
......@@ -765,7 +765,7 @@ namespace OnlineStore.ACSingleStore
LineMoveP ktk = LoadPostion();
InOutPosInfo inOutPos = new InOutPosInfo("", selectPositionNum);
inOutPos.IsNg = true;
equip.StartInStoreMove(new InOutParam(inOutPos, ktk));
equip.StartOutMove(new InOutParam(inOutPos, ktk));
}
else
{
......
source/HCSingleStore/FrmLineIO.Designer.cs
......@@ -40,7 +40,7 @@
this.btnCloseDO = new System.Windows.Forms.Button();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.lblAddr = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.txtWriteTime = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
......@@ -73,7 +73,7 @@
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1113, 642);
this.panel1.Size = new System.Drawing.Size(1001, 642);
this.panel1.TabIndex = 248;
//
// groupBox1
......@@ -93,18 +93,19 @@
this.groupBox1.Controls.Add(this.S2_LocationCylinder_Down);
this.groupBox1.Controls.Add(this.btnLineStopS2);
this.groupBox1.Controls.Add(this.S2_LineBackRun);
this.groupBox1.Location = new System.Drawing.Point(555, 132);
this.groupBox1.Location = new System.Drawing.Point(514, 132);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(532, 295);
this.groupBox1.Size = new System.Drawing.Size(468, 295);
this.groupBox1.TabIndex = 257;
this.groupBox1.TabStop = false;
this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
//
// S1_LineRun
//
this.S1_LineRun.BackColor = System.Drawing.Color.White;
this.S1_LineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_LineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S1_LineRun.Location = new System.Drawing.Point(21, 22);
this.S1_LineRun.Location = new System.Drawing.Point(17, 22);
this.S1_LineRun.Name = "S1_LineRun";
this.S1_LineRun.Size = new System.Drawing.Size(132, 39);
this.S1_LineRun.TabIndex = 242;
......@@ -117,7 +118,7 @@
this.S3_LineRun.BackColor = System.Drawing.Color.White;
this.S3_LineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S3_LineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S3_LineRun.Location = new System.Drawing.Point(366, 22);
this.S3_LineRun.Location = new System.Drawing.Point(318, 22);
this.S3_LineRun.Name = "S3_LineRun";
this.S3_LineRun.Size = new System.Drawing.Size(132, 39);
this.S3_LineRun.TabIndex = 252;
......@@ -130,7 +131,7 @@
this.S1_LocationCylinder_Up.BackColor = System.Drawing.Color.White;
this.S1_LocationCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_LocationCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S1_LocationCylinder_Up.Location = new System.Drawing.Point(21, 160);
this.S1_LocationCylinder_Up.Location = new System.Drawing.Point(17, 160);
this.S1_LocationCylinder_Up.Name = "S1_LocationCylinder_Up";
this.S1_LocationCylinder_Up.Size = new System.Drawing.Size(132, 39);
this.S1_LocationCylinder_Up.TabIndex = 244;
......@@ -143,7 +144,7 @@
this.btnLineStopS3.BackColor = System.Drawing.Color.White;
this.btnLineStopS3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineStopS3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineStopS3.Location = new System.Drawing.Point(366, 114);
this.btnLineStopS3.Location = new System.Drawing.Point(318, 114);
this.btnLineStopS3.Name = "btnLineStopS3";
this.btnLineStopS3.Size = new System.Drawing.Size(132, 39);
this.btnLineStopS3.TabIndex = 256;
......@@ -156,7 +157,7 @@
this.S1_LocationCylinder_Down.BackColor = System.Drawing.Color.White;
this.S1_LocationCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_LocationCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S1_LocationCylinder_Down.Location = new System.Drawing.Point(21, 206);
this.S1_LocationCylinder_Down.Location = new System.Drawing.Point(17, 206);
this.S1_LocationCylinder_Down.Name = "S1_LocationCylinder_Down";
this.S1_LocationCylinder_Down.Size = new System.Drawing.Size(132, 39);
this.S1_LocationCylinder_Down.TabIndex = 245;
......@@ -169,7 +170,7 @@
this.S3_LineBackRun.BackColor = System.Drawing.Color.White;
this.S3_LineBackRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S3_LineBackRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S3_LineBackRun.Location = new System.Drawing.Point(366, 68);
this.S3_LineBackRun.Location = new System.Drawing.Point(318, 68);
this.S3_LineBackRun.Name = "S3_LineBackRun";
this.S3_LineBackRun.Size = new System.Drawing.Size(132, 39);
this.S3_LineBackRun.TabIndex = 253;
......@@ -182,7 +183,7 @@
this.S1_LineBackRun.BackColor = System.Drawing.Color.White;
this.S1_LineBackRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_LineBackRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S1_LineBackRun.Location = new System.Drawing.Point(21, 68);
this.S1_LineBackRun.Location = new System.Drawing.Point(17, 68);
this.S1_LineBackRun.Name = "S1_LineBackRun";
this.S1_LineBackRun.Size = new System.Drawing.Size(132, 39);
this.S1_LineBackRun.TabIndex = 243;
......@@ -195,7 +196,7 @@
this.S3_LocationCylinder_Down.BackColor = System.Drawing.Color.White;
this.S3_LocationCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S3_LocationCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S3_LocationCylinder_Down.Location = new System.Drawing.Point(366, 206);
this.S3_LocationCylinder_Down.Location = new System.Drawing.Point(318, 206);
this.S3_LocationCylinder_Down.Name = "S3_LocationCylinder_Down";
this.S3_LocationCylinder_Down.Size = new System.Drawing.Size(132, 39);
this.S3_LocationCylinder_Down.TabIndex = 255;
......@@ -208,7 +209,7 @@
this.btnLineStopS1.BackColor = System.Drawing.Color.White;
this.btnLineStopS1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineStopS1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineStopS1.Location = new System.Drawing.Point(21, 114);
this.btnLineStopS1.Location = new System.Drawing.Point(17, 114);
this.btnLineStopS1.Name = "btnLineStopS1";
this.btnLineStopS1.Size = new System.Drawing.Size(132, 39);
this.btnLineStopS1.TabIndex = 246;
......@@ -221,7 +222,7 @@
this.S3_LocationCylinder_Up.BackColor = System.Drawing.Color.White;
this.S3_LocationCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S3_LocationCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S3_LocationCylinder_Up.Location = new System.Drawing.Point(366, 160);
this.S3_LocationCylinder_Up.Location = new System.Drawing.Point(318, 160);
this.S3_LocationCylinder_Up.Name = "S3_LocationCylinder_Up";
this.S3_LocationCylinder_Up.Size = new System.Drawing.Size(132, 39);
this.S3_LocationCylinder_Up.TabIndex = 254;
......@@ -234,7 +235,7 @@
this.S2_LocationCylinder_Up.BackColor = System.Drawing.Color.White;
this.S2_LocationCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S2_LocationCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S2_LocationCylinder_Up.Location = new System.Drawing.Point(197, 160);
this.S2_LocationCylinder_Up.Location = new System.Drawing.Point(168, 160);
this.S2_LocationCylinder_Up.Name = "S2_LocationCylinder_Up";
this.S2_LocationCylinder_Up.Size = new System.Drawing.Size(132, 39);
this.S2_LocationCylinder_Up.TabIndex = 249;
......@@ -247,7 +248,7 @@
this.S2_LineRun.BackColor = System.Drawing.Color.White;
this.S2_LineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S2_LineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S2_LineRun.Location = new System.Drawing.Point(197, 22);
this.S2_LineRun.Location = new System.Drawing.Point(168, 22);
this.S2_LineRun.Name = "S2_LineRun";
this.S2_LineRun.Size = new System.Drawing.Size(132, 39);
this.S2_LineRun.TabIndex = 247;
......@@ -260,7 +261,7 @@
this.S2_LocationCylinder_Down.BackColor = System.Drawing.Color.White;
this.S2_LocationCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S2_LocationCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S2_LocationCylinder_Down.Location = new System.Drawing.Point(197, 206);
this.S2_LocationCylinder_Down.Location = new System.Drawing.Point(168, 206);
this.S2_LocationCylinder_Down.Name = "S2_LocationCylinder_Down";
this.S2_LocationCylinder_Down.Size = new System.Drawing.Size(132, 39);
this.S2_LocationCylinder_Down.TabIndex = 250;
......@@ -273,7 +274,7 @@
this.btnLineStopS2.BackColor = System.Drawing.Color.White;
this.btnLineStopS2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineStopS2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineStopS2.Location = new System.Drawing.Point(197, 114);
this.btnLineStopS2.Location = new System.Drawing.Point(168, 114);
this.btnLineStopS2.Name = "btnLineStopS2";
this.btnLineStopS2.Size = new System.Drawing.Size(132, 39);
this.btnLineStopS2.TabIndex = 251;
......@@ -286,7 +287,7 @@
this.S2_LineBackRun.BackColor = System.Drawing.Color.White;
this.S2_LineBackRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S2_LineBackRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S2_LineBackRun.Location = new System.Drawing.Point(197, 68);
this.S2_LineBackRun.Location = new System.Drawing.Point(168, 68);
this.S2_LineBackRun.Name = "S2_LineBackRun";
this.S2_LineBackRun.Size = new System.Drawing.Size(132, 39);
this.S2_LineBackRun.TabIndex = 248;
......@@ -300,15 +301,15 @@
this.groupBox4.Controls.Add(this.btnCloseDO);
this.groupBox4.Controls.Add(this.txtDOIndex);
this.groupBox4.Controls.Add(this.txtDoName);
this.groupBox4.Controls.Add(this.label17);
this.groupBox4.Controls.Add(this.lblAddr);
this.groupBox4.Controls.Add(this.label14);
this.groupBox4.Controls.Add(this.txtWriteTime);
this.groupBox4.Controls.Add(this.label5);
this.groupBox4.Controls.Add(this.cmbWriteIO);
this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(555, 9);
this.groupBox4.Location = new System.Drawing.Point(514, 9);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(532, 119);
this.groupBox4.Size = new System.Drawing.Size(468, 119);
this.groupBox4.TabIndex = 240;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO写入";
......@@ -318,7 +319,7 @@
this.btnOpenDo.BackColor = System.Drawing.Color.White;
this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDo.Location = new System.Drawing.Point(154, 65);
this.btnOpenDo.Location = new System.Drawing.Point(165, 66);
this.btnOpenDo.Name = "btnOpenDo";
this.btnOpenDo.Size = new System.Drawing.Size(120, 35);
this.btnOpenDo.TabIndex = 274;
......@@ -331,7 +332,7 @@
this.btnCloseDO.BackColor = System.Drawing.Color.White;
this.btnCloseDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDO.Location = new System.Drawing.Point(291, 65);
this.btnCloseDO.Location = new System.Drawing.Point(294, 66);
this.btnCloseDO.Name = "btnCloseDO";
this.btnCloseDO.Size = new System.Drawing.Size(120, 35);
this.btnCloseDO.TabIndex = 273;
......@@ -342,51 +343,54 @@
// txtDOIndex
//
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(433, 23);
this.txtDOIndex.Location = new System.Drawing.Point(386, 24);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(46, 26);
this.txtDOIndex.Size = new System.Drawing.Size(36, 26);
this.txtDOIndex.TabIndex = 242;
this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false;
//
// txtDoName
//
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(328, 23);
this.txtDoName.Location = new System.Drawing.Point(308, 24);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(54, 26);
this.txtDoName.Size = new System.Drawing.Size(36, 26);
this.txtDoName.TabIndex = 241;
this.txtDoName.Text = "0";
this.txtDoName.Visible = false;
//
// label17
// lblAddr
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(281, 28);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(35, 17);
this.label17.TabIndex = 240;
this.label17.Text = "设备:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.AutoSize = true;
this.lblAddr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(270, 29);
this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(35, 17);
this.lblAddr.TabIndex = 240;
this.lblAddr.Text = "设备:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(386, 28);
this.label14.Location = new System.Drawing.Point(348, 29);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 239;
this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Visible = false;
//
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(86, 69);
this.txtWriteTime.Location = new System.Drawing.Point(106, 70);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(50, 26);
......@@ -398,7 +402,7 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(22, 74);
this.label5.Location = new System.Drawing.Point(37, 75);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237;
......@@ -411,9 +415,9 @@
this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(14, 23);
this.cmbWriteIO.Location = new System.Drawing.Point(24, 23);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(260, 28);
this.cmbWriteIO.Size = new System.Drawing.Size(243, 28);
this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
......@@ -425,9 +429,9 @@
this.panel2.AutoScroll = true;
this.panel2.Controls.Add(this.groupBox6);
this.panel2.Controls.Add(this.groupBox5);
this.panel2.Location = new System.Drawing.Point(6, 5);
this.panel2.Location = new System.Drawing.Point(6, 4);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(540, 628);
this.panel2.Size = new System.Drawing.Size(498, 634);
this.panel2.TabIndex = 241;
//
// groupBox6
......@@ -438,15 +442,16 @@
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(5, 4);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(261, 621);
this.groupBox6.Size = new System.Drawing.Size(240, 622);
this.groupBox6.TabIndex = 106;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "DI列表";
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
......@@ -455,7 +460,7 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(250, 601);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 602);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupBox5
......@@ -464,17 +469,18 @@
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox5.Controls.Add(this.tableLayoutPanel2);
this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox5.Location = new System.Drawing.Point(272, 4);
this.groupBox5.Location = new System.Drawing.Point(251, 4);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(261, 621);
this.groupBox5.Size = new System.Drawing.Size(240, 622);
this.groupBox5.TabIndex = 107;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "DO列表";
//
// tableLayoutPanel2
//
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
......@@ -483,14 +489,14 @@
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(250, 601);
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 602);
this.tableLayoutPanel2.TabIndex = 103;
//
// FrmLineIO
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1113, 642);
this.ClientSize = new System.Drawing.Size(1001, 642);
this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
......@@ -534,7 +540,7 @@
private System.Windows.Forms.Button btnCloseDO;
private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label lblAddr;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtWriteTime;
private System.Windows.Forms.Label label5;
......
source/HCSingleStore/FrmLineIO.cs
......@@ -246,6 +246,7 @@ namespace OnlineStore.ACSingleStore
// txtIp.Text = io.DeviceName;
txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP;
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null)
{
......@@ -360,7 +361,10 @@ namespace OnlineStore.ACSingleStore
EquipManager.Equip.CylinderMove(IO_Type.S3_LocationCylinder_Up, IO_Type.S3_LocationCylinder_Down);
}
private void groupBox1_Enter(object sender, EventArgs e)
{
}
}
......
source/HCSingleStore/positionTool/AxisJogControl.Designer.cs
......@@ -209,7 +209,7 @@
this.txtInOutPosition.Location = new System.Drawing.Point(457, 167);
this.txtInOutPosition.MaxLength = 20;
this.txtInOutPosition.Name = "txtInOutPosition";
this.txtInOutPosition.Size = new System.Drawing.Size(108, 26);
this.txtInOutPosition.Size = new System.Drawing.Size(91, 26);
this.txtInOutPosition.TabIndex = 19;
//
// txtUpdownPosition
......@@ -219,7 +219,7 @@
this.txtUpdownPosition.Location = new System.Drawing.Point(457, 109);
this.txtUpdownPosition.MaxLength = 20;
this.txtUpdownPosition.Name = "txtUpdownPosition";
this.txtUpdownPosition.Size = new System.Drawing.Size(108, 26);
this.txtUpdownPosition.Size = new System.Drawing.Size(91, 26);
this.txtUpdownPosition.TabIndex = 18;
//
// txtMiddlePosition
......@@ -229,7 +229,7 @@
this.txtMiddlePosition.Location = new System.Drawing.Point(457, 52);
this.txtMiddlePosition.MaxLength = 20;
this.txtMiddlePosition.Name = "txtMiddlePosition";
this.txtMiddlePosition.Size = new System.Drawing.Size(108, 26);
this.txtMiddlePosition.Size = new System.Drawing.Size(91, 26);
this.txtMiddlePosition.TabIndex = 17;
//
// label5
......@@ -262,7 +262,7 @@
this.txtComPosition.Location = new System.Drawing.Point(457, 227);
this.txtComPosition.MaxLength = 20;
this.txtComPosition.Name = "txtComPosition";
this.txtComPosition.Size = new System.Drawing.Size(108, 26);
this.txtComPosition.Size = new System.Drawing.Size(91, 26);
this.txtComPosition.TabIndex = 26;
//
// btnComMovej
......@@ -315,7 +315,7 @@
// lblSpeed
//
this.lblSpeed.AutoSize = true;
this.lblSpeed.Location = new System.Drawing.Point(278, 336);
this.lblSpeed.Location = new System.Drawing.Point(278, 328);
this.lblSpeed.Name = "lblSpeed";
this.lblSpeed.Size = new System.Drawing.Size(137, 12);
this.lblSpeed.TabIndex = 30;
......@@ -324,7 +324,7 @@
// trackBar1
//
this.trackBar1.LargeChange = 2;
this.trackBar1.Location = new System.Drawing.Point(7, 284);
this.trackBar1.Location = new System.Drawing.Point(7, 276);
this.trackBar1.Minimum = 1;
this.trackBar1.Name = "trackBar1";
this.trackBar1.Size = new System.Drawing.Size(366, 45);
......@@ -335,9 +335,9 @@
// btnMCopy
//
this.btnMCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMCopy.Location = new System.Drawing.Point(568, 51);
this.btnMCopy.Location = new System.Drawing.Point(550, 51);
this.btnMCopy.Name = "btnMCopy";
this.btnMCopy.Size = new System.Drawing.Size(69, 28);
this.btnMCopy.Size = new System.Drawing.Size(58, 28);
this.btnMCopy.TabIndex = 31;
this.btnMCopy.Text = "复制";
this.btnMCopy.UseVisualStyleBackColor = true;
......@@ -346,9 +346,9 @@
// btnUCopy
//
this.btnUCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUCopy.Location = new System.Drawing.Point(568, 108);
this.btnUCopy.Location = new System.Drawing.Point(550, 108);
this.btnUCopy.Name = "btnUCopy";
this.btnUCopy.Size = new System.Drawing.Size(69, 28);
this.btnUCopy.Size = new System.Drawing.Size(58, 28);
this.btnUCopy.TabIndex = 32;
this.btnUCopy.Text = "复制";
this.btnUCopy.UseVisualStyleBackColor = true;
......@@ -357,9 +357,9 @@
// btnICopy
//
this.btnICopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnICopy.Location = new System.Drawing.Point(568, 166);
this.btnICopy.Location = new System.Drawing.Point(550, 166);
this.btnICopy.Name = "btnICopy";
this.btnICopy.Size = new System.Drawing.Size(69, 28);
this.btnICopy.Size = new System.Drawing.Size(58, 28);
this.btnICopy.TabIndex = 33;
this.btnICopy.Text = "复制";
this.btnICopy.UseVisualStyleBackColor = true;
......@@ -368,9 +368,9 @@
// btnCCopy
//
this.btnCCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCCopy.Location = new System.Drawing.Point(568, 226);
this.btnCCopy.Location = new System.Drawing.Point(550, 226);
this.btnCCopy.Name = "btnCCopy";
this.btnCCopy.Size = new System.Drawing.Size(69, 28);
this.btnCCopy.Size = new System.Drawing.Size(58, 28);
this.btnCCopy.TabIndex = 34;
this.btnCCopy.Text = "复制";
this.btnCCopy.UseVisualStyleBackColor = true;
......@@ -409,7 +409,7 @@
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Name = "AxisJogControl";
this.Size = new System.Drawing.Size(641, 370);
this.Size = new System.Drawing.Size(617, 364);
this.Load += new System.EventHandler(this.FrmAxisDebug_Load);
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
this.ResumeLayout(false);
......
source/HCSingleStore/positionTool/FrmTool.Designer.cs
......@@ -44,6 +44,7 @@
this.group4 = new System.Windows.Forms.GroupBox();
this.label4 = new System.Windows.Forms.Label();
this.txtP3Offset = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.txtP4Offset = new System.Windows.Forms.TextBox();
this.group3 = new System.Windows.Forms.GroupBox();
this.btnMStop = new System.Windows.Forms.Button();
......@@ -67,7 +68,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.axisJogControl1 = new OnlineStore.ACSingleStore.AxisJogControl();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label5 = new System.Windows.Forms.Label();
this.panelAll.SuspendLayout();
this.group6.SuspendLayout();
this.group2.SuspendLayout();
......@@ -97,16 +97,16 @@
this.panelAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panelAll.Location = new System.Drawing.Point(5, 3);
this.panelAll.Name = "panelAll";
this.panelAll.Size = new System.Drawing.Size(1089, 649);
this.panelAll.Size = new System.Drawing.Size(994, 649);
this.panelAll.TabIndex = 250;
//
// lblErrorMsg
//
this.lblErrorMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblErrorMsg.ForeColor = System.Drawing.Color.Red;
this.lblErrorMsg.Location = new System.Drawing.Point(417, 443);
this.lblErrorMsg.Location = new System.Drawing.Point(363, 443);
this.lblErrorMsg.Name = "lblErrorMsg";
this.lblErrorMsg.Size = new System.Drawing.Size(661, 24);
this.lblErrorMsg.Size = new System.Drawing.Size(618, 24);
this.lblErrorMsg.TabIndex = 325;
this.lblErrorMsg.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
......@@ -114,9 +114,9 @@
//
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ForeColor = System.Drawing.Color.Blue;
this.lblMoveInfo.Location = new System.Drawing.Point(417, 394);
this.lblMoveInfo.Location = new System.Drawing.Point(363, 394);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(523, 43);
this.lblMoveInfo.Size = new System.Drawing.Size(480, 43);
this.lblMoveInfo.TabIndex = 324;
this.lblMoveInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
......@@ -124,7 +124,7 @@
//
this.group6.Controls.Add(this.lblFileP);
this.group6.Controls.Add(this.btnOpenFolder);
this.group6.Location = new System.Drawing.Point(727, 479);
this.group6.Location = new System.Drawing.Point(638, 479);
this.group6.Name = "group6";
this.group6.Size = new System.Drawing.Size(346, 155);
this.group6.TabIndex = 323;
......@@ -161,7 +161,7 @@
this.group2.Controls.Add(this.btnUpdownP);
this.group2.Location = new System.Drawing.Point(6, 85);
this.group2.Name = "group2";
this.group2.Size = new System.Drawing.Size(399, 113);
this.group2.Size = new System.Drawing.Size(351, 113);
this.group2.TabIndex = 322;
this.group2.TabStop = false;
this.group2.Text = "第二步：确认（轴二）升降轴最高位置：";
......@@ -169,18 +169,18 @@
// txtUpdownStart
//
this.txtUpdownStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownStart.Location = new System.Drawing.Point(126, 23);
this.txtUpdownStart.Location = new System.Drawing.Point(112, 23);
this.txtUpdownStart.MaxLength = 30;
this.txtUpdownStart.Name = "txtUpdownStart";
this.txtUpdownStart.Size = new System.Drawing.Size(105, 26);
this.txtUpdownStart.Size = new System.Drawing.Size(95, 26);
this.txtUpdownStart.TabIndex = 260;
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(8, 27);
this.label1.Location = new System.Drawing.Point(5, 27);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(110, 20);
this.label1.Size = new System.Drawing.Size(105, 20);
this.label1.TabIndex = 261;
this.label1.Text = "升降轴开始位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -188,18 +188,18 @@
// txtTargetPosition
//
this.txtTargetPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTargetPosition.Location = new System.Drawing.Point(126, 65);
this.txtTargetPosition.Location = new System.Drawing.Point(112, 65);
this.txtTargetPosition.MaxLength = 30;
this.txtTargetPosition.Name = "txtTargetPosition";
this.txtTargetPosition.Size = new System.Drawing.Size(105, 26);
this.txtTargetPosition.Size = new System.Drawing.Size(95, 26);
this.txtTargetPosition.TabIndex = 89;
//
// label14
//
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.Location = new System.Drawing.Point(8, 69);
this.label14.Location = new System.Drawing.Point(5, 69);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(110, 20);
this.label14.Size = new System.Drawing.Size(105, 20);
this.label14.TabIndex = 94;
this.label14.Text = "升降轴最高位置：";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -208,9 +208,9 @@
//
this.btnUpdownP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdownP.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP.Location = new System.Drawing.Point(238, 61);
this.btnUpdownP.Location = new System.Drawing.Point(218, 61);
this.btnUpdownP.Name = "btnUpdownP";
this.btnUpdownP.Size = new System.Drawing.Size(138, 36);
this.btnUpdownP.Size = new System.Drawing.Size(110, 36);
this.btnUpdownP.TabIndex = 259;
this.btnUpdownP.Text = "使用实时位置";
this.btnUpdownP.UseVisualStyleBackColor = true;
......@@ -224,7 +224,7 @@
this.group4.Controls.Add(this.txtP4Offset);
this.group4.Location = new System.Drawing.Point(6, 479);
this.group4.Name = "group4";
this.group4.Size = new System.Drawing.Size(324, 155);
this.group4.Size = new System.Drawing.Size(288, 155);
this.group4.TabIndex = 321;
this.group4.TabStop = false;
this.group4.Text = "第四步：确认点位偏移量：";
......@@ -242,20 +242,30 @@
// txtP3Offset
//
this.txtP3Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP3Offset.Location = new System.Drawing.Point(182, 36);
this.txtP3Offset.Location = new System.Drawing.Point(177, 36);
this.txtP3Offset.MaxLength = 30;
this.txtP3Offset.Name = "txtP3Offset";
this.txtP3Offset.Size = new System.Drawing.Size(105, 26);
this.txtP3Offset.Size = new System.Drawing.Size(95, 26);
this.txtP3Offset.TabIndex = 281;
this.txtP3Offset.Text = "30";
//
// label5
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(11, 70);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(160, 20);
this.label5.TabIndex = 284;
this.label5.Text = "出料低点P4偏移值：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtP4Offset
//
this.txtP4Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP4Offset.Location = new System.Drawing.Point(182, 68);
this.txtP4Offset.Location = new System.Drawing.Point(177, 68);
this.txtP4Offset.MaxLength = 30;
this.txtP4Offset.Name = "txtP4Offset";
this.txtP4Offset.Size = new System.Drawing.Size(105, 26);
this.txtP4Offset.Size = new System.Drawing.Size(95, 26);
this.txtP4Offset.TabIndex = 283;
this.txtP4Offset.Text = "100";
//
......@@ -268,7 +278,7 @@
this.group3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.group3.Location = new System.Drawing.Point(6, 204);
this.group3.Name = "group3";
this.group3.Size = new System.Drawing.Size(399, 269);
this.group3.Size = new System.Drawing.Size(351, 269);
this.group3.TabIndex = 320;
this.group3.TabStop = false;
this.group3.Text = "第三步：确认（轴一）旋转轴位置列表：";
......@@ -278,9 +288,9 @@
this.btnMStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnMStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMStop.ForeColor = System.Drawing.Color.Black;
this.btnMStop.Location = new System.Drawing.Point(137, 223);
this.btnMStop.Location = new System.Drawing.Point(115, 223);
this.btnMStop.Name = "btnMStop";
this.btnMStop.Size = new System.Drawing.Size(121, 36);
this.btnMStop.Size = new System.Drawing.Size(104, 36);
this.btnMStop.TabIndex = 325;
this.btnMStop.Text = "旋转轴停止";
this.btnMStop.UseVisualStyleBackColor = true;
......@@ -291,9 +301,9 @@
this.btnMHome.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnMHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMHome.ForeColor = System.Drawing.Color.Black;
this.btnMHome.Location = new System.Drawing.Point(11, 223);
this.btnMHome.Location = new System.Drawing.Point(7, 223);
this.btnMHome.Name = "btnMHome";
this.btnMHome.Size = new System.Drawing.Size(121, 36);
this.btnMHome.Size = new System.Drawing.Size(104, 36);
this.btnMHome.TabIndex = 324;
this.btnMHome.Text = "旋转轴回原点";
this.btnMHome.UseVisualStyleBackColor = true;
......@@ -317,7 +327,7 @@
this.dataGridView1.RowHeadersWidth = 5;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(375, 198);
this.dataGridView1.Size = new System.Drawing.Size(318, 198);
this.dataGridView1.TabIndex = 323;
this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dataGridView1_CellValidating);
......@@ -350,9 +360,9 @@
this.btnAddMiddleP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnAddMiddleP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAddMiddleP.ForeColor = System.Drawing.Color.Black;
this.btnAddMiddleP.Location = new System.Drawing.Point(263, 223);
this.btnAddMiddleP.Location = new System.Drawing.Point(223, 223);
this.btnAddMiddleP.Name = "btnAddMiddleP";
this.btnAddMiddleP.Size = new System.Drawing.Size(121, 36);
this.btnAddMiddleP.Size = new System.Drawing.Size(104, 36);
this.btnAddMiddleP.TabIndex = 322;
this.btnAddMiddleP.Text = "加入实时位置";
this.btnAddMiddleP.UseVisualStyleBackColor = true;
......@@ -365,7 +375,7 @@
this.group1.Controls.Add(this.txtInout);
this.group1.Location = new System.Drawing.Point(6, 5);
this.group1.Name = "group1";
this.group1.Size = new System.Drawing.Size(399, 74);
this.group1.Size = new System.Drawing.Size(351, 74);
this.group1.TabIndex = 285;
this.group1.TabStop = false;
this.group1.Text = "第一步：确认（轴三）进出轴前进位置：";
......@@ -373,9 +383,9 @@
// label11
//
this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.Location = new System.Drawing.Point(8, 28);
this.label11.Location = new System.Drawing.Point(5, 28);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(110, 20);
this.label11.Size = new System.Drawing.Size(105, 20);
this.label11.TabIndex = 1;
this.label11.Text = "进出轴前进位置：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -384,9 +394,9 @@
//
this.btnInoutP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInoutP.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP.Location = new System.Drawing.Point(238, 20);
this.btnInoutP.Location = new System.Drawing.Point(218, 21);
this.btnInoutP.Name = "btnInoutP";
this.btnInoutP.Size = new System.Drawing.Size(138, 36);
this.btnInoutP.Size = new System.Drawing.Size(110, 36);
this.btnInoutP.TabIndex = 258;
this.btnInoutP.Text = "使用实时位置";
this.btnInoutP.UseVisualStyleBackColor = true;
......@@ -395,10 +405,10 @@
// txtInout
//
this.txtInout.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInout.Location = new System.Drawing.Point(126, 25);
this.txtInout.Location = new System.Drawing.Point(112, 25);
this.txtInout.MaxLength = 30;
this.txtInout.Name = "txtInout";
this.txtInout.Size = new System.Drawing.Size(105, 26);
this.txtInout.Size = new System.Drawing.Size(95, 26);
this.txtInout.TabIndex = 276;
//
// group5
......@@ -408,9 +418,9 @@
this.group5.Controls.Add(this.label8);
this.group5.Controls.Add(this.btnStart);
this.group5.Controls.Add(this.btnStop);
this.group5.Location = new System.Drawing.Point(336, 479);
this.group5.Location = new System.Drawing.Point(302, 479);
this.group5.Name = "group5";
this.group5.Size = new System.Drawing.Size(385, 155);
this.group5.Size = new System.Drawing.Size(330, 155);
this.group5.TabIndex = 283;
this.group5.TabStop = false;
this.group5.Text = "第五步：开始校对位置：";
......@@ -423,16 +433,16 @@
this.ioSingle.isCanClick = false;
this.ioSingle.Location = new System.Drawing.Point(3, 118);
this.ioSingle.Name = "ioSingle";
this.ioSingle.Size = new System.Drawing.Size(220, 28);
this.ioSingle.Size = new System.Drawing.Size(204, 28);
this.ioSingle.TabIndex = 289;
//
// txtSpeed
//
this.txtSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpeed.Location = new System.Drawing.Point(111, 43);
this.txtSpeed.Location = new System.Drawing.Point(112, 43);
this.txtSpeed.MaxLength = 30;
this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(105, 26);
this.txtSpeed.Size = new System.Drawing.Size(95, 26);
this.txtSpeed.TabIndex = 83;
this.txtSpeed.Text = "20";
//
......@@ -450,9 +460,9 @@
//
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(228, 40);
this.btnStart.Location = new System.Drawing.Point(214, 40);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(132, 36);
this.btnStart.Size = new System.Drawing.Size(110, 36);
this.btnStart.TabIndex = 88;
this.btnStart.Text = "开始校对位置";
this.btnStart.UseVisualStyleBackColor = true;
......@@ -462,9 +472,9 @@
//
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(228, 90);
this.btnStop.Location = new System.Drawing.Point(214, 90);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(132, 36);
this.btnStop.Size = new System.Drawing.Size(110, 36);
this.btnStop.TabIndex = 257;
this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = true;
......@@ -473,7 +483,7 @@
// btnExit
//
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExit.Location = new System.Drawing.Point(944, 402);
this.btnExit.Location = new System.Drawing.Point(852, 394);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(132, 36);
this.btnExit.TabIndex = 281;
......@@ -484,9 +494,9 @@
// panel1
//
this.panel1.Controls.Add(this.axisJogControl1);
this.panel1.Location = new System.Drawing.Point(421, 5);
this.panel1.Location = new System.Drawing.Point(362, 5);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(655, 370);
this.panel1.Size = new System.Drawing.Size(624, 370);
this.panel1.TabIndex = 284;
//
// axisJogControl1
......@@ -496,9 +506,9 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.axisJogControl1.BackColor = System.Drawing.Color.White;
this.axisJogControl1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.axisJogControl1.Location = new System.Drawing.Point(4, 3);
this.axisJogControl1.Location = new System.Drawing.Point(3, 3);
this.axisJogControl1.Name = "axisJogControl1";
this.axisJogControl1.Size = new System.Drawing.Size(648, 364);
this.axisJogControl1.Size = new System.Drawing.Size(617, 364);
this.axisJogControl1.TabIndex = 0;
//
// timer1
......@@ -506,21 +516,11 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// label5
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(11, 70);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(160, 20);
this.label5.TabIndex = 284;
this.label5.Text = "出料低点P4偏移值：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// FrmTool
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1099, 658);
this.ClientSize = new System.Drawing.Size(1004, 658);
this.Controls.Add(this.panelAll);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.MinimizeBox = false;
......
source/HCSingleStore/positionTool/FrmTool.resx
......@@ -126,6 +126,15 @@
<metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_position.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
......
source/HCSingleStore/userControl/AxisMoveControl.Designer.cs
......@@ -73,7 +73,6 @@
this.btnAxisRMove = new System.Windows.Forms.Button();
this.lblCountPulse = new System.Windows.Forms.TextBox();
this.btnAxisAMove = new System.Windows.Forms.Button();
this.label49 = new System.Windows.Forms.Label();
this.txtAPosition = new System.Windows.Forms.TextBox();
this.label46 = new System.Windows.Forms.Label();
this.label48 = new System.Windows.Forms.Label();
......@@ -99,7 +98,7 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(4, 3);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(557, 395);
this.groupAxis.Size = new System.Drawing.Size(471, 387);
this.groupAxis.TabIndex = 218;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
......@@ -130,11 +129,11 @@
this.groupBox2.Controls.Add(this.lblAxPrfPos);
this.groupBox2.Controls.Add(this.lblAxisPrfMode);
this.groupBox2.Controls.Add(this.label50);
this.groupBox2.Location = new System.Drawing.Point(7, 270);
this.groupBox2.Location = new System.Drawing.Point(7, 263);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
this.groupBox2.Size = new System.Drawing.Size(540, 118);
this.groupBox2.Size = new System.Drawing.Size(462, 118);
this.groupBox2.TabIndex = 303;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "轴状态监控";
......@@ -142,7 +141,7 @@
// lblAlarmcode
//
this.lblAlarmcode.AutoSize = true;
this.lblAlarmcode.Location = new System.Drawing.Point(433, 65);
this.lblAlarmcode.Location = new System.Drawing.Point(367, 65);
this.lblAlarmcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAlarmcode.Name = "lblAlarmcode";
this.lblAlarmcode.Size = new System.Drawing.Size(68, 17);
......@@ -153,7 +152,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(267, 90);
this.label4.Location = new System.Drawing.Point(253, 90);
this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 17);
......@@ -163,7 +162,7 @@
// lblhomeSts
//
this.lblhomeSts.AutoSize = true;
this.lblhomeSts.Location = new System.Drawing.Point(332, 90);
this.lblhomeSts.Location = new System.Drawing.Point(318, 90);
this.lblhomeSts.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblhomeSts.Name = "lblhomeSts";
this.lblhomeSts.Size = new System.Drawing.Size(17, 17);
......@@ -173,7 +172,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(433, 90);
this.label2.Location = new System.Drawing.Point(367, 90);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 17);
......@@ -184,7 +183,7 @@
// lblAxEncAcc
//
this.lblAxEncAcc.AutoSize = true;
this.lblAxEncAcc.Location = new System.Drawing.Point(510, 90);
this.lblAxEncAcc.Location = new System.Drawing.Point(444, 90);
this.lblAxEncAcc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncAcc.Name = "lblAxEncAcc";
this.lblAxEncAcc.Size = new System.Drawing.Size(17, 17);
......@@ -195,9 +194,9 @@
// lblINP
//
this.lblINP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblINP.Location = new System.Drawing.Point(414, 24);
this.lblINP.Location = new System.Drawing.Point(351, 24);
this.lblINP.Name = "lblINP";
this.lblINP.Size = new System.Drawing.Size(56, 30);
this.lblINP.Size = new System.Drawing.Size(46, 30);
this.lblINP.TabIndex = 10;
this.lblINP.Text = "到位";
this.lblINP.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -205,9 +204,9 @@
// lblBUSY
//
this.lblBUSY.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblBUSY.Location = new System.Drawing.Point(356, 24);
this.lblBUSY.Location = new System.Drawing.Point(302, 24);
this.lblBUSY.Name = "lblBUSY";
this.lblBUSY.Size = new System.Drawing.Size(56, 30);
this.lblBUSY.Size = new System.Drawing.Size(46, 30);
this.lblBUSY.TabIndex = 9;
this.lblBUSY.Text = "忙碌";
this.lblBUSY.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -215,9 +214,9 @@
// lblNEL
//
this.lblNEL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblNEL.Location = new System.Drawing.Point(298, 24);
this.lblNEL.Location = new System.Drawing.Point(253, 24);
this.lblNEL.Name = "lblNEL";
this.lblNEL.Size = new System.Drawing.Size(56, 30);
this.lblNEL.Size = new System.Drawing.Size(46, 30);
this.lblNEL.TabIndex = 8;
this.lblNEL.Text = "负极限";
this.lblNEL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -225,9 +224,9 @@
// lblORG
//
this.lblORG.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblORG.Location = new System.Drawing.Point(240, 24);
this.lblORG.Location = new System.Drawing.Point(204, 24);
this.lblORG.Name = "lblORG";
this.lblORG.Size = new System.Drawing.Size(56, 30);
this.lblORG.Size = new System.Drawing.Size(46, 30);
this.lblORG.TabIndex = 7;
this.lblORG.Text = "原点";
this.lblORG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -235,9 +234,9 @@
// lblPEL
//
this.lblPEL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblPEL.Location = new System.Drawing.Point(182, 24);
this.lblPEL.Location = new System.Drawing.Point(155, 24);
this.lblPEL.Name = "lblPEL";
this.lblPEL.Size = new System.Drawing.Size(56, 30);
this.lblPEL.Size = new System.Drawing.Size(46, 30);
this.lblPEL.TabIndex = 6;
this.lblPEL.Text = "正极限";
this.lblPEL.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -247,7 +246,7 @@
this.lblSvOn.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblSvOn.Location = new System.Drawing.Point(8, 24);
this.lblSvOn.Name = "lblSvOn";
this.lblSvOn.Size = new System.Drawing.Size(56, 30);
this.lblSvOn.Size = new System.Drawing.Size(46, 30);
this.lblSvOn.TabIndex = 5;
this.lblSvOn.Text = "伺服";
this.lblSvOn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -255,9 +254,9 @@
// lblEMG
//
this.lblEMG.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblEMG.Location = new System.Drawing.Point(124, 24);
this.lblEMG.Location = new System.Drawing.Point(106, 24);
this.lblEMG.Name = "lblEMG";
this.lblEMG.Size = new System.Drawing.Size(56, 30);
this.lblEMG.Size = new System.Drawing.Size(46, 30);
this.lblEMG.TabIndex = 4;
this.lblEMG.Text = "急停";
this.lblEMG.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -265,9 +264,9 @@
// lblWARN
//
this.lblWARN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblWARN.Location = new System.Drawing.Point(472, 24);
this.lblWARN.Location = new System.Drawing.Point(400, 24);
this.lblWARN.Name = "lblWARN";
this.lblWARN.Size = new System.Drawing.Size(56, 30);
this.lblWARN.Size = new System.Drawing.Size(46, 30);
this.lblWARN.TabIndex = 3;
this.lblWARN.Text = "警告";
this.lblWARN.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -275,9 +274,9 @@
// lblALM
//
this.lblALM.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblALM.Location = new System.Drawing.Point(66, 24);
this.lblALM.Location = new System.Drawing.Point(57, 24);
this.lblALM.Name = "lblALM";
this.lblALM.Size = new System.Drawing.Size(56, 30);
this.lblALM.Size = new System.Drawing.Size(46, 30);
this.lblALM.TabIndex = 2;
this.lblALM.Text = "报警";
this.lblALM.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -285,7 +284,7 @@
// label53
//
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(134, 90);
this.label53.Location = new System.Drawing.Point(127, 90);
this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(59, 17);
......@@ -315,7 +314,7 @@
// label52
//
this.label52.AutoSize = true;
this.label52.Location = new System.Drawing.Point(134, 65);
this.label52.Location = new System.Drawing.Point(127, 65);
this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label52.Name = "label52";
this.label52.Size = new System.Drawing.Size(59, 17);
......@@ -335,7 +334,7 @@
// lblAxPrfVel
//
this.lblAxPrfVel.AutoSize = true;
this.lblAxPrfVel.Location = new System.Drawing.Point(199, 90);
this.lblAxPrfVel.Location = new System.Drawing.Point(192, 90);
this.lblAxPrfVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfVel.Name = "lblAxPrfVel";
this.lblAxPrfVel.Size = new System.Drawing.Size(17, 17);
......@@ -355,7 +354,7 @@
// lblAxPrfPos
//
this.lblAxPrfPos.AutoSize = true;
this.lblAxPrfPos.Location = new System.Drawing.Point(199, 65);
this.lblAxPrfPos.Location = new System.Drawing.Point(192, 65);
this.lblAxPrfPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfPos.Name = "lblAxPrfPos";
this.lblAxPrfPos.Size = new System.Drawing.Size(17, 17);
......@@ -365,7 +364,7 @@
// lblAxisPrfMode
//
this.lblAxisPrfMode.AutoSize = true;
this.lblAxisPrfMode.Location = new System.Drawing.Point(332, 65);
this.lblAxisPrfMode.Location = new System.Drawing.Point(318, 65);
this.lblAxisPrfMode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxisPrfMode.Name = "lblAxisPrfMode";
this.lblAxisPrfMode.Size = new System.Drawing.Size(17, 17);
......@@ -375,7 +374,7 @@
// label50
//
this.label50.AutoSize = true;
this.label50.Location = new System.Drawing.Point(267, 65);
this.label50.Location = new System.Drawing.Point(253, 65);
this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label50.Name = "label50";
this.label50.Size = new System.Drawing.Size(59, 17);
......@@ -401,7 +400,6 @@
this.panel1.Controls.Add(this.btnAxisRMove);
this.panel1.Controls.Add(this.lblCountPulse);
this.panel1.Controls.Add(this.btnAxisAMove);
this.panel1.Controls.Add(this.label49);
this.panel1.Controls.Add(this.txtAPosition);
this.panel1.Controls.Add(this.label46);
this.panel1.Controls.Add(this.label48);
......@@ -411,7 +409,7 @@
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(7, 19);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(540, 245);
this.panel1.Size = new System.Drawing.Size(462, 237);
this.panel1.TabIndex = 219;
//
// linkLabel1
......@@ -430,7 +428,7 @@
this.comjSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comjSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comjSpeed.FormattingEnabled = true;
this.comjSpeed.Location = new System.Drawing.Point(86, 195);
this.comjSpeed.Location = new System.Drawing.Point(79, 195);
this.comjSpeed.Name = "comjSpeed";
this.comjSpeed.Size = new System.Drawing.Size(84, 28);
this.comjSpeed.TabIndex = 335;
......@@ -439,9 +437,9 @@
//
this.btnComAlarmClear.BackColor = System.Drawing.Color.White;
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(189, 121);
this.btnComAlarmClear.Location = new System.Drawing.Point(147, 121);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34);
this.btnComAlarmClear.Size = new System.Drawing.Size(99, 34);
this.btnComAlarmClear.TabIndex = 50;
this.btnComAlarmClear.Text = "清除报警";
this.btnComAlarmClear.UseVisualStyleBackColor = false;
......@@ -454,10 +452,10 @@
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(427, 45);
this.btnAxisStop.Location = new System.Drawing.Point(359, 46);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(110, 113);
this.btnAxisStop.Size = new System.Drawing.Size(100, 113);
this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = false;
......@@ -470,10 +468,10 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(307, 123);
this.btnAxisReturnHome.Location = new System.Drawing.Point(252, 124);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34);
this.btnAxisReturnHome.Size = new System.Drawing.Size(100, 34);
this.btnAxisReturnHome.TabIndex = 247;
this.btnAxisReturnHome.Text = "原点返回";
this.btnAxisReturnHome.UseVisualStyleBackColor = false;
......@@ -484,9 +482,9 @@
this.cmbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAxis.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAxis.FormattingEnabled = true;
this.cmbAxis.Location = new System.Drawing.Point(60, 6);
this.cmbAxis.Location = new System.Drawing.Point(8, 6);
this.cmbAxis.Name = "cmbAxis";
this.cmbAxis.Size = new System.Drawing.Size(227, 28);
this.cmbAxis.Size = new System.Drawing.Size(238, 28);
this.cmbAxis.TabIndex = 301;
this.cmbAxis.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
......@@ -495,9 +493,9 @@
this.btnDelMove.BackColor = System.Drawing.Color.White;
this.btnDelMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDelMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelMove.Location = new System.Drawing.Point(328, 187);
this.btnDelMove.Location = new System.Drawing.Point(294, 187);
this.btnDelMove.Name = "btnDelMove";
this.btnDelMove.Size = new System.Drawing.Size(140, 45);
this.btnDelMove.Size = new System.Drawing.Size(127, 45);
this.btnDelMove.TabIndex = 332;
this.btnDelMove.Text = "点动-(上升)";
this.btnDelMove.UseVisualStyleBackColor = false;
......@@ -511,10 +509,10 @@
this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(307, 2);
this.btnOpenAxis.Location = new System.Drawing.Point(252, 3);
this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(110, 34);
this.btnOpenAxis.Size = new System.Drawing.Size(100, 34);
this.btnOpenAxis.TabIndex = 253;
this.btnOpenAxis.Text = "打开伺服";
this.btnOpenAxis.UseVisualStyleBackColor = false;
......@@ -527,10 +525,10 @@
this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(427, 2);
this.btnCloseAxis.Location = new System.Drawing.Point(359, 3);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(110, 34);
this.btnCloseAxis.Size = new System.Drawing.Size(100, 34);
this.btnCloseAxis.TabIndex = 252;
this.btnCloseAxis.Text = "关闭伺服";
this.btnCloseAxis.UseVisualStyleBackColor = false;
......@@ -541,9 +539,9 @@
this.btnAddMove.BackColor = System.Drawing.Color.White;
this.btnAddMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAddMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddMove.Location = new System.Drawing.Point(179, 187);
this.btnAddMove.Location = new System.Drawing.Point(165, 187);
this.btnAddMove.Name = "btnAddMove";
this.btnAddMove.Size = new System.Drawing.Size(140, 45);
this.btnAddMove.Size = new System.Drawing.Size(127, 45);
this.btnAddMove.TabIndex = 330;
this.btnAddMove.Text = "点动+(上升)";
this.btnAddMove.UseVisualStyleBackColor = false;
......@@ -557,11 +555,11 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(196, 85);
this.txtASpeed.Location = new System.Drawing.Point(171, 85);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtASpeed.Size = new System.Drawing.Size(91, 26);
this.txtASpeed.Size = new System.Drawing.Size(75, 26);
this.txtASpeed.TabIndex = 251;
this.txtASpeed.Text = "200";
//
......@@ -580,7 +578,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(131, 90);
this.label47.Location = new System.Drawing.Point(106, 90);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(59, 17);
......@@ -605,10 +603,10 @@
this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(307, 84);
this.btnAxisRMove.Location = new System.Drawing.Point(252, 85);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(110, 34);
this.btnAxisRMove.Size = new System.Drawing.Size(100, 34);
this.btnAxisRMove.TabIndex = 248;
this.btnAxisRMove.Text = "相对运动";
this.btnAxisRMove.UseVisualStyleBackColor = false;
......@@ -620,7 +618,7 @@
this.lblCountPulse.Location = new System.Drawing.Point(60, 124);
this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(118, 26);
this.lblCountPulse.Size = new System.Drawing.Size(82, 26);
this.lblCountPulse.TabIndex = 38;
//
// btnAxisAMove
......@@ -630,38 +628,26 @@
this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(307, 45);
this.btnAxisAMove.Location = new System.Drawing.Point(252, 46);
this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(110, 34);
this.btnAxisAMove.Size = new System.Drawing.Size(100, 34);
this.btnAxisAMove.TabIndex = 245;
this.btnAxisAMove.Text = "绝对运动";
this.btnAxisAMove.UseVisualStyleBackColor = false;
this.btnAxisAMove.Click += new System.EventHandler(this.btnAxisAMove_Click);
//
// label49
//
this.label49.AutoSize = true;
this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label49.Location = new System.Drawing.Point(6, 11);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.TabIndex = 233;
this.label49.Text = "AC伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtAPosition
//
this.txtAPosition.BackColor = System.Drawing.SystemColors.Window;
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(196, 48);
this.txtAPosition.Location = new System.Drawing.Point(171, 48);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAPosition.Size = new System.Drawing.Size(91, 26);
this.txtAPosition.Size = new System.Drawing.Size(75, 26);
this.txtAPosition.TabIndex = 244;
this.txtAPosition.Text = "3000";
//
......@@ -683,7 +669,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(131, 53);
this.label48.Location = new System.Drawing.Point(106, 53);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(59, 17);
......@@ -710,7 +696,7 @@
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true;
this.txtAxisValue.Size = new System.Drawing.Size(50, 26);
this.txtAxisValue.Size = new System.Drawing.Size(42, 26);
this.txtAxisValue.TabIndex = 242;
this.txtAxisValue.Text = "0";
//
......@@ -721,7 +707,7 @@
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true;
this.txtAxisDeviceName.Size = new System.Drawing.Size(50, 26);
this.txtAxisDeviceName.Size = new System.Drawing.Size(42, 26);
this.txtAxisDeviceName.TabIndex = 241;
this.txtAxisDeviceName.Text = "0";
//
......@@ -746,7 +732,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(564, 402);
this.Size = new System.Drawing.Size(482, 396);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox2.ResumeLayout(false);
......@@ -779,7 +765,6 @@
private System.Windows.Forms.TextBox txtAxisDeviceName;
private System.Windows.Forms.Label label45;
private System.Windows.Forms.Label label46;
private System.Windows.Forms.Label label49;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button btnDelMove;
private System.Windows.Forms.Button btnAddMove;
......
source/HCSingleStore/记录.txt
......@@ -13,7 +13,7 @@
// 绿 黄 红
//机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭
//机器出入库中 闪 闪 灭
//机器出出料中 闪 闪 灭
//温湿度超限报警中 亮 闪 灭
//温湿度超限报警中超过30分钟 亮 闪 闪
//机器未启动 灭 灭 灭
......@@ -42,25 +42,25 @@
20200408
入库时仓门口必须有料。
出料时仓门口必须有料。
20200616
盘点
20200826
入库时未检测到物料的报警自动清除。
出料时未检测到物料的报警自动清除。
大盘位置校准时，需要放下，拿起，再放下拿起2次。
入库放料后需要检测料叉无信号，否则等待信号超时。
出料出料后需要检测料叉无信号，否则等待信号超时。
入库时，回到仓门后在检测叉子上是否有料盘。
出料时，回到仓门后在检测叉子上是否有料盘。
20200924
大料盘定位时，第二次定位需要压紧轴放松，在压紧。
20201009
入库时暂不判断是否有料盘
出料时暂不判断是否有料盘
出库时不判断叉子上是否有料盘，待料盘放到仓门口时，如果没有料盘，发送提示信息到服务器，并调用取消任务接口
......@@ -76,7 +76,7 @@
1.点位调试：左右侧BOX位置分文件夹保存。
2.点位调试：增加升降轴开始位置，方便仓门列的库位调试。
3.点位调试：打开文件夹默认可用。
4.自动出入库修改。
4.自动出出料修改。
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!