Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 321f205e 由 几米阳光
选项

1

1 个父辈 615e6b79
内嵌 并排
正在显示 6 个修改的文件 包含 128 行增加 和 128 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -219,14 +219,10 @@
this.lblBatchStatus = new System.Windows.Forms.Label();
this.btnBatchOutTest = new System.Windows.Forms.Button();
this.btnBatchReset = new System.Windows.Forms.Button();
this.btnStartBatchInStore = new System.Windows.Forms.Button();
this.btnCloseDoor = new System.Windows.Forms.Button();
this.btnGetOutTray = new System.Windows.Forms.Button();
this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button();
this.axis_5_Alarm = new UserFromControl.IOStatusControl();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button();
......@@ -238,6 +234,10 @@
this.txtHum = new System.Windows.Forms.TextBox();
this.label29 = new System.Windows.Forms.Label();
this.btnSelTemp = new System.Windows.Forms.Button();
this.axis_5_Alarm = new UserFromControl.IOStatusControl();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -2392,7 +2392,7 @@
this.groupBox6.Controls.Add(this.lblBatchStatus);
this.groupBox6.Controls.Add(this.btnBatchOutTest);
this.groupBox6.Controls.Add(this.btnBatchReset);
this.groupBox6.Controls.Add(this.btnStartBatchInStore);
this.groupBox6.Controls.Add(this.btnCloseDoor);
this.groupBox6.Controls.Add(this.btnGetOutTray);
this.groupBox6.Controls.Add(this.lblDoorStatus);
this.groupBox6.Controls.Add(this.btnBatchInStore);
......@@ -2407,7 +2407,7 @@
// btnOpenDoor
//
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(22, 66);
this.btnOpenDoor.Location = new System.Drawing.Point(22, 110);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(105, 38);
this.btnOpenDoor.TabIndex = 232;
......@@ -2418,18 +2418,18 @@
// lblWaitTragGo
//
this.lblWaitTragGo.AutoSize = true;
this.lblWaitTragGo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWaitTragGo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWaitTragGo.ForeColor = System.Drawing.Color.Red;
this.lblWaitTragGo.Location = new System.Drawing.Point(150, 120);
this.lblWaitTragGo.Location = new System.Drawing.Point(149, 72);
this.lblWaitTragGo.Name = "lblWaitTragGo";
this.lblWaitTragGo.Size = new System.Drawing.Size(247, 20);
this.lblWaitTragGo.Size = new System.Drawing.Size(250, 22);
this.lblWaitTragGo.TabIndex = 231;
this.lblWaitTragGo.Text = "请手动拿出料盘，并点击左侧信号确认";
this.lblWaitTragGo.Text = "请拿走料盘，并点击左侧按钮确认";
//
// btnWaitTrgGo
//
this.btnWaitTrgGo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWaitTrgGo.Location = new System.Drawing.Point(22, 112);
this.btnWaitTrgGo.Location = new System.Drawing.Point(21, 64);
this.btnWaitTrgGo.Name = "btnWaitTrgGo";
this.btnWaitTrgGo.Size = new System.Drawing.Size(105, 38);
this.btnWaitTrgGo.TabIndex = 230;
......@@ -2470,21 +2470,21 @@
this.btnBatchReset.UseVisualStyleBackColor = true;
this.btnBatchReset.Click += new System.EventHandler(this.btnBatchOutEnd_Click);
//
// btnStartBatchInStore
// btnCloseDoor
//
this.btnStartBatchInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartBatchInStore.Location = new System.Drawing.Point(362, 66);
this.btnStartBatchInStore.Name = "btnStartBatchInStore";
this.btnStartBatchInStore.Size = new System.Drawing.Size(105, 38);
this.btnStartBatchInStore.TabIndex = 226;
this.btnStartBatchInStore.Text = "关闭门锁";
this.btnStartBatchInStore.UseVisualStyleBackColor = true;
this.btnStartBatchInStore.Click += new System.EventHandler(this.btnStartBatchInStore_Click);
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(362, 110);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(105, 38);
this.btnCloseDoor.TabIndex = 226;
this.btnCloseDoor.Text = "关闭门锁";
this.btnCloseDoor.UseVisualStyleBackColor = true;
this.btnCloseDoor.Click += new System.EventHandler(this.btnStartBatchInStore_Click);
//
// btnGetOutTray
//
this.btnGetOutTray.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetOutTray.Location = new System.Drawing.Point(254, 66);
this.btnGetOutTray.Location = new System.Drawing.Point(254, 110);
this.btnGetOutTray.Name = "btnGetOutTray";
this.btnGetOutTray.Size = new System.Drawing.Size(105, 38);
this.btnGetOutTray.TabIndex = 225;
......@@ -2506,7 +2506,7 @@
// btnBatchInStore
//
this.btnBatchInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchInStore.Location = new System.Drawing.Point(133, 66);
this.btnBatchInStore.Location = new System.Drawing.Point(133, 110);
this.btnBatchInStore.Name = "btnBatchInStore";
this.btnBatchInStore.Size = new System.Drawing.Size(105, 38);
this.btnBatchInStore.TabIndex = 103;
......@@ -2514,46 +2514,6 @@
this.btnBatchInStore.UseVisualStyleBackColor = true;
this.btnBatchInStore.Click += new System.EventHandler(this.btnBatchInStore_Click);
//
// axis_5_Alarm
//
this.axis_5_Alarm.IOName = "";
this.axis_5_Alarm.IOValue = 0;
this.axis_5_Alarm.isCanClick = false;
this.axis_5_Alarm.Location = new System.Drawing.Point(418, 37);
this.axis_5_Alarm.Name = "axis_5_Alarm";
this.axis_5_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_5_Alarm.TabIndex = 271;
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(116, 37);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(318, 37);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(213, 37);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.groupBox7);
......@@ -2678,6 +2638,46 @@
this.btnSelTemp.UseVisualStyleBackColor = true;
this.btnSelTemp.Click += new System.EventHandler(this.btnSelTemp_Click);
//
// axis_5_Alarm
//
this.axis_5_Alarm.IOName = "";
this.axis_5_Alarm.IOValue = 0;
this.axis_5_Alarm.isCanClick = false;
this.axis_5_Alarm.Location = new System.Drawing.Point(418, 37);
this.axis_5_Alarm.Name = "axis_5_Alarm";
this.axis_5_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_5_Alarm.TabIndex = 271;
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(116, 37);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(318, 37);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(213, 37);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......@@ -2900,7 +2900,7 @@
private System.Windows.Forms.Label lblDoorStatus;
private System.Windows.Forms.Button btnBatchInStore;
private System.Windows.Forms.Button btnGetOutTray;
private System.Windows.Forms.Button btnStartBatchInStore;
private System.Windows.Forms.Button btnCloseDoor;
private System.Windows.Forms.Button btnBatchReset;
private System.Windows.Forms.Button btnBatchOutTest;
private System.Windows.Forms.Label lblBatchStatus;
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -298,6 +298,8 @@ namespace OnlineStore.AutoInOutStore
lblWaitTragGo.Visible = true;
btnBatchInStore.Enabled = false;
btnBatchInStore.Enabled = false;
btnOpenDoor.Enabled = false;
btnCloseDoor.Enabled = false;
}
else
{
......@@ -307,19 +309,19 @@ namespace OnlineStore.AutoInOutStore
{
lblDoorStatus.Text = "仓门状态：关闭";
UpdateFormDoorStats(false);
if (store.StoreMove.MoveType.Equals(StoreMoveType.None) && AutomaticBaiting.StoreMove.MoveType.Equals(StoreMoveType.None))
{
if (AutomaticBaiting.BatchOutStoreCount > 0)
{
btnGetOutTray.Enabled = true;
btnBatchInStore.Enabled = false;
}
else
{
btnGetOutTray.Enabled = false;
btnBatchInStore.Enabled = true;
}
}
//if (store.StoreMove.MoveType.Equals(StoreMoveType.None) && AutomaticBaiting.StoreMove.MoveType.Equals(StoreMoveType.None))
//{
// if (AutomaticBaiting.BatchOutStoreCount > 0)
// {
// btnGetOutTray.Enabled = true;
// btnBatchInStore.Enabled = false;
// }
// else
// {
// btnGetOutTray.Enabled = false;
// btnBatchInStore.Enabled = true;
// }
//}
}
else
{
......@@ -345,10 +347,12 @@ namespace OnlineStore.AutoInOutStore
private void UpdateFormDoorStats(bool dooIsOpen)
{
btnBatchInStore.Enabled = !dooIsOpen;
btnOpenDoor.Enabled = !dooIsOpen;
btnBatchInStore.Enabled = dooIsOpen;
btnGetOutTray.Enabled = !dooIsOpen;
btnStartBatchInStore.Enabled = dooIsOpen;
btnBatchReset.Enabled = !dooIsOpen;
btnCloseDoor.Enabled = dooIsOpen;
btnBatchReset.Enabled = !dooIsOpen;
}
private void ReadPosistion()
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -16,8 +16,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public partial class AC_SA_BoxBean : AC_Store
{
private bool IsIntSlvBlock = false;
public bool UseBatchInout = true;
private bool IsIntSlvBlock = false;
public bool UseBatchInout = true;
public string CID = "";
public AUTO_SA_Config Config;
/// <summary>
......@@ -33,7 +33,7 @@ namespace OnlineStore.DeviceLibrary
/// 轴报警信息
/// </summary>
private Dictionary<string, AxisAlarmInfo> AxisAlarmCodeMap = new Dictionary<string, AxisAlarmInfo>();
private bool IsHasCompress_Axis = true;
public AC_SA_BoxBean(AUTO_SA_Config config)
{
......@@ -67,7 +67,7 @@ namespace OnlineStore.DeviceLibrary
//初始化摄像机配置
string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
CodeManager.LoadConfig(nameStr, codeStr);
CodeManager.LoadConfig(nameStr, codeStr);
AutomaticBaiting.Init();
//初始化 //连接设备
......@@ -76,7 +76,7 @@ namespace OnlineStore.DeviceLibrary
{
KNDManager.ConnectionKND(Config.DIODeviceNameList);
int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
mainTimer.Enabled = (isAuto == 1);
mainTimer.Enabled = (isAuto == 1);
Task.Factory.StartNew(delegate
{
Thread.Sleep(300);
......@@ -85,7 +85,7 @@ namespace OnlineStore.DeviceLibrary
KND.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
KND.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
});
}
}
}
private void IoCheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
......@@ -183,7 +183,7 @@ namespace OnlineStore.DeviceLibrary
ReturnHome();
mainTimer.Enabled = true;
IoCheckTimer.Enabled = true;
serverConnectTimer.Enabled = true;
serverConnectTimer.Enabled = true;
return true;
}
else
......@@ -650,7 +650,7 @@ namespace OnlineStore.DeviceLibrary
StopMove(true);
storeRunStatus = StoreRunStatus.Wait;
mainTimer.Enabled = false;
mainTimer.Enabled = false;
KNDManager.CloseAllDO();
if (IsHasCompress_Axis)
......@@ -703,7 +703,7 @@ namespace OnlineStore.DeviceLibrary
//private DateTime preProcessTime = DateTime.Now;
private bool IsChongfu = false;
private Stopwatch stopwatch = new Stopwatch();
private object TimerLock = "";
//private object TimerLock = "";
protected override void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
......@@ -717,46 +717,34 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.error("主定时器：InProcess已等待" + stopwatch.Elapsed.ToString() + "重新处理");
IsChongfu = true;
Monitor.Exit(TimerLock);
}
}
InProcess = true;
stopwatch.Restart();
if (Monitor.TryEnter(TimerLock))
try
{
try
IoCheckProcess();
ShowTimeLog("IoCheckProcess");
TimerProcess();
ShowTimeLog("TimerProcess");
//检查运动轴报警
if (storeRunStatus > StoreRunStatus.Wait && (!isInSuddenDown) && (!isNoAirCheck))
{
IoCheckProcess();
ShowTimeLog("IoCheckProcess");
TimerProcess();
ShowTimeLog("TimerProcess");
//检查运动轴报警
if (storeRunStatus > StoreRunStatus.Wait && (!isInSuddenDown) && (!isNoAirCheck))
{
ShowTimeLog("开始检测轴报警");
CheckAxisAlarm();
ShowTimeLog("轴报警检测完成");
}
if (UseBatchInout)
{
AutomaticBaiting.TimerProcess();
}
ShowTimeLog("开始检测轴报警");
CheckAxisAlarm();
ShowTimeLog("轴报警检测完成");
}
catch (Exception ex)
{
LOGGER.Error(StoreName + "定时处理出错：" + ex.ToString());
}
finally
if (UseBatchInout)
{
Monitor.Exit(TimerLock);
AutomaticBaiting.TimerProcess();
}
}
else
catch (Exception ex)
{
LOGGER.Error(StoreName + "定时处理未得到锁");
LOGGER.Error(StoreName + "定时处理出错：" + ex.ToString());
}
IsChongfu = false;
InProcess = false;
}
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
......@@ -165,8 +165,8 @@ namespace OnlineStore.DeviceLibrary
break;
case StoreMoveStep.AUTO_R03_AutoAxisHome:
//if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW))
if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1))
if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW))
//if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1))
{
LogUtil.info(Name + "复位中: 没有料盘，不需要上料，上料轴回0点");
StoreMove.NextMoveStep(StoreMoveStep.AUTO_R04_AutoBack);
......@@ -366,8 +366,8 @@ namespace OnlineStore.DeviceLibrary
LastSize = 0;
LastPosId = "";
SuckingDisc_WorkCount = 0;
if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(0))
//if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
// if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(0))
if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
{
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I01_ScanCode);
LogUtil.info(Name + "入料: 开始扫码 ");
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
......@@ -19,7 +19,7 @@ namespace OnlineStore.DeviceLibrary
AutoAxisIsMove = 1;
StartMovePosition = ACServerManager.GetActualtPosition(moveAxis.DeviceName, moveAxis.GetAxisValue());
EndMovePosition = StartMovePosition;
StoreMove.WaitList.Add(WaitResultInfo.WaitAutoAxisStop(moveAxis));
StoreMove.WaitList.Add(WaitResultInfo.WaitBatchAxisStop(moveAxis));
ACServerManager.SpeedMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetSpeed);
}
......@@ -247,19 +247,22 @@ namespace OnlineStore.DeviceLibrary
bool result = false;
if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
{
LogUtil.info(wait.ToStr()+"检测到上料机构料盘信号，可以停止运动");
result = true;
}
else
{
IO_VALUE LimitN = (IO_VALUE)ACServerManager.GetLimitNegativeSingle(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
IO_VALUE LimitN = (IO_VALUE)ACServerManager.GetLimitPositiveSingle(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
if (LimitN.Equals(IO_VALUE.HIGH))
{
LogUtil.info(wait.ToStr() + "检测到正极限信号，可以停止运动");
result = true;
}
}
if (result)
{
AutoAxisIsMove = 0;
LogUtil.info(wait.ToStr() + " 停止运动");
ACServerManager.SuddenStop(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
}
return result;
......@@ -294,10 +297,6 @@ namespace OnlineStore.DeviceLibrary
if (codeList.Count <= 0)
{
codeList = CodeManager.CameraScan();
}else if(StoreManager.Store.IsDebug)
{
codeList = new List<string>() { "NoCode"};
LogUtil.info(Name+"未扫到二维码，默认为NoCode");
}
foreach (string str in codeList)
{
......@@ -307,9 +306,18 @@ namespace OnlineStore.DeviceLibrary
LastCode = message;
if (LastCode.Equals(""))
{
LastCode = "NoCode";
LogUtil.info(Name + "未扫到二维码，默认为NoCode");
}
if (LastCode.Equals(""))
{
LogUtil.error("未扫到二维码，请拿走料盘");
WarnMsg = "未扫到二维码，请拿走料盘";
}
else
{
LogUtil.info("扫到二维码：" + LastCode);
}
KND.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
// StoreManager.Store.onCodeReceived(message);
});
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
......@@ -274,10 +274,10 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 10=等待上料轴运动 停止
/// 10=等待批量上下料轴运动 停止
/// </summary>
/// <returns></returns>
public static WaitResultInfo WaitAutoAxisStop(ConfigMoveAxis moveAxis)
public static WaitResultInfo WaitBatchAxisStop(ConfigMoveAxis moveAxis)
{
WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!