Skip to content

李娜 / SO827-OutletEquip

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

界面调整。1024X768

1 个父辈 98426437
全部展开
内嵌 并排
正在显示 19 个修改的文件 包含 138 行增加 和 141 行删除
source/DeviceLibrary/StoreConfig/StoreConfig.csv
...@@ -38,8 +38,8 @@ PRO,0,上料口工位3料架RFIDIP,RFID_IP3,192.168.103.13,,,,,,,,,,,, ...@@ -38,8 +38,8 @@ PRO,0,上料口工位3料架RFIDIP,RFID_IP3,192.168.103.13,,,,,,,,,,,,
PRO,0,上料口工位1AGV节点名称,AgvName1,D1,,,,,,,,,,,, PRO,0,上料口工位1AGV节点名称,AgvName1,D1,,,,,,,,,,,,
PRO,0,上料口工位2AGV节点名称,AgvName2,D2,,,,,,,,,,,, PRO,0,上料口工位2AGV节点名称,AgvName2,D2,,,,,,,,,,,,
PRO,0,上料口工位3AGV节点名称,AgvName3,D3,,,,,,,,,,,, PRO,0,上料口工位3AGV节点名称,AgvName3,D3,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,, PRO,0,出出料多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,, PRO,0,出出料多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,,
PRO,0,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,,,,,, PRO,0,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,,,,,,
PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,, PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,,
PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,,,,,, PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,,,,,,
......
source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -105,7 +105,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -105,7 +105,7 @@ namespace OnlineStore.DeviceLibrary
UpdateAction(id, ClientAction.Ready); UpdateAction(id, ClientAction.Ready);
// RFIDData data = new RFIDData(content); // RFIDData data = new RFIDData(content);
LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + rfid + "] "); LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + rfid + "] ");
WorkStation equip = getFeedEquip(id); WorkStation equip = getWorkStation(id);
if (equip == null) if (equip == null)
{ {
...@@ -120,7 +120,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -120,7 +120,7 @@ namespace OnlineStore.DeviceLibrary
UpdateAction(id, ClientAction.Arrive); UpdateAction(id, ClientAction.Arrive);
// RFIDData data = new RFIDData(content); // RFIDData data = new RFIDData(content);
LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + rfid + "] "); LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + rfid + "] ");
WorkStation equip = getFeedEquip(id); WorkStation equip = getWorkStation(id);
if (equip == null) if (equip == null)
{ {
LogUtil.error("收到 AgvClient_Ready [" + id + "] [" + rfid + "] 未找到对应的设备 ，暂不处理 "); LogUtil.error("收到 AgvClient_Ready [" + id + "] [" + rfid + "] 未找到对应的设备 ，暂不处理 ");
...@@ -129,9 +129,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -129,9 +129,9 @@ namespace OnlineStore.DeviceLibrary
equip.AgvArrive(id, rfid); 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) ) if (shelf.AgvName.Equals(nodeId) )
{ {
......
source/DeviceLibrary/bean/EquipBean.cs
...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,7 +32,7 @@ namespace OnlineStore.DeviceLibrary
private System.Timers.Timer IoCheckTimer = new System.Timers.Timer(); private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
private System.Timers.Timer ledProcessTimer = 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() public void InitTimer()
{ {
...@@ -90,10 +90,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -90,10 +90,10 @@ namespace OnlineStore.DeviceLibrary
AgvClient.NodeList.Add(config.AgvName1); AgvClient.NodeList.Add(config.AgvName1);
AgvClient.NodeList.Add(config.AgvName2); AgvClient.NodeList.Add(config.AgvName2);
AgvClient.NodeList.Add(config.AgvName3); AgvClient.NodeList.Add(config.AgvName3);
ShelfMap = new Dictionary<int, WorkStation>(); StationMap = new Dictionary<int, WorkStation>();
ShelfMap.Add(1, new WorkStation("S1_", config.AgvName1,config.RFID_IP1)); StationMap.Add(1, new WorkStation("S1_", config.AgvName1,config.RFID_IP1));
ShelfMap.Add(2, new WorkStation("S2_", config.AgvName2,config.RFID_IP2)); StationMap.Add(2, new WorkStation("S2_", config.AgvName2,config.RFID_IP2));
ShelfMap.Add(3, new WorkStation("S3_", config.AgvName3,config.RFID_IP3)); StationMap.Add(3, new WorkStation("S3_", config.AgvName3,config.RFID_IP3));
HCBoardManager.InitConfig(); HCBoardManager.InitConfig();
IOManager.Init(); IOManager.Init();
...@@ -266,7 +266,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -266,7 +266,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(MoveStep.R03_InOutToP1); MoveInfo.NextMoveStep(MoveStep.R03_InOutToP1);
LogInfo( "" + MoveInfo.MoveType + "：进出轴到待机点P1["+ Config.InOutAxis_P1 + "]，料架开始复位"); LogInfo( "" + MoveInfo.MoveType + "：进出轴到待机点P1["+ Config.InOutAxis_P1 + "]，料架开始复位");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed); 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.CurrShelf.IsBusy = false;
obj.Reset(); obj.Reset();
...@@ -754,7 +754,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -754,7 +754,7 @@ namespace OnlineStore.DeviceLibrary
ShowTimeLog("轴报警检测完成"); ShowTimeLog("轴报警检测完成");
} }
foreach (WorkStation shelf in ShelfMap.Values) foreach (WorkStation shelf in StationMap.Values)
{ {
shelf.TimerProcess(); shelf.TimerProcess();
} }
...@@ -813,7 +813,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -813,7 +813,7 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(Name + "处理出入库排队列表出错：" + ex.ToString()); LogUtil.error(Name + "InShelfProcess：" + ex.ToString());
} }
} }
internal string GetShelfPosId() internal string GetShelfPosId()
...@@ -822,7 +822,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -822,7 +822,7 @@ namespace OnlineStore.DeviceLibrary
if (CurrTray != null) if (CurrTray != null)
{ {
foreach (WorkStation obj in ShelfMap.Values) foreach (WorkStation obj in StationMap.Values)
{ {
if (obj.IsRightShelf(CurrTray, out str)) if (obj.IsRightShelf(CurrTray, out str))
{ {
...@@ -837,7 +837,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -837,7 +837,7 @@ namespace OnlineStore.DeviceLibrary
private string ReadyShelf() private string ReadyShelf()
{ {
string str = ""; string str = "";
foreach (WorkStation shelf in ShelfMap.Values) foreach (WorkStation shelf in StationMap.Values)
{ {
if (shelf.IsReady()) if (shelf.IsReady())
{ {
...@@ -849,7 +849,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -849,7 +849,7 @@ namespace OnlineStore.DeviceLibrary
private void StartMove() private void StartMove()
{ {
LogInfo("开始执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】"); LogInfo("开始执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】");
bool result = StartInStoreMove(new InOutParam(LineConnect.DoorPosInfo)); bool result = StartOutMove(new InOutParam(LineConnect.DoorPosInfo));
if (!result) if (!result)
{ {
LogInfo(" 执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】失败"); LogInfo(" 执行料仓门口的料【" + LineConnect.DoorPosInfo.ToStr() + "】失败");
...@@ -952,7 +952,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -952,7 +952,7 @@ namespace OnlineStore.DeviceLibrary
msg += "状态： " + storeRunStatus + "\t " + " " + storeStatus + "\n"; msg += "状态： " + storeRunStatus + "\t " + " " + storeStatus + "\n";
msg += "alarm： " + alarmType + "\n"; msg += "alarm： " + alarmType + "\n";
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + "\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"; msg += shelf.Name + ": " + shelf.CurrShelf.ToStr()+"\r\n";
} }
...@@ -960,8 +960,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -960,8 +960,7 @@ namespace OnlineStore.DeviceLibrary
} }
#region 入库命令处理 #region 出料命令处理
public void CylinderMove(string IoLowType, string IoHighType, StoreMoveInfo moveInfo = null) public void CylinderMove(string IoLowType, string IoHighType, StoreMoveInfo moveInfo = null)
{ {
...@@ -1034,7 +1033,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1034,7 +1033,7 @@ namespace OnlineStore.DeviceLibrary
// 绿 黄 红 // 绿 黄 红
//机器复位中 闪 灭 灭 //机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭 //机器待机中 亮 灭 灭
//机器出入库中 闪 闪 灭 //机器出出料中 闪 闪 灭
//温湿度超限报警中 亮 闪 灭 //温湿度超限报警中 亮 闪 灭
//温湿度超限报警中超过30分钟 亮 闪 闪 //温湿度超限报警中超过30分钟 亮 闪 闪
//机器未启动 灭 灭 灭 //机器未启动 灭 灭 灭
...@@ -1093,7 +1092,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1093,7 +1092,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
//忙碌中，判断是否有移栽在出入库执行，绿灯闪烁 //忙碌中，判断是否有移栽在出出料执行，绿灯闪烁
if (isInOut) if (isInOut)
{ {
if (IsDoValue(IO_Type.AutoRun_HddLed, IO_VALUE.LOW)) if (IsDoValue(IO_Type.AutoRun_HddLed, IO_VALUE.LOW))
......
source/DeviceLibrary/bean/EquipBean_Partial.cs
...@@ -11,7 +11,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -11,7 +11,7 @@ namespace OnlineStore.DeviceLibrary
partial class EquipBean partial class EquipBean
{ {
#region 自动入库参数 #region 自动出料参数
public List<string> PositionNumList = new List<string>(); public List<string> PositionNumList = new List<string>();
public bool autoNext = false; public bool autoNext = false;
...@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
public int AutoStartIndex = -1; public int AutoStartIndex = -1;
#endregion #endregion
#region 入库参数 #region 出料参数
private int CurrInOutCount = 0; private int CurrInOutCount = 0;
...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -45,7 +45,7 @@ namespace OnlineStore.DeviceLibrary
ShelfPosition position = param.GetACPosition(); ShelfPosition position = param.GetACPosition();
if (position == null) if (position == null)
{ {
LogUtil.error( Name + "入库时发现param中取到的Position=null,没有库位不能执行入库"); LogUtil.error( Name + "出料时发现param中取到的Position=null,没有库位不能执行出料");
return false; return false;
} }
...@@ -85,7 +85,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -85,7 +85,7 @@ namespace OnlineStore.DeviceLibrary
ShelfPosition position = param.GetACPosition(); ShelfPosition position = param.GetACPosition();
if (position == null) if (position == null)
{ {
LogUtil.error( Name + "入库时发现param中取到的Position=null,没有库位不能执行入库"); LogUtil.error( Name + "出料时发现param中取到的Position=null,没有库位不能执行出料");
return false; return false;
} }
if (param.PosInfo.PlateH <= 0) if (param.PosInfo.PlateH <= 0)
...@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 入库结果验证 #region 出料结果验证
private DateTime preRWTime = DateTime.Now; private DateTime preRWTime = DateTime.Now;
public void CheckWait(StoreMoveInfo checkmove) public void CheckWait(StoreMoveInfo checkmove)
...@@ -243,27 +243,27 @@ namespace OnlineStore.DeviceLibrary ...@@ -243,27 +243,27 @@ namespace OnlineStore.DeviceLibrary
#endregion #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 : ""; string posId = param != null ? param.PosInfo.ShelfPosId : "";
if (storeRunStatus == StoreRunStatus.Runing) if (storeRunStatus == StoreRunStatus.Runing)
{ {
if (!LoadParamPosition(param)) if (!LoadParamPosition(param))
{ {
LogUtil.error(Name + " 启动入库【" + posId + "】出错，找不到库位信息"); LogUtil.error(Name + " 启动出料【" + posId + "】出错，找不到库位信息");
return false ; return false ;
} }
if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{ {
LogUtil.error(Name + " 启动入库【" + posId + "】出错，叉子料盘检测有料"); LogUtil.error(Name + " 启动出料【" + posId + "】出错，叉子料盘检测有料");
return false ; return false ;
} }
LogInfo( " 启动入库【" + posId + "】"); LogInfo( " 启动出料【" + posId + "】");
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute; storeStatus = StoreStatus.InStoreExecute;
MoveInfo.NewMove(StoreMoveType.InStore, param); MoveInfo.NewMove(StoreMoveType.InStore, param);
...@@ -282,7 +282,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -282,7 +282,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
LogUtil.error(Name + " 启动【" + posId + "】入库出错，当前状态，storeStatus=" + storeRunStatus); LogUtil.error(Name + " 启动【" + posId + "】出料出错，当前状态，storeStatus=" + storeRunStatus);
} }
return false; return false;
} }
...@@ -327,10 +327,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -327,10 +327,10 @@ namespace OnlineStore.DeviceLibrary
//判断仓门是否打开 //判断仓门是否打开
MoveInfo.NextMoveStep(MoveStep.SI_14_InoutToP2); 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); ACAxisMove(Config.InOut_Axis, movep.InOut_P2, Config.InOutAxis_P2_Speed);
} }
protected override void InStoreProcess() protected override void OutProcess()
{ {
LineMoveP moveP = MoveInfo.MoveParam.MoveP; LineMoveP moveP = MoveInfo.MoveParam.MoveP;
if (MoveInfo.IsInWait) if (MoveInfo.IsInWait)
...@@ -472,7 +472,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -472,7 +472,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(MoveStep.SI_25_GoBack); MoveInfo.NextMoveStep(MoveStep.SI_25_GoBack);
InStoreLog(" 返回待机点，轴2/轴1/轴4动作至P1，判断料架是否需要离开"); InStoreLog(" 返回待机点，轴2/轴1/轴4动作至P1，判断料架是否需要离开");
foreach(WorkStation obj in ShelfMap.Values) foreach(WorkStation obj in StationMap.Values)
{ {
if (obj.CurrShelf.IsBusy) if (obj.CurrShelf.IsBusy)
{ {
...@@ -493,7 +493,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -493,7 +493,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(MoveStep.SI_26_WaitNoReel)) 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 : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ShelfPosId : "";
LogInfo(" 【" + posId + "】 整个流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！"); LogInfo(" 【" + posId + "】 整个流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveInfo.EndMove(); MoveInfo.EndMove();
...@@ -541,7 +541,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -541,7 +541,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(MoveStep.SI_36_WaitNoReel)) 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 : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ShelfPosId : "";
LogInfo(" 【" + posId + "】 整个流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！"); LogInfo(" 【" + posId + "】 整个流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveInfo.EndMove(); MoveInfo.EndMove();
...@@ -578,13 +578,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -578,13 +578,13 @@ namespace OnlineStore.DeviceLibrary
if (AutoStartIndex >= 0 && AutoStartIndex < PositionNumList.Count) if (AutoStartIndex >= 0 && AutoStartIndex < PositionNumList.Count)
{ {
newIndex = AutoStartIndex; newIndex = AutoStartIndex;
LogInfo("下一个索引不存在，重新开始自动入库，索引【" + AutoStartIndex + "】"); LogInfo("下一个索引不存在，重新开始自动出料，索引【" + AutoStartIndex + "】");
} }
else else
{ {
autoNext = false; autoNext = false;
autoMsg = "自动入库结束！"; autoMsg = "自动出料结束！";
LogInfo("下一个索引不存在，自动 入库结束！"); LogInfo("下一个索引不存在，自动 出料结束！");
return; return;
} }
} }
...@@ -592,9 +592,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -592,9 +592,9 @@ namespace OnlineStore.DeviceLibrary
string posid = PositionNumList[autoPositionIndex]; string posid = PositionNumList[autoPositionIndex];
InOutPosInfo inoutinfo = new InOutPosInfo(autoCode, posid); InOutPosInfo inoutinfo = new InOutPosInfo(autoCode, posid);
LogInfo("自动进入下一个入库：posid=" + posid); LogInfo("自动进入下一个出料：posid=" + posid);
autoMsg = "自动入库：" + posid; autoMsg = "自动出料：" + posid;
StartInStoreMove(new InOutParam(inoutinfo)); StartOutMove(new InOutParam(inoutinfo));
} }
......
source/DeviceLibrary/lineConnect/LineConnect.cs
...@@ -130,7 +130,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -130,7 +130,7 @@ namespace OnlineStore.DeviceLibrary
LastUpdateTime = DateTime.Now; LastUpdateTime = DateTime.Now;
if (cmd.Equals(cmd_startIn)) 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); InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.IsNg, reviceInfo.PosId,reviceInfo.rfid);
string logName = "收到流水线命令【 " + inout.ToStr() + "】："; string logName = "收到流水线命令【 " + inout.ToStr() + "】：";
...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (cmd.Equals(cmd_checStartIn)) 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 ...@@ -72,7 +72,10 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
readAll.Stop(); if (readAll != null)
{
readAll.Stop();
}
} }
catch (Exception ex) catch (Exception ex)
{ {
......
source/DeviceLibrary/model/EquipBase.cs
...@@ -16,9 +16,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,9 +16,9 @@ namespace OnlineStore.DeviceLibrary
public abstract class EquipBase public abstract class EquipBase
{ {
/// <summary> /// <summary>
///1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态）， ///1=设备联机（正常就绪）（出料后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///2=急停，3=故障，4=警告，5=调试 ///2=急停，3=故障，4=警告，5=调试
/// 6=入库执行中,7=入仓完成，8=入仓失败 /// 6=出料执行中,7=入仓完成，8=入仓失败
/// 9=出库执行，10=出仓完成，11=出库失败 /// 9=出库执行，10=出仓完成，11=出库失败
/// </summary> /// </summary>
public StoreStatus storeStatus = StoreStatus.ResetMove; public StoreStatus storeStatus = StoreStatus.ResetMove;
...@@ -72,7 +72,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -72,7 +72,7 @@ namespace OnlineStore.DeviceLibrary
switch (MoveInfo.MoveType) switch (MoveInfo.MoveType)
{ {
case StoreMoveType.InStore: case StoreMoveType.InStore:
InStoreProcess(); OutProcess();
isInPro = false; isInPro = false;
break; break;
...@@ -269,9 +269,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -269,9 +269,9 @@ namespace OnlineStore.DeviceLibrary
protected abstract void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e); protected abstract void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e);
#region 入库 #region 出料
public abstract bool StartInStoreMove(InOutParam param); public abstract bool StartOutMove(InOutParam param);
protected abstract void InStoreProcess(); protected abstract void OutProcess();
#endregion #endregion
...@@ -300,7 +300,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -300,7 +300,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (storeRunStatus > StoreRunStatus.Wait) if (storeRunStatus > StoreRunStatus.Wait)
{ {
//"0":"急停中", "1":"设备联机", "2":"故障中", "3":"入库执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中", //"0":"急停中", "1":"设备联机", "2":"故障中", "3":"出料执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中",
switch (storeStatus) switch (storeStatus)
{ {
case StoreStatus.Debugging: case StoreStatus.Debugging:
...@@ -310,7 +310,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -310,7 +310,7 @@ namespace OnlineStore.DeviceLibrary
aa = "料盘入仓位完成"; aa = "料盘入仓位完成";
break; break;
case StoreStatus.InStoreExecute: case StoreStatus.InStoreExecute:
aa = "入库执行中"; aa = "出料执行中";
break; break;
case StoreStatus.InTrouble: case StoreStatus.InTrouble:
aa = "故障中"; aa = "故障中";
...@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
aa = "出库完成"; aa = "出库完成";
break; break;
case StoreStatus.InStoreFaild: case StoreStatus.InStoreFaild:
aa = "入库失败（" + WarnMsg + "）"; aa = "出料失败（" + WarnMsg + "）";
break; break;
case StoreStatus.OutStoreFaild: case StoreStatus.OutStoreFaild:
aa = "出库失败（" + WarnMsg + "）"; aa = "出库失败（" + WarnMsg + "）";
...@@ -346,7 +346,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -346,7 +346,7 @@ namespace OnlineStore.DeviceLibrary
string inout = ""; string inout = "";
if (MoveInfo.MoveType.Equals(StoreMoveType.InStore)&& MoveInfo.MoveParam!=null&& MoveInfo.MoveParam.PosInfo!=null) if (MoveInfo.MoveType.Equals(StoreMoveType.InStore)&& MoveInfo.MoveParam!=null&& MoveInfo.MoveParam.PosInfo!=null)
{ {
inout = "_入库："+MoveInfo.MoveParam.PosInfo.ToStr(); inout = "_出料："+MoveInfo.MoveParam.PosInfo.ToStr();
} }
else else
......
source/DeviceLibrary/model/StoreMoveInfo.cs
...@@ -10,7 +10,7 @@ using System.Text; ...@@ -10,7 +10,7 @@ using System.Text;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
/// <summary> /// <summary>
/// 料仓当前运动信息类（出入库状态，步骤记录） /// 料仓当前运动信息类（出出料状态，步骤记录）
/// </summary> /// </summary>
public class StoreMoveInfo public class StoreMoveInfo
{ {
...@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,7 +65,7 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
/// <summary> /// <summary>
///出入库参数 ///出出料参数
/// </summary> /// </summary>
public InOutParam MoveParam { get; set; } public InOutParam MoveParam { get; set; }
/// <summary> /// <summary>
...@@ -149,7 +149,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -149,7 +149,7 @@ namespace OnlineStore.DeviceLibrary
public List<WaitResultInfo> WaitList = new List<WaitResultInfo>(); public List<WaitResultInfo> WaitList = new List<WaitResultInfo>();
/// <summary> /// <summary>
/// 重置之后继续出入库时，退回上一个步骤执行 /// 重置之后继续出出料时，退回上一个步骤执行
/// </summary> /// </summary>
public void BackStep() public void BackStep()
{ {
...@@ -349,7 +349,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -349,7 +349,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
None = 0, None = 0,
/// <summary> /// <summary>
/// 入库 /// 出料
/// </summary> /// </summary>
InStore = 1, InStore = 1,
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -45,9 +45,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -45,9 +45,9 @@ namespace OnlineStore.DeviceLibrary
} }
/// <summary> /// <summary>
///1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态）， ///1=设备联机（正常就绪）（出料后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///2=急停，3=故障，4=警告，5=调试 ///2=急停，3=故障，4=警告，5=调试
/// 6=入库执行中,7=入仓完成，8=入仓失败 /// 6=出料执行中,7=入仓完成，8=入仓失败
/// 9=出库执行，10=出仓完成，11=出库失败 /// 9=出库执行，10=出仓完成，11=出库失败
/// 12=重置中（原点返回和重置都发此状态） /// 12=重置中（原点返回和重置都发此状态）
/// 13=库位盘点中 /// 13=库位盘点中
...@@ -55,7 +55,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -55,7 +55,7 @@ namespace OnlineStore.DeviceLibrary
public enum StoreStatus public enum StoreStatus
{ {
/// <summary> /// <summary>
/// 1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态）， /// 1=设备联机（正常就绪）（出料后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
/// </summary> /// </summary>
StoreOnline = 1, StoreOnline = 1,
/// <summary> /// <summary>
...@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
Debugging = 5, Debugging = 5,
/// <summary> /// <summary>
/// 6=入库执行中 /// 6=出料执行中
/// </summary> /// </summary>
InStoreExecute = 6, InStoreExecute = 6,
/// <summary> /// <summary>
...@@ -83,7 +83,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -83,7 +83,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
InStoreEnd = 7, InStoreEnd = 7,
/// <summary> /// <summary>
/// 8=入库失败 /// 8=出料失败
/// </summary> /// </summary>
InStoreFaild = 8, InStoreFaild = 8,
/// <summary> /// <summary>
...@@ -160,77 +160,77 @@ namespace OnlineStore.DeviceLibrary ...@@ -160,77 +160,77 @@ namespace OnlineStore.DeviceLibrary
#region 入料 #region 出料
/// <summary> /// <summary>
/// 入料：等待入口检测有料 /// 出料：等待入口检测有料
/// </summary> /// </summary>
SI_01_TrayCheck = 201, SI_01_TrayCheck = 201,
/// <summary> /// <summary>
///入料：获取料架库位号 ///出料：获取料架库位号
/// </summary> /// </summary>
SI_02_GetPosition, SI_02_GetPosition,
/// <summary> /// <summary>
///入料：等待料架准备完成 ///出料：等待料架准备完成
/// </summary> /// </summary>
SI_03_WaitShelf, SI_03_WaitShelf,
/// <summary> /// <summary>
///入料：顶升气缸上升 ///出料：顶升气缸上升
/// </summary> /// </summary>
SI_04_LocationUp, SI_04_LocationUp,
/// <summary> /// <summary>
/// 入料：进出轴（叉子）先返回P1 /// 出料：进出轴（叉子）先返回P1
/// </summary> /// </summary>
SI_11_InOutToP1 = 211, SI_11_InOutToP1 = 211,
/// <summary> /// <summary>
/// 入料：所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3 /// 出料：所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
/// </summary> /// </summary>
SI_12_AxisToP1, SI_12_AxisToP1,
/// <summary> /// <summary>
/// 入料：压紧物品 压紧轴到P3(压紧前点) /// 出料：压紧物品 压紧轴到P3(压紧前点)
/// </summary> /// </summary>
SI_13_ComToP3, SI_13_ComToP3,
/// <summary> /// <summary>
/// 入料：叉子进入入料口，进出轴到P2 /// 出料：叉子进入出料口，进出轴到P2
/// </summary> /// </summary>
SI_14_InoutToP2, SI_14_InoutToP2,
/// <summary> /// <summary>
/// 入料：把物品放入叉子上，升降轴到P2,压紧物品，压紧轴到P2(压紧点) /// 出料：把物品放入叉子上，升降轴到P2,压紧物品，压紧轴到P2(压紧点)
/// </summary> /// </summary>
SI_15_GetReel, SI_15_GetReel,
/// <summary> /// <summary>
/// 入料： 进出轴到P1（ 待机点） /// 出料： 进出轴到P1（ 待机点）
/// </summary> /// </summary>
SI_16_InoutBack, SI_16_InoutBack,
/// <summary> /// <summary>
/// 入料：等待检测到料盘 /// 出料：等待检测到料盘
/// </summary> /// </summary>
SI_17_TrayCheck, SI_17_TrayCheck,
/// <summary> /// <summary>
/// 入料到料架：移动到库位点，旋转轴到P2（ 库位点）升降轴到P3 /// 出料到料架：移动到库位点，旋转轴到P2（ 库位点）升降轴到P3
/// </summary> /// </summary>
SI_21_MoveToBag=221, SI_21_MoveToBag=221,
/// <summary> /// <summary>
/// 入料到料架：叉子进入库位中，进出轴到P3 /// 出料到料架：叉子进出料位中，进出轴到P3
/// </summary> /// </summary>
SI_22_InoutToP3, SI_22_InoutToP3,
/// <summary> /// <summary>
/// 入料到料架：放下物品，升降轴到P4 ,压紧轴到P3（ 压紧前点） /// 出料到料架：放下物品，升降轴到P4 ,压紧轴到P3（ 压紧前点）
/// </summary> /// </summary>
SI_23_PutReel, SI_23_PutReel,
/// <summary> /// <summary>
/// 入料到料架：叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点） /// 出料到料架：叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）
/// </summary> /// </summary>
SI_24_InoutBack, SI_24_InoutBack,
/// <summary> /// <summary>
/// 入料到料架：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始 /// 出料到料架：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
/// </summary> /// </summary>
SI_25_GoBack, SI_25_GoBack,
/// <summary> /// <summary>
///入料到料架：等待叉子无信号 ///出料到料架：等待叉子无信号
/// </summary> /// </summary>
SI_26_WaitNoReel, SI_26_WaitNoReel,
...@@ -265,25 +265,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -265,25 +265,7 @@ namespace OnlineStore.DeviceLibrary
#endregion #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 料仓校准位置 #region 料仓校准位置
/// <summary> /// <summary>
......
source/HCSingleStore/FrmEquip.cs
...@@ -175,7 +175,7 @@ namespace OnlineStore.ACSingleStore ...@@ -175,7 +175,7 @@ namespace OnlineStore.ACSingleStore
if (equip.storeRunStatus > StoreRunStatus.Wait) if (equip.storeRunStatus > StoreRunStatus.Wait)
{ {
lblWarnMsg.Text = equip.WarnMsg; lblWarnMsg.Text = equip.WarnMsg;
//如果不在入库中，且叉子上有信号，需要提示检查叉子 //如果不在出料中，且叉子上有信号，需要提示检查叉子
if (equip.storeRunStatus.Equals(StoreRunStatus.Runing) && equip.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH)) if (equip.storeRunStatus.Equals(StoreRunStatus.Runing) && equip.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 叉子料盘检测有料，请检查"; lblWarnMsg.Text = lblWarnMsg.Text + " 叉子料盘检测有料，请检查";
...@@ -198,7 +198,7 @@ namespace OnlineStore.ACSingleStore ...@@ -198,7 +198,7 @@ namespace OnlineStore.ACSingleStore
try try
{ {
msg = msg.Replace("自动出库：", ""); msg = msg.Replace("自动出库：", "");
msg = msg.Replace("自动入库：", ""); msg = msg.Replace("自动出料：", "");
msg = msg.Replace("自动盘点：", ""); msg = msg.Replace("自动盘点：", "");
int index = equip.PositionNumList.IndexOf(msg); int index = equip.PositionNumList.IndexOf(msg);
if (index >= 0 && (!msg.Equals(""))) if (index >= 0 && (!msg.Equals("")))
...@@ -210,10 +210,10 @@ namespace OnlineStore.ACSingleStore ...@@ -210,10 +210,10 @@ namespace OnlineStore.ACSingleStore
} }
else else
{ {
// lblMsg.Text = "没有开启自动入库"; // lblMsg.Text = "没有开启自动出料";
if (btnStartAuTo.Text.Equals("停止自动入库")) if (btnStartAuTo.Text.Equals("停止自动出料"))
{ {
btnStartAuTo.Text = "开始自动入库"; btnStartAuTo.Text = "开始自动出料";
} }
} }
} }
...@@ -221,7 +221,7 @@ namespace OnlineStore.ACSingleStore ...@@ -221,7 +221,7 @@ namespace OnlineStore.ACSingleStore
{ {
lblThisSta.Text = "等待启动"; lblThisSta.Text = "等待启动";
lblWarnMsg.Text = ""; lblWarnMsg.Text = "";
btnStartAuTo.Text = "开始自动入库"; btnStartAuTo.Text = "开始自动出料";
} }
} }
private void FrmTest_FormClosing(object sender, FormClosingEventArgs e) private void FrmTest_FormClosing(object sender, FormClosingEventArgs e)
...@@ -238,10 +238,10 @@ namespace OnlineStore.ACSingleStore ...@@ -238,10 +238,10 @@ namespace OnlineStore.ACSingleStore
{ {
if (equip.storeRunStatus >= StoreRunStatus.HomeMoving) if (equip.storeRunStatus >= StoreRunStatus.HomeMoving)
{ {
LogUtil.info(equip.Name + "点击：入库测试"); LogUtil.info(equip.Name + "点击：出料测试");
string selectPositionNum = cmbPosition.Text; string selectPositionNum = cmbPosition.Text;
LineMoveP ktk = LoadPostion(); LineMoveP ktk = LoadPostion();
equip.StartInStoreMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk)); equip.StartOutMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk));
} }
else else
{ {
...@@ -475,11 +475,11 @@ namespace OnlineStore.ACSingleStore ...@@ -475,11 +475,11 @@ namespace OnlineStore.ACSingleStore
if (equip.autoNext) if (equip.autoNext)
{ {
equip.autoNext = false; equip.autoNext = false;
btnStartAuTo.Text = "开始自动入库"; btnStartAuTo.Text = "开始自动出料";
} }
else else
{ {
DialogResult res = MessageBox.Show("确定开始自动入库？", "提示", MessageBoxButtons.YesNo); DialogResult res = MessageBox.Show("确定开始自动出料？", "提示", MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes)) if (res.Equals(DialogResult.Yes))
{ {
equip.autoNext = true; equip.autoNext = true;
...@@ -492,11 +492,11 @@ namespace OnlineStore.ACSingleStore ...@@ -492,11 +492,11 @@ namespace OnlineStore.ACSingleStore
equip.AutoStartIndex = currIndex; equip.AutoStartIndex = currIndex;
string poText = cmbPosition.Text; string poText = cmbPosition.Text;
equip.autoMsg = "自动出库：" + poText; equip.autoMsg = "自动出库：" + poText;
LogUtil.info( equip.Name + "开启自动入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！"); LogUtil.info( equip.Name + "开启自动出料模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，出料开始！");
//store.StartOutStoreMove(new InOutStoreParam("", poText)); //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 ...@@ -765,7 +765,7 @@ namespace OnlineStore.ACSingleStore
LineMoveP ktk = LoadPostion(); LineMoveP ktk = LoadPostion();
InOutPosInfo inOutPos = new InOutPosInfo("", selectPositionNum); InOutPosInfo inOutPos = new InOutPosInfo("", selectPositionNum);
inOutPos.IsNg = true; inOutPos.IsNg = true;
equip.StartInStoreMove(new InOutParam(inOutPos, ktk)); equip.StartOutMove(new InOutParam(inOutPos, ktk));
} }
else else
{ {
......
source/HCSingleStore/FrmLineIO.cs
...@@ -246,6 +246,7 @@ namespace OnlineStore.ACSingleStore ...@@ -246,6 +246,7 @@ namespace OnlineStore.ACSingleStore
// txtIp.Text = io.DeviceName; // txtIp.Text = io.DeviceName;
txtDOIndex.Text = io.GetIOAddr().ToString(); txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP; txtDoName.Text = io.IO_IP;
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName]; IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) if (selectControl != null)
{ {
...@@ -360,7 +361,10 @@ namespace OnlineStore.ACSingleStore ...@@ -360,7 +361,10 @@ namespace OnlineStore.ACSingleStore
EquipManager.Equip.CylinderMove(IO_Type.S3_LocationCylinder_Up, IO_Type.S3_LocationCylinder_Down); 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 @@ ...@@ -209,7 +209,7 @@
this.txtInOutPosition.Location = new System.Drawing.Point(457, 167); this.txtInOutPosition.Location = new System.Drawing.Point(457, 167);
this.txtInOutPosition.MaxLength = 20; this.txtInOutPosition.MaxLength = 20;
this.txtInOutPosition.Name = "txtInOutPosition"; 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; this.txtInOutPosition.TabIndex = 19;
// //
// txtUpdownPosition // txtUpdownPosition
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
this.txtUpdownPosition.Location = new System.Drawing.Point(457, 109); this.txtUpdownPosition.Location = new System.Drawing.Point(457, 109);
this.txtUpdownPosition.MaxLength = 20; this.txtUpdownPosition.MaxLength = 20;
this.txtUpdownPosition.Name = "txtUpdownPosition"; 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; this.txtUpdownPosition.TabIndex = 18;
// //
// txtMiddlePosition // txtMiddlePosition
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
this.txtMiddlePosition.Location = new System.Drawing.Point(457, 52); this.txtMiddlePosition.Location = new System.Drawing.Point(457, 52);
this.txtMiddlePosition.MaxLength = 20; this.txtMiddlePosition.MaxLength = 20;
this.txtMiddlePosition.Name = "txtMiddlePosition"; 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; this.txtMiddlePosition.TabIndex = 17;
// //
// label5 // label5
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
this.txtComPosition.Location = new System.Drawing.Point(457, 227); this.txtComPosition.Location = new System.Drawing.Point(457, 227);
this.txtComPosition.MaxLength = 20; this.txtComPosition.MaxLength = 20;
this.txtComPosition.Name = "txtComPosition"; 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; this.txtComPosition.TabIndex = 26;
// //
// btnComMovej // btnComMovej
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
// lblSpeed // lblSpeed
// //
this.lblSpeed.AutoSize = true; 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.Name = "lblSpeed";
this.lblSpeed.Size = new System.Drawing.Size(137, 12); this.lblSpeed.Size = new System.Drawing.Size(137, 12);
this.lblSpeed.TabIndex = 30; this.lblSpeed.TabIndex = 30;
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
// trackBar1 // trackBar1
// //
this.trackBar1.LargeChange = 2; 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.Minimum = 1;
this.trackBar1.Name = "trackBar1"; this.trackBar1.Name = "trackBar1";
this.trackBar1.Size = new System.Drawing.Size(366, 45); this.trackBar1.Size = new System.Drawing.Size(366, 45);
...@@ -335,9 +335,9 @@ ...@@ -335,9 +335,9 @@
// btnMCopy // btnMCopy
// //
this.btnMCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; 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.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.TabIndex = 31;
this.btnMCopy.Text = "复制"; this.btnMCopy.Text = "复制";
this.btnMCopy.UseVisualStyleBackColor = true; this.btnMCopy.UseVisualStyleBackColor = true;
...@@ -346,9 +346,9 @@ ...@@ -346,9 +346,9 @@
// btnUCopy // btnUCopy
// //
this.btnUCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; 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.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.TabIndex = 32;
this.btnUCopy.Text = "复制"; this.btnUCopy.Text = "复制";
this.btnUCopy.UseVisualStyleBackColor = true; this.btnUCopy.UseVisualStyleBackColor = true;
...@@ -357,9 +357,9 @@ ...@@ -357,9 +357,9 @@
// btnICopy // btnICopy
// //
this.btnICopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; 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.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.TabIndex = 33;
this.btnICopy.Text = "复制"; this.btnICopy.Text = "复制";
this.btnICopy.UseVisualStyleBackColor = true; this.btnICopy.UseVisualStyleBackColor = true;
...@@ -368,9 +368,9 @@ ...@@ -368,9 +368,9 @@
// btnCCopy // btnCCopy
// //
this.btnCCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; 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.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.TabIndex = 34;
this.btnCCopy.Text = "复制"; this.btnCCopy.Text = "复制";
this.btnCCopy.UseVisualStyleBackColor = true; this.btnCCopy.UseVisualStyleBackColor = true;
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Name = "AxisJogControl"; 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); this.Load += new System.EventHandler(this.FrmAxisDebug_Load);
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
......
source/HCSingleStore/positionTool/FrmTool.resx
...@@ -126,6 +126,15 @@ ...@@ -126,6 +126,15 @@
<metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </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"> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
......
source/HCSingleStore/记录.txt
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// 绿 黄 红 // 绿 黄 红
//机器复位中 闪 灭 灭 //机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭 //机器待机中 亮 灭 灭
//机器出入库中 闪 闪 灭 //机器出出料中 闪 闪 灭
//温湿度超限报警中 亮 闪 灭 //温湿度超限报警中 亮 闪 灭
//温湿度超限报警中超过30分钟 亮 闪 闪 //温湿度超限报警中超过30分钟 亮 闪 闪
//机器未启动 灭 灭 灭 //机器未启动 灭 灭 灭
...@@ -42,25 +42,25 @@ ...@@ -42,25 +42,25 @@
20200408 20200408
入库时仓门口必须有料。 出料时仓门口必须有料。
20200616 20200616
盘点 盘点
20200826 20200826
入库时未检测到物料的报警自动清除。 出料时未检测到物料的报警自动清除。
大盘位置校准时，需要放下，拿起，再放下拿起2次。 大盘位置校准时，需要放下，拿起，再放下拿起2次。
入库放料后需要检测料叉无信号，否则等待信号超时。 出料出料后需要检测料叉无信号，否则等待信号超时。
入库时，回到仓门后在检测叉子上是否有料盘。 出料时，回到仓门后在检测叉子上是否有料盘。
20200924 20200924
大料盘定位时，第二次定位需要压紧轴放松，在压紧。 大料盘定位时，第二次定位需要压紧轴放松，在压紧。
20201009 20201009
入库时暂不判断是否有料盘 出料时暂不判断是否有料盘
出库时不判断叉子上是否有料盘，待料盘放到仓门口时，如果没有料盘，发送提示信息到服务器，并调用取消任务接口 出库时不判断叉子上是否有料盘，待料盘放到仓门口时，如果没有料盘，发送提示信息到服务器，并调用取消任务接口
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
1.点位调试：左右侧BOX位置分文件夹保存。 1.点位调试：左右侧BOX位置分文件夹保存。
2.点位调试：增加升降轴开始位置，方便仓门列的库位调试。 2.点位调试：增加升降轴开始位置，方便仓门列的库位调试。
3.点位调试：打开文件夹默认可用。 3.点位调试：打开文件夹默认可用。
4.自动出入库修改。 4.自动出出料修改。
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!