Skip to content

李娜 / SO827-OutletEquip

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

1

1 个父辈 a5f815a4
全部展开
内嵌 并排
正在显示 17 个修改的文件 包含 156 行增加 和 162 行删除
source/DeviceLibrary/bean/EquipBean_Partial.cs
......@@ -24,8 +24,7 @@ namespace OnlineStore.DeviceLibrary
#region 入库参数
private int CurrInOutCount = 0;
private int CurrInOutACount = 0;
private bool LoadParamPosition(InOutParam param)
{
if (param == null)
......@@ -307,30 +306,29 @@ namespace OnlineStore.DeviceLibrary
private void SI_14_InoutToP2()
{
ConfigMoveAxis updown = Config.UpDown_Axis;
if (!AxisManager.instance.isInPosition(updown.DeviceName, updown.GetAxisValue(), MoveInfo.MoveParam.MoveP.UpDown_P1, updown.CanErrorCountMax, true))
LineMoveP movep = MoveInfo.MoveParam.MoveP;
if (!AxisManager.instance.isInPosition(updown.DeviceName, updown.GetAxisValue(), movep.UpDown_P1, updown.CanErrorCountMax, true))
{
MoveInfo.NextMoveStep(MoveStep.SI_13_ComToP3);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
InStoreLog(" 升降轴不在待机点，重新运动 升降轴到P1 [" + MoveInfo.MoveParam.MoveP.UpDown_P1 + "] ");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
InStoreLog(" 升降轴不在待机点，重新运动 升降轴到P1 [" + movep.UpDown_P1 + "] ");
ACAxisMove(Config.UpDown_Axis, movep.UpDown_P1, Config.UpDownAxis_P1_Speed);
return;
}
ConfigMoveAxis middle = Config.Middle_Axis;
if (!AxisManager.instance.isInPosition(middle.DeviceName, middle.GetAxisValue(), MoveInfo.MoveParam.MoveP.Middle_P1, middle.CanErrorCountMax, true))
if (!AxisManager.instance.isInPosition(middle.DeviceName, middle.GetAxisValue(), movep.Middle_P1, middle.CanErrorCountMax, true))
{
MoveInfo.NextMoveStep(MoveStep.SI_13_ComToP3);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
InStoreLog(" 旋转轴不在待机点，重新运动 旋转轴到P1 [" + MoveInfo.MoveParam.MoveP.Middle_P1 + "]");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P1, Config.MiddleAxis_P1_Speed);
InStoreLog(" 旋转轴不在待机点，重新运动 旋转轴到P1 [" + movep.Middle_P1 + "]");
ACAxisMove(Config.Middle_Axis, movep.Middle_P1, Config.MiddleAxis_P1_Speed);
return;
}
//判断仓门是否打开
MoveInfo.NextMoveStep(MoveStep.SI_14_InoutToP2);
InStoreLog(" 叉子进入入料口，进出轴至P2(进料口取料点) ");
ACAxisMove(Config.InOut_Axis, MoveInfo.MoveParam.MoveP.InOut_P2, Config.InOutAxis_P2_Speed);
InStoreLog(" 叉子进入入料口，进出轴至P2(进料口取料点) "+ movep.InOut_P2);
ACAxisMove(Config.InOut_Axis, movep.InOut_P2, Config.InOutAxis_P2_Speed);
}
protected override void InStoreProcess()
{
......@@ -389,14 +387,14 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(MoveStep.SI_14_InoutToP2))
{
MoveInfo.NextMoveStep(MoveStep.SI_15_GetReel);
InStoreLog(" 拿物品，压紧轴至P2(压紧点))[" + moveP.ComPress_P2 + "] 升降轴至P2[" + moveP.UpDown_P2 + "]");
InStoreLog(" 拿物品，压紧轴至P2[" + moveP.ComPress_P2 + "] 升降轴至P2[" + moveP.UpDown_P2 + "]");
ComMoveToPosition(moveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
}
else if (MoveInfo.IsStep(MoveStep.SI_15_GetReel))
{
MoveInfo.NextMoveStep(MoveStep.SI_16_InoutBack);
InStoreLog("进出轴至P1(待机点)[" + moveP.InOut_P1 + "] ");
InStoreLog("进出轴至P1[" + moveP.InOut_P1 + "] ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.IsStep(MoveStep.SI_16_InoutBack))
......@@ -456,7 +454,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(MoveStep.SI_23_PutReel);
InStoreLog(" 放下物品，升降轴至P4 [" + moveP.UpDown_P4 + "] ,压紧轴至P3(压紧前点) [" + moveP.ComPress_P3 + "]");
InStoreLog(" 放下物品，升降轴至P4 [" + moveP.UpDown_P4 + "] ,压紧轴至P3[" + moveP.ComPress_P3 + "]");
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
......@@ -464,7 +462,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(MoveStep.SI_23_PutReel))
{
MoveInfo.NextMoveStep(MoveStep.SI_24_InoutBack);
InStoreLog(" 进出轴动作至P1(待机点)[" + moveP.InOut_P1 + "],调用SheflFinish ");
InStoreLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "],调用SheflFinish ");
HttpServer.ShelfFinish(CurrTray.realRFID, CurrTray.barcode, CurrTray.shelfP.ToString() );
......@@ -516,7 +514,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(MoveStep.SI_32_InoutToP4))
{
MoveInfo.NextMoveStep(MoveStep.SI_33_PutReel);
InStoreLog(" 放下物品，升降轴至P6 [" + moveP.UpDown_P6 + "] ,压紧轴至P3(压紧前点) [" + moveP.ComPress_P3 + "]");
InStoreLog(" 放下物品，升降轴至P6 [" + moveP.UpDown_P6 + "] ,压紧轴至P3 [" + moveP.ComPress_P3 + "]");
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
......@@ -524,13 +522,13 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(MoveStep.SI_33_PutReel))
{
MoveInfo.NextMoveStep(MoveStep.SI_34_InoutToP1);
InStoreLog(" 进出轴动作至P1(待机点)[" + moveP.InOut_P1 + "] ");
InStoreLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "] ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.IsStep(MoveStep.SI_34_InoutToP1))
{
MoveInfo.NextMoveStep(MoveStep.SI_35_GoBack);
InStoreLog(" 返回待机点，轴2/轴1/轴4动作至P1(待机点))");
InStoreLog(" 返回待机点，轴2/轴1/轴4动作至P1)");
ComMoveToPosition(moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
......@@ -561,13 +559,12 @@ namespace OnlineStore.DeviceLibrary
#endregion
private string autoInoutCode = "AUTOINOUT";
private string autoCode = "AUTOCODE";
private void InOutEndProcess(StoreMoveType storeMoveType)
{
try
{
CurrInOutCount++;
CurrInOutACount++;
CurrInOutCount++;
//是否自动进入出库状态
if (!autoNext)
{
......@@ -593,7 +590,7 @@ namespace OnlineStore.DeviceLibrary
}
autoPositionIndex = newIndex;
string posid = PositionNumList[autoPositionIndex];
InOutPosInfo inoutinfo = new InOutPosInfo(autoInoutCode, posid);
InOutPosInfo inoutinfo = new InOutPosInfo(autoCode, posid);
LogInfo("自动进入下一个入库：posid=" + posid);
autoMsg = "自动入库：" + posid;
......
source/DeviceLibrary/bean/EquipManager.cs
......@@ -56,7 +56,7 @@ namespace OnlineStore.DeviceLibrary
if (server.Equals(""))
{
IsConnectServer = false;
}
}
CheckEnum(typeof(MoveStep));
CheckEnum(typeof(StoreStatus));
CheckEnum(typeof(StoreRunStatus));
......@@ -65,31 +65,20 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info("开始加载配置");
string appPath = Application.StartupPath;
string CID = ConfigAppSettings.GetValue(Setting_Init.Store_CID);
string linefilePath = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_ConfigPath);
Config = CSVConfigReader.LoadStoreConfig(0, CID, "Line", linefilePath);
string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.Box_ConfigPath);
//for (int i = 1; i <= count; i++)
//{
// string nameStr = i.ToString().PadLeft(1, '0');
// string config = appPath + moveEquipConfig.Replace(".csv", "_" + nameStr + ".csv");
// string storeIdConfig = Setting_Init.Store_CID + "_" + i;
// string boxCid = ConfigAppSettings.GetValue(storeIdConfig);
// BoxConfig boxConfig = CSVConfigReader.LoadBoxConfig(i, boxCid, "BOX", config);
// boxConfig.SetIO(0);
// boxConfig.SetIO(i);
// BoxList.Add(i, boxConfig);
// allConfigMap.Add(i, boxConfig);
//}
string positionConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config);
CSVPositionReader<ShelfPosition>.AddCSVFile(positionConfigFile);
LogUtil.info("加载料仓完成！");
Equip = new EquipBean(Config );
CSVPositionReader<ShelfPosition>.AddCSVFile(positionConfigFile);
LogUtil.info("加载料仓完成！");
Equip = new EquipBean(Config);
}
}
catch (Exception ex)
......
source/DeviceLibrary/bean/WorkStation.cs
......@@ -20,12 +20,12 @@ namespace OnlineStore.DeviceLibrary
private string rfidIp = "";
public ShelfInfo CurrShelf = new ShelfInfo();
public ShelfTaskInfo MyTaskInfo = null;
public WorkStation(string name,string agvName,string rfidip)
{
this.rfidIp = rfidip;
MoveInfo = new StoreMoveInfo(1);
this.Name = "工位" + name;
this.Name = "" + name;
this.AgvName = agvName;
DI_FrontCheck += name;
DI_InCheck += name;
......@@ -54,13 +54,13 @@ namespace OnlineStore.DeviceLibrary
}
internal bool CheckNeedLeave(bool IsReset = true )
{
MyTaskInfo = HttpServer.ShelfFinish(CurrShelf.RealShelf);
CurrShelf.TaskInfo = HttpServer.ShelfFinish(CurrShelf.RealShelf);
string log = "";
//判断的当前料架是否无任务
if (MyTaskInfo.IsValid())
if (CurrShelf.TaskInfo.IsValid())
{
if (MyTaskInfo.bigEmpty <= 0 && MyTaskInfo.smallEmpty <= 0)
if (CurrShelf.TaskInfo.bigEmpty <= 0 && CurrShelf.TaskInfo.smallEmpty <= 0)
{
CurrShelf.IsNeedLeave = true;
LogUtil.info(Name + " " + CurrShelf.ToStr() + " 没有空位需要离开 ");
......@@ -207,7 +207,47 @@ namespace OnlineStore.DeviceLibrary
AgvStatusPro();
}
}
}
internal bool IsRightShelf(TrayInfo CurrTray, out string ShelfPosId)
{
ShelfPosId = "";
if (IsReady())
{
if (CurrShelf.RealShelf.Equals(CurrTray.realRFID))
{
ShelfPosId = Name + CurrTray.shelfP;
return true ;
}
else if (String.IsNullOrEmpty(CurrTray.realRFID))
{
if ((!CurrShelf.XNShelf.Equals("")) && CurrShelf.XNShelf.Equals(CurrTray.rfid))
{
CurrTray.realRFID = CurrShelf.RealShelf;
ShelfPosId = Name + CurrTray.shelfP;
return true ;
}
if (!String.IsNullOrEmpty(CurrTray.usedRfidList))
{
string[] array = CurrTray.usedRfidList.Split(',');
//若料架已使用过，直接返回false
if (array.Contains(CurrShelf.XNShelf))
{
return false ;
}
}
if (CurrShelf.XNShelf.Equals(""))
{
CurrTray.realRFID = CurrShelf.RealShelf;
ShelfPosId = Name + CurrTray.shelfP;
return true;
}
}
}
return false;
}
#region AGV
......@@ -543,6 +583,7 @@ namespace OnlineStore.DeviceLibrary
}
public class ShelfInfo
{
public ShelfTaskInfo TaskInfo = null;
public string RealShelf = "";
public string XNShelf = "";
public bool IsNeedLeave = false;
......@@ -557,7 +598,20 @@ namespace OnlineStore.DeviceLibrary
}
public string ToStr()
{
return "料架["+RealShelf+"]["+XNShelf+"]";
string result = "料架[" + RealShelf + "][" + XNShelf + "]";
if (TaskInfo != null && TaskInfo.IsValid())
{
result += "[空位：大料=" + TaskInfo.bigEmpty + "，小料=" + TaskInfo.smallEmpty + "]";
}
if (IsNeedLeave)
{
result += "[需离开]";
}
else if (IsBusy)
{
result += "[放料中]";
}
return result;
}
}
}
source/DeviceLibrary/lineConnect/LineConnect.cs
......@@ -131,8 +131,7 @@ namespace OnlineStore.DeviceLibrary
if (cmd.Equals(cmd_startIn))
{
LogUtil.info("[" + CID + "]收到流水线入库消息：" + message);
InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.IsNg, reviceInfo.PosId);
inout.rfid = reviceInfo.rfid;
InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.IsNg, reviceInfo.PosId,reviceInfo.rfid);
string logName = "收到流水线命令【 " + inout.ToStr() + "】：";
if (DoorPosInfo != null)
......
source/DeviceLibrary/model/EquipBase.cs
......@@ -348,10 +348,7 @@ namespace OnlineStore.DeviceLibrary
{
inout = "_入库："+MoveInfo.MoveParam.PosInfo.ToStr();
}
//else if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore) && MoveInfo.MoveParam != null && MoveInfo.MoveParam.PosInfo != null)
//{
// inout = "_出库：" + MoveInfo.MoveParam.PosInfo.ToStr();
//}
else
{
inout = " " + MoveInfo.MoveType + "_" + MoveInfo.MoveStep;
......@@ -370,14 +367,6 @@ namespace OnlineStore.DeviceLibrary
}
public string GetMoveStr()
{
string msg = "";
msg += "状态： " + storeRunStatus + "\t "+ " " + storeStatus + "\n";
msg += "alarm： " + alarmType + "\n";
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + "\n";
return msg;
}
public void IOMove(string IoType, IO_VALUE value)
{
......
source/DeviceLibrary/model/InOutParam.cs
......@@ -74,17 +74,13 @@ namespace OnlineStore.DeviceLibrary
}
public class InOutPosInfo
{
public InOutPosInfo(string barcode, string shelfPosId, int platew =0, int plateh =0,bool IsNg=false,string boxPosId="", bool urgentReel = false , bool cutReel = false, bool smallReel = false, string rfid = "", int rfidLoc = 0)
public InOutPosInfo(string barcode, string shelfPosId, int platew =0, int plateh =0,bool IsNg=false,string boxPosId="", string rfid = "" )
{
this.barcode = barcode;
this.ShelfPosId = shelfPosId;
this.PlateW = platew;
this.PlateH = plateh;
this.urgentReel = urgentReel;
this.cutReel = cutReel;
this.smallReel = smallReel;
this.rfid = rfid;
this.rfidLoc = rfidLoc;
this.PlateH = plateh;
this.rfid = rfid;
this.IsNg = IsNg;
this.BoxPosId = boxPosId;
}
......@@ -109,39 +105,18 @@ namespace OnlineStore.DeviceLibrary
/// 料盘高
/// </summary>
public int PlateH { get; set; }
/// <summary>
/// urgentReel: true 表示紧急料,需要出到料串上
/// </summary>
public bool urgentReel { get; set; }
/// <summary>
/// cutReel: true 表示分盘料,需要出到料串上
/// </summary>
public bool cutReel { get; set; }
/// <summary>
/// smallReel: true 小料(7x8),放置到小料架上
/// </summary>
public bool smallReel { get; set; }
/// <summary>
/// rfid: 分配的料架RFID
/// </summary>
public string rfid { get; set; }
/// <summary>
/// rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线,
/// 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线,
/// 70,71,72时只能分配到3 / 4号皮带线;
/// 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3/ 4号皮带线
/// </summary>
public int rfidLoc { get; set; }
public string rfid { get; set; }
/// <summary>
/// 是否是去NG箱的料
/// </summary>
public bool IsNg { get; set; }
public string ToStr()
{
return " [" + barcode + "] [" + ShelfPosId + "] [" + PlateW + "x" + PlateH + "],boxPos["+BoxPosId+"]，urgentReel [" + urgentReel
+ "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]";
{
return " [" + barcode + "] [" + ShelfPosId + "] [" + PlateW + "x" + PlateH + "],boxPos[" + BoxPosId + "],rfid [" + rfid + "]";
}
}
}
source/HCSingleStore/FrmEquip.Designer.cs
......@@ -144,9 +144,9 @@
this.panel2.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.panel2.Location = new System.Drawing.Point(0, 47);
this.panel2.Location = new System.Drawing.Point(1056, 20);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1154, 106);
this.panel2.Size = new System.Drawing.Size(53, 42);
this.panel2.TabIndex = 273;
//
// tabControl1
......@@ -156,10 +156,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Location = new System.Drawing.Point(5, 50);
this.tabControl1.Location = new System.Drawing.Point(5, 47);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1149, 627);
this.tabControl1.Size = new System.Drawing.Size(1109, 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(1141, 594);
this.tabPage2.Size = new System.Drawing.Size(1140, 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(1132, 454);
this.logBox.Size = new System.Drawing.Size(1131, 448);
this.logBox.TabIndex = 278;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -195,7 +195,7 @@
this.lblMoveStr.AutoSize = true;
this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveStr.ForeColor = System.Drawing.Color.Black;
this.lblMoveStr.Location = new System.Drawing.Point(931, 13);
this.lblMoveStr.Location = new System.Drawing.Point(825, 13);
this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(56, 17);
this.lblMoveStr.TabIndex = 277;
......@@ -264,7 +264,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(750, 9);
this.chbDebug.Location = new System.Drawing.Point(682, 8);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.TabIndex = 271;
......@@ -278,7 +278,7 @@
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(9, 44);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(909, 77);
this.lblWarnMsg.Size = new System.Drawing.Size(766, 77);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -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(1141, 594);
this.tabPage3.Size = new System.Drawing.Size(1101, 594);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位调试 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(536, 5);
this.axisMoveControl1.Location = new System.Drawing.Point(532, 5);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(577, 404);
this.axisMoveControl1.Size = new System.Drawing.Size(561, 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(724, 429);
this.btnAxisP.Location = new System.Drawing.Point(685, 415);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(132, 39);
this.btnAxisP.TabIndex = 8;
......@@ -362,7 +362,7 @@
this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 6);
this.groupInout.Location = new System.Drawing.Point(8, 6);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(516, 573);
this.groupInout.TabIndex = 100;
......@@ -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(724, 474);
this.btnUpdown.Location = new System.Drawing.Point(685, 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(578, 429);
this.btnAxisOn.Location = new System.Drawing.Point(539, 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(578, 473);
this.btnAxisOff.Location = new System.Drawing.Point(539, 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(1159, 29);
this.menuStrip1.Size = new System.Drawing.Size(1114, 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(1159, 683);
this.ClientSize = new System.Drawing.Size(1114, 683);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.panel2);
......
source/HCSingleStore/FrmEquip.cs
......@@ -173,12 +173,8 @@ namespace OnlineStore.ACSingleStore
lblMoveStr.Text = equip.GetMoveStr();
//ReadPosistion();
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))
{
......@@ -188,9 +184,9 @@ namespace OnlineStore.ACSingleStore
if (lblWarnMsg.Text.Equals(""))
{
if ( LineConnect.DoorPosInfo != null)
if (LineConnect.DoorPosInfo != null)
{
string msg = "D7门口料信息："+LineConnect.DoorPosInfo.ToStr();
string msg = "出料口物料：" + LineConnect.DoorPosInfo.ToStr()+"\r\n"+"料架信息："+equip.CurrTray.ToStr();
lblWarnMsg.Text = msg;
}
}
......
source/HCSingleStore/FrmLineIO.Designer.cs
......@@ -108,7 +108,7 @@
this.S1_LineRun.Name = "S1_LineRun";
this.S1_LineRun.Size = new System.Drawing.Size(132, 39);
this.S1_LineRun.TabIndex = 242;
this.S1_LineRun.Text = "工位1-线体正转";
this.S1_LineRun.Text = "工位1-线体正转->>";
this.S1_LineRun.UseVisualStyleBackColor = false;
this.S1_LineRun.Click += new System.EventHandler(this.S1_LineRun_Click);
//
......@@ -121,7 +121,7 @@
this.S3_LineRun.Name = "S3_LineRun";
this.S3_LineRun.Size = new System.Drawing.Size(132, 39);
this.S3_LineRun.TabIndex = 252;
this.S3_LineRun.Text = "工位3-线体正转";
this.S3_LineRun.Text = "工位3-线体正转->>";
this.S3_LineRun.UseVisualStyleBackColor = false;
this.S3_LineRun.Click += new System.EventHandler(this.S3_LineRun_Click);
//
......@@ -134,7 +134,7 @@
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;
this.S1_LocationCylinder_Up.Text = "工位1-定位上升";
this.S1_LocationCylinder_Up.Text = "工位1-定位上升 ↑";
this.S1_LocationCylinder_Up.UseVisualStyleBackColor = false;
this.S1_LocationCylinder_Up.Click += new System.EventHandler(this.S1_LocationCylinder_Up_Click);
//
......@@ -160,7 +160,7 @@
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;
this.S1_LocationCylinder_Down.Text = "工位1-定位下降";
this.S1_LocationCylinder_Down.Text = "工位1-定位下降 ↓";
this.S1_LocationCylinder_Down.UseVisualStyleBackColor = false;
this.S1_LocationCylinder_Down.Click += new System.EventHandler(this.S1_LocationCylinder_Down_Click);
//
......@@ -173,7 +173,7 @@
this.S3_LineBackRun.Name = "S3_LineBackRun";
this.S3_LineBackRun.Size = new System.Drawing.Size(132, 39);
this.S3_LineBackRun.TabIndex = 253;
this.S3_LineBackRun.Text = "工位3-线体反转";
this.S3_LineBackRun.Text = "工位3-线体反转<<-";
this.S3_LineBackRun.UseVisualStyleBackColor = false;
this.S3_LineBackRun.Click += new System.EventHandler(this.S3_LineBackRun_Click);
//
......@@ -186,7 +186,7 @@
this.S1_LineBackRun.Name = "S1_LineBackRun";
this.S1_LineBackRun.Size = new System.Drawing.Size(132, 39);
this.S1_LineBackRun.TabIndex = 243;
this.S1_LineBackRun.Text = "工位1-线体反转";
this.S1_LineBackRun.Text = "工位1-线体反转<<-";
this.S1_LineBackRun.UseVisualStyleBackColor = false;
this.S1_LineBackRun.Click += new System.EventHandler(this.S1_LineBackRun_Click);
//
......@@ -199,7 +199,7 @@
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;
this.S3_LocationCylinder_Down.Text = "工位3-定位下降";
this.S3_LocationCylinder_Down.Text = "工位3-定位下降 ↓";
this.S3_LocationCylinder_Down.UseVisualStyleBackColor = false;
this.S3_LocationCylinder_Down.Click += new System.EventHandler(this.S3_LocationCylinder_Down_Click);
//
......@@ -225,7 +225,7 @@
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;
this.S3_LocationCylinder_Up.Text = "工位3-定位上升";
this.S3_LocationCylinder_Up.Text = "工位3-定位上升 ↑";
this.S3_LocationCylinder_Up.UseVisualStyleBackColor = false;
this.S3_LocationCylinder_Up.Click += new System.EventHandler(this.S3_LocationCylinder_Up_Click);
//
......@@ -238,7 +238,7 @@
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;
this.S2_LocationCylinder_Up.Text = "工位2-定位上升";
this.S2_LocationCylinder_Up.Text = "工位2-定位上升 ↑";
this.S2_LocationCylinder_Up.UseVisualStyleBackColor = false;
this.S2_LocationCylinder_Up.Click += new System.EventHandler(this.S2_LocationCylinder_Up_Click);
//
......@@ -251,7 +251,7 @@
this.S2_LineRun.Name = "S2_LineRun";
this.S2_LineRun.Size = new System.Drawing.Size(132, 39);
this.S2_LineRun.TabIndex = 247;
this.S2_LineRun.Text = "工位2-线体正转";
this.S2_LineRun.Text = "工位2-线体正转->>";
this.S2_LineRun.UseVisualStyleBackColor = false;
this.S2_LineRun.Click += new System.EventHandler(this.S2_LineRun_Click);
//
......@@ -264,7 +264,7 @@
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;
this.S2_LocationCylinder_Down.Text = "工位2-定位下降";
this.S2_LocationCylinder_Down.Text = "工位2-定位下降 ↓";
this.S2_LocationCylinder_Down.UseVisualStyleBackColor = false;
this.S2_LocationCylinder_Down.Click += new System.EventHandler(this.S2_LocationCylinder_Down_Click);
//
......@@ -290,7 +290,7 @@
this.S2_LineBackRun.Name = "S2_LineBackRun";
this.S2_LineBackRun.Size = new System.Drawing.Size(132, 39);
this.S2_LineBackRun.TabIndex = 248;
this.S2_LineBackRun.Text = "工位2-线体反转";
this.S2_LineBackRun.Text = "工位2-线体反转<<-";
this.S2_LineBackRun.UseVisualStyleBackColor = false;
this.S2_LineBackRun.Click += new System.EventHandler(this.S2_LineBackRun_Click);
//
......
source/HCSingleStore/FrmLineIO.cs
......@@ -38,7 +38,7 @@ namespace OnlineStore.ACSingleStore
foreach (ConfigIO ioValue in EquipManager.Config.DIList.Values)
{
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName,230,28);
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
......@@ -52,7 +52,7 @@ namespace OnlineStore.ACSingleStore
roleindex = 0;
foreach (ConfigIO ioValue in EquipManager.Config.DOList.Values)
{
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName, 230, 28);
control.Click += Control_Click;
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
......
source/HCSingleStore/OutletEquip.csproj
......@@ -53,7 +53,6 @@
<ApplicationIcon>box.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="HCSingleStore, Version=1.0.7629.30073, Culture=neutral, PublicKeyToken=null" />
<Reference Include="log4net">
<HintPath>..\..\dll\log4net.dll</HintPath>
</Reference>
......
source/HCSingleStore/userControl/AxisMoveControl.cs
......@@ -50,14 +50,12 @@ namespace OnlineStore.AutoCountClient
btnDelMove.BackColor = Color.White;
this.IsHuiChuan = isHc;
if (IsHuiChuan)
{
groupBox1.Visible = false;
{
groupBox2.Visible = true;
timer1.Start();
}
else
{
groupBox1.Visible = true;
{
groupBox2.Visible = false;
}
}
......@@ -180,14 +178,14 @@ namespace OnlineStore.AutoCountClient
private void btnGetAlarm_Click(object sender, EventArgs e)
{
this.txtAlarmStatus.Text = AxisManager.instance.GetAlarmStatus(PortName, SlvAddr).ToString();
this.txtBusyStatus.Text = AxisManager.instance.GetBusyStatus(PortName, SlvAddr).ToString();
//this.txtStb.Text = AxisManager.instance.GetSTBState(PortName, SlvAddr).ToString();
this.txtHomeStatus.Text = AxisManager.instance.GetHomeEndStatus(PortName, SlvAddr).ToString();
this.txtHomeSingle.Text = AxisManager.instance.GetHomeSingle(PortName, SlvAddr).ToString();
this.txtLimit1.Text = AxisManager.instance.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
this.txtLimit2.Text = AxisManager.instance.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
txtServoStatue.Text = AxisManager.instance.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘";
//this.txtAlarmStatus.Text = AxisManager.instance.GetAlarmStatus(PortName, SlvAddr).ToString();
//this.txtBusyStatus.Text = AxisManager.instance.GetBusyStatus(PortName, SlvAddr).ToString();
////this.txtStb.Text = AxisManager.instance.GetSTBState(PortName, SlvAddr).ToString();
//this.txtHomeStatus.Text = AxisManager.instance.GetHomeEndStatus(PortName, SlvAddr).ToString();
//this.txtHomeSingle.Text = AxisManager.instance.GetHomeSingle(PortName, SlvAddr).ToString();
//this.txtLimit1.Text = AxisManager.instance.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
//this.txtLimit2.Text = AxisManager.instance.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
//txtServoStatue.Text = AxisManager.instance.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘";
}
......@@ -236,23 +234,21 @@ namespace OnlineStore.AutoCountClient
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
btnAxisRMove.ForeColor = color;
//btnAxisVMove.ForeColor = color;
btnAxisRMove.ForeColor = color;
btnAxisReturnHome.ForeColor = color;
btnAxisStop.ForeColor = color;
btnComAlarmClear.ForeColor = color;
//btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color;
btnComAlarmClear.ForeColor = color;
btnAddMove.ForeColor = color;
btnDelMove.ForeColor = color;
this.txtAlarmStatus.Text = "";
this.txtBusyStatus.Text = "";
this.txtHomeStatus.Text = "";
this.txtHomeSingle.Text = "";
this.txtLimit1.Text = "";
this.txtLimit2.Text = "";
txtServoStatue.Text = "";
//btnGetAlarm.ForeColor = color;
//this.txtAlarmStatus.Text = "";
//this.txtBusyStatus.Text = "";
//this.txtHomeStatus.Text = "";
//this.txtHomeSingle.Text = "";
//this.txtLimit1.Text = "";
//this.txtLimit2.Text = "";
//txtServoStatue.Text = "";
}
}
private void AxisMove(int speed)
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
......@@ -76,10 +76,10 @@ namespace OnlineStore.LoadCSVLibrary
[CSVAttribute("加速度")]
public short AddSpeed { get; set; }
public int AddSpeed { get; set; }
[CSVAttribute("减速度")]
public short DelSpeed { get; set; }
public int DelSpeed { get; set; }
[CSVAttribute("回零低速")]
public int HomeLowSpeed { get; set; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!