Skip to content

李娜 / AutoCountMachine

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

贴标功能增加启用开关

1 个父辈 30ffdc55
内嵌 并排
正在显示 9 个修改的文件 包含 92 行增加 和 10 行删除
RC1266-AutoCountMachine/source/AutoCountClient/App.config
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
<add key ="ResultMinCount" value ="100"/> <add key ="ResultMinCount" value ="100"/>
<add key ="ComPath_Config" value ="\XRAY\pnDetailedList.csv"/> <add key ="ComPath_Config" value ="\XRAY\pnDetailedList.csv"/>
<add key ="LabelWaitMS" value ="1000"/> <add key ="LabelWaitMS" value ="1000"/>
<add key ="UseLabel" value ="1"/>
</appSettings> </appSettings>
<log4net> <log4net>
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
...@@ -85,6 +85,8 @@ ...@@ -85,6 +85,8 @@
this.启用蜂鸣器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.启用蜂鸣器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.启用光栅信号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.启用光栅信号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.启用贴标功能ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lblXrayWork = new System.Windows.Forms.Label(); this.lblXrayWork = new System.Windows.Forms.Label();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
...@@ -360,43 +362,43 @@ ...@@ -360,43 +362,43 @@
// 元器件学习ToolStripMenuItem // 元器件学习ToolStripMenuItem
// //
this.元器件学习ToolStripMenuItem.Name = "元器件学习ToolStripMenuItem"; this.元器件学习ToolStripMenuItem.Name = "元器件学习ToolStripMenuItem";
this.元器件学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26); this.元器件学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.元器件学习ToolStripMenuItem.Text = "元器件学习"; this.元器件学习ToolStripMenuItem.Text = "元器件学习";
this.元器件学习ToolStripMenuItem.Click += new System.EventHandler(this.元器件学习ToolStripMenuItem_Click); this.元器件学习ToolStripMenuItem.Click += new System.EventHandler(this.元器件学习ToolStripMenuItem_Click);
// //
// toolStripSeparator17 // toolStripSeparator17
// //
this.toolStripSeparator17.Name = "toolStripSeparator17"; this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(157, 6); this.toolStripSeparator17.Size = new System.Drawing.Size(177, 6);
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习"; this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click); this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(157, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
// //
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(160, 26); this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "AGV调试"; this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(157, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
// //
// 标签编辑ToolStripMenuItem // 标签编辑ToolStripMenuItem
// //
this.标签编辑ToolStripMenuItem.Name = "标签编辑ToolStripMenuItem"; this.标签编辑ToolStripMenuItem.Name = "标签编辑ToolStripMenuItem";
this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(160, 26); this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.标签编辑ToolStripMenuItem.Text = "标签编辑"; this.标签编辑ToolStripMenuItem.Text = "标签编辑";
this.标签编辑ToolStripMenuItem.Click += new System.EventHandler(this.标签编辑ToolStripMenuItem_Click); this.标签编辑ToolStripMenuItem.Click += new System.EventHandler(this.标签编辑ToolStripMenuItem_Click);
// //
...@@ -497,7 +499,9 @@ ...@@ -497,7 +499,9 @@
this.toolStripSeparator13, this.toolStripSeparator13,
this.启用蜂鸣器ToolStripMenuItem, this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator12, this.toolStripSeparator12,
this.启用光栅信号ToolStripMenuItem}); this.启用光栅信号ToolStripMenuItem,
this.toolStripSeparator14,
this.启用贴标功能ToolStripMenuItem});
this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(86, 25); this.toolStripMenuItem4.Size = new System.Drawing.Size(86, 25);
this.toolStripMenuItem4.Text = "运行参数"; this.toolStripMenuItem4.Text = "运行参数";
...@@ -558,6 +562,18 @@ ...@@ -558,6 +562,18 @@
this.启用光栅信号ToolStripMenuItem.Text = "启用光栅信号"; this.启用光栅信号ToolStripMenuItem.Text = "启用光栅信号";
this.启用光栅信号ToolStripMenuItem.Click += new System.EventHandler(this.启用光栅信号ToolStripMenuItem_Click); this.启用光栅信号ToolStripMenuItem.Click += new System.EventHandler(this.启用光栅信号ToolStripMenuItem_Click);
// //
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(210, 6);
//
// 启用贴标功能ToolStripMenuItem
//
this.启用贴标功能ToolStripMenuItem.Name = "启用贴标功能ToolStripMenuItem";
this.启用贴标功能ToolStripMenuItem.Size = new System.Drawing.Size(213, 26);
this.启用贴标功能ToolStripMenuItem.Text = "启用贴标功能";
this.启用贴标功能ToolStripMenuItem.Click += new System.EventHandler(this.启用贴标功能ToolStripMenuItem_Click);
//
// lblXrayWork // lblXrayWork
// //
this.lblXrayWork.AutoSize = true; this.lblXrayWork.AutoSize = true;
...@@ -663,6 +679,8 @@ ...@@ -663,6 +679,8 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator16; private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
private System.Windows.Forms.ToolStripMenuItem 启用光栅信号ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 启用光栅信号ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
private System.Windows.Forms.ToolStripMenuItem 启用贴标功能ToolStripMenuItem;
} }
} }
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.cs
...@@ -129,6 +129,14 @@ namespace OnlineStore.AutoCountClient ...@@ -129,6 +129,14 @@ namespace OnlineStore.AutoCountClient
{ {
启用光栅信号ToolStripMenuItem.Text = "启用光栅信号"; 启用光栅信号ToolStripMenuItem.Text = "启用光栅信号";
} }
if (RobotManager.UseLabel)
{
启用贴标功能ToolStripMenuItem.Text = gouStr + "启用贴标功能";
}
else
{
启用贴标功能ToolStripMenuItem.Text = "启用贴标功能";
}
CSVBomManager.LoadAllCom(); CSVBomManager.LoadAllCom();
LoadStoreData(); LoadStoreData();
...@@ -979,5 +987,30 @@ namespace OnlineStore.AutoCountClient ...@@ -979,5 +987,30 @@ namespace OnlineStore.AutoCountClient
} }
LogUtil.info(Name + " 点击：" + 启用光栅信号ToolStripMenuItem.Text); LogUtil.info(Name + " 点击：" + 启用光栅信号ToolStripMenuItem.Text);
} }
private void 启用贴标功能ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = !启用贴标功能ToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(RobotManager.UseLabel))
{
return;
}
RobotManager.UseLabel = result;
ConfigAppSettings.SaveValue(Setting_Init.UseLabel, (RobotManager.UseLabel ? 1 : 0));
if (result)
{
启用贴标功能ToolStripMenuItem.Text = gouStr + " 启用贴标功能";
}
else
{
启用贴标功能ToolStripMenuItem.Text = "启用贴标功能";
}
LogUtil.info(Name + " 点击：" + 启用贴标功能ToolStripMenuItem.Text);
}
} }
} }
RC1266-AutoCountMachine/source/AutoCountClient/记录.txt
...@@ -111,4 +111,6 @@ IO_Type.TakeCode_Back, IO_Type.TakeCode_Forward ...@@ -111,4 +111,6 @@ IO_Type.TakeCode_Back, IO_Type.TakeCode_Forward
20200917 20200917
取料机构取料时，点料机不转动皮带线 ，防止出口有两盘料
\ No newline at end of file \ No newline at end of file
出料机构增加各个机构复位功能。
取料机构取料时，点料机不转动皮带线 ，防止出口有两盘料,
贴标功能增加开关。
\ No newline at end of file \ No newline at end of file
RC1266-AutoCountMachine/source/Common/Setting_Init.cs
...@@ -97,6 +97,10 @@ namespace OnlineStore.Common ...@@ -97,6 +97,10 @@ namespace OnlineStore.Common
public static string LabelWaitMS = "LabelWaitMS"; public static string LabelWaitMS = "LabelWaitMS";
public static string GratingSignal = " GratingSignal"; public static string GratingSignal = " GratingSignal";
/// <summary>
/// 启用贴标功能
/// </summary>
public static string UseLabel = "UseLabel";
} }
} }
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs
...@@ -128,6 +128,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -128,6 +128,14 @@ namespace OnlineStore.DeviceLibrary
{ {
return true; return true;
} }
if (!RobotManager.UseLabel)
{
WorkLog("取料： 贴标功能未启用，不需要启动贴标，设置IsStartLabel=true");
IsStartLabel = true;
return true;
}
//TODO 记录信息，判断贴标模块当前空闲，此时可以打印标签（取码气缸前进，打印标签，取码气缸后退） //TODO 记录信息，判断贴标模块当前空闲，此时可以打印标签（取码气缸前进，打印标签，取码气缸后退）
if (SecMoveInfo.MoveType.Equals(RobotMoveType.None)) if (SecMoveInfo.MoveType.Equals(RobotMoveType.None))
{ {
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Shelf.cs
...@@ -256,9 +256,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -256,9 +256,23 @@ namespace OnlineStore.DeviceLibrary
} }
else if (ShelfMoveInfo.IsStep(StepEnum.OS_24_BatchToP3)) else if (ShelfMoveInfo.IsStep(StepEnum.OS_24_BatchToP3))
{ {
if (RobotManager.UseLabel)
{
ShelfMoveInfo.NextMoveStep(StepEnum.OS_25_WaitLabel);
ShelfMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
ShelfWorkLog("贴标功能启用中，等待贴标");
}
else if (SecMoveInfo.MoveType.Equals(RobotMoveType.Labelling))
{
ShelfMoveInfo.NextMoveStep(StepEnum.OS_25_WaitLabel); ShelfMoveInfo.NextMoveStep(StepEnum.OS_25_WaitLabel);
ShelfMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); ShelfMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
ShelfWorkLog("等待贴标"); ShelfWorkLog("SecMoveInfo在Labelling中，等待贴标");
}
else
{
ShelfMoveInfo.NextMoveStep(StepEnum.OS_26_LabelOk);
ShelfWorkLog("贴标功能未启用，直接结束贴标");
}
} }
else if (ShelfMoveInfo.IsStep(StepEnum.OS_25_WaitLabel)) else if (ShelfMoveInfo.IsStep(StepEnum.OS_25_WaitLabel))
{ {
......
RC1266-AutoCountMachine/source/DeviceLibrary/manager/RobotManager.cs
...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
public static bool GratingSignal = ConfigAppSettings.GetIntValue(Setting_Init.GratingSignal).Equals(1); public static bool GratingSignal = ConfigAppSettings.GetIntValue(Setting_Init.GratingSignal).Equals(1);
public static bool UseLabel = ConfigAppSettings.GetIntValue(Setting_Init.UseLabel).Equals(1);
private static bool isInit = false; private static bool isInit = false;
public static RobotBean robot = null; public static RobotBean robot = null;
......
RC1266-AutoCountMachine/source/DeviceLibrary/model/RobotMoveInfo.cs
...@@ -11,6 +11,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -11,6 +11,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public class RobotMoveInfo public class RobotMoveInfo
{ {
internal DateTime preCheckAxisTime = DateTime.Now;
internal DateTime MoveStartTime = DateTime.Now; internal DateTime MoveStartTime = DateTime.Now;
private static int MaxMoveId=1; private static int MaxMoveId=1;
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!