Skip to content

孙克 / RC30-AutoInOutStore

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

增加Y15为门禁功能屏蔽信号

1 个父辈 fa0d7b1a
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 105 行增加 和 11 行删除
source/ACSingleStore/App.config
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
<!--压紧轴计量检测信号亮1次的脉冲值--> <!--压紧轴计量检测信号亮1次的脉冲值-->
<add key="ComAxisChangeValue" value="10000" /> <add key="ComAxisChangeValue" value="10000" />
<add key ="DebugPosId" value ="1#AC1_2_1_1"/> <add key ="DebugPosId" value ="1#AC1_2_1_1"/>
<!--是否有门禁屏蔽功能，=1表示有此功能-->
<add key ="HasDisableDoorControl" value ="0"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/ACSingleStore/FrmIOStatus.Designer.cs
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.btnDisDoorClose = new System.Windows.Forms.Button();
this.btnDisDoorOpen = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -71,6 +73,8 @@ ...@@ -71,6 +73,8 @@
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.btnDisDoorClose);
this.groupBox1.Controls.Add(this.btnDisDoorOpen);
this.groupBox1.Controls.Add(this.button4); this.groupBox1.Controls.Add(this.button4);
this.groupBox1.Controls.Add(this.button5); this.groupBox1.Controls.Add(this.button5);
this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.button2);
...@@ -552,6 +556,28 @@ ...@@ -552,6 +556,28 @@
this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 581); this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 581);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// btnDisDoorClose
//
this.btnDisDoorClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDisDoorClose.Location = new System.Drawing.Point(263, 438);
this.btnDisDoorClose.Name = "btnDisDoorClose";
this.btnDisDoorClose.Size = new System.Drawing.Size(102, 34);
this.btnDisDoorClose.TabIndex = 268;
this.btnDisDoorClose.Text = "门禁功能打开";
this.btnDisDoorClose.UseVisualStyleBackColor = true;
this.btnDisDoorClose.Click += new System.EventHandler(this.btnDisDoorClose_Click);
//
// btnDisDoorOpen
//
this.btnDisDoorOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDisDoorOpen.Location = new System.Drawing.Point(263, 401);
this.btnDisDoorOpen.Name = "btnDisDoorOpen";
this.btnDisDoorOpen.Size = new System.Drawing.Size(102, 34);
this.btnDisDoorOpen.TabIndex = 267;
this.btnDisDoorOpen.Text = "门禁功能屏蔽";
this.btnDisDoorOpen.UseVisualStyleBackColor = true;
this.btnDisDoorOpen.Click += new System.EventHandler(this.btnDisDoorOpen_Click);
//
// FrmIOStatus // FrmIOStatus
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -620,6 +646,8 @@ ...@@ -620,6 +646,8 @@
private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button4; private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button button5; private System.Windows.Forms.Button button5;
private System.Windows.Forms.Button btnDisDoorClose;
private System.Windows.Forms.Button btnDisDoorOpen;
} }
} }
source/ACSingleStore/FrmIOStatus.cs
...@@ -155,6 +155,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -155,6 +155,8 @@ namespace OnlineStore.AutoInOutStore
private void FrmStoreIOStatus_Load(object sender, EventArgs e) private void FrmStoreIOStatus_Load(object sender, EventArgs e)
{ {
btnDisDoorOpen.Visible = StoreManager.HasDisableDoorControl;
btnDisDoorClose.Visible = StoreManager.HasDisableDoorControl;
} }
private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e) private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e)
...@@ -342,5 +344,15 @@ namespace OnlineStore.AutoInOutStore ...@@ -342,5 +344,15 @@ namespace OnlineStore.AutoInOutStore
{ {
KND.IOMove(IO_Type.StartOrStopBlow, IO_VALUE.LOW); KND.IOMove(IO_Type.StartOrStopBlow, IO_VALUE.LOW);
} }
private void btnDisDoorOpen_Click(object sender, EventArgs e)
{
KND.IOMove(IO_Type.DisableDoorControl, IO_VALUE.HIGH);
}
private void btnDisDoorClose_Click(object sender, EventArgs e)
{
KND.IOMove(IO_Type.DisableDoorControl, IO_VALUE.LOW);
}
} }
} }
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -254,6 +254,10 @@ ...@@ -254,6 +254,10 @@
this.lblDoorStatus = new System.Windows.Forms.Label(); this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button(); this.btnBatchInStore = new System.Windows.Forms.Button();
this.lblOutInfo = new System.Windows.Forms.Label(); this.lblOutInfo = new System.Windows.Forms.Label();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -2078,6 +2082,10 @@ ...@@ -2078,6 +2082,10 @@
this.toolStripSeparator17, this.toolStripSeparator17,
this.toolStripMenuItem3, this.toolStripMenuItem3,
this.toolStripSeparator16, this.toolStripSeparator16,
this.toolStripMenuItem4,
this.toolStripSeparator18,
this.toolStripMenuItem5,
this.toolStripSeparator19,
this.打开舱门ToolStripMenuItem, this.打开舱门ToolStripMenuItem,
this.toolStripSeparator14, this.toolStripSeparator14,
this.关闭仓门ToolStripMenuItem, this.关闭仓门ToolStripMenuItem,
...@@ -2898,6 +2906,30 @@ ...@@ -2898,6 +2906,30 @@
this.lblOutInfo.Text = "累积出库信息"; this.lblOutInfo.Text = "累积出库信息";
this.lblOutInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblOutInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(191, 26);
this.toolStripMenuItem4.Text = "门禁功能屏蔽";
this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
//
// toolStripSeparator18
//
this.toolStripSeparator18.Name = "toolStripSeparator18";
this.toolStripSeparator18.Size = new System.Drawing.Size(188, 6);
//
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(191, 26);
this.toolStripMenuItem5.Text = "门禁功能打开";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
// toolStripSeparator19
//
this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(188, 6);
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -3178,6 +3210,10 @@ ...@@ -3178,6 +3210,10 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator16; private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
private System.Windows.Forms.Button btnSave; private System.Windows.Forms.Button btnSave;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator18;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator19;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -154,17 +154,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -154,17 +154,11 @@ namespace OnlineStore.AutoInOutStore
HideForm(); HideForm();
initValue(); initValue();
this.toolStripMenuItem4.Visible = StoreManager.HasDisableDoorControl;
this.toolStripMenuItem5.Visible = StoreManager.HasDisableDoorControl;
this.toolStripSeparator16.Visible = StoreManager.HasDisableDoorControl;
this.toolStripSeparator18.Visible = StoreManager.HasDisableDoorControl;
//string msg = "=1+0x0-7x8 =700020106;4500866784;20;1804162053;10000;XVB38DV4##";
//AutomaticBaiting.GetInStorePosId(msg);
//DateTime time = DateTime.Now;
////构建发送给服务器的对象
//Operation lineOperation =store.getLineBoxStatus();
//string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
//Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), lineOperation, false);
txtTempPort.Text = store.Config.Humiture_Port;
LoadOk = true; LoadOk = true;
cmbHomeType.SelectedIndex = 1; cmbHomeType.SelectedIndex = 1;
timer1.Start(); timer1.Start();
...@@ -1694,5 +1688,15 @@ namespace OnlineStore.AutoInOutStore ...@@ -1694,5 +1688,15 @@ namespace OnlineStore.AutoInOutStore
ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, selectPositionNum); ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, selectPositionNum);
} }
} }
private void toolStripMenuItem4_Click(object sender, EventArgs e)
{
KND.IOMove(IO_Type.DisableDoorControl, IO_VALUE.HIGH);
}
private void toolStripMenuItem5_Click(object sender, EventArgs e)
{
KND.IOMove(IO_Type.DisableDoorControl, IO_VALUE.LOW);
}
} }
} }
source/ACSingleStore/记录.txt
...@@ -97,6 +97,12 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,, ...@@ -97,6 +97,12 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,,
入库老报警，入库的P1没有重新加载 入库老报警，入库的P1没有重新加载
20190108
增加Y15为门禁功能屏蔽信号，增加配置是否有门禁功能。
<!--是否有门禁屏蔽功能，=1表示有此功能-->
<add key ="HasDisableDoorControl" value ="0"/>
......
source/Common/Setting_Init.cs
...@@ -80,5 +80,7 @@ namespace OnlineStore.Common ...@@ -80,5 +80,7 @@ namespace OnlineStore.Common
public static string ComAxisChangeValue = "ComAxisChangeValue"; public static string ComAxisChangeValue = "ComAxisChangeValue";
public static string DebugPosId = "DebugPosId"; public static string DebugPosId = "DebugPosId";
public static string HasDisableDoorControl = "HasDisableDoorControl";
} }
} }
source/DeviceLibrary/acSingleStore/StoreManager.cs
...@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public class StoreManager public class StoreManager
{ {
public static bool HasDisableDoorControl = ConfigAppSettings.GetIntValue(Setting_Init.HasDisableDoorControl).Equals(1);
/// <summary> /// <summary>
/// 当前出入库的模式 /// 当前出入库的模式
......
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
...@@ -179,7 +179,10 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -179,7 +179,10 @@ namespace OnlineStore.LoadCSVLibrary
/// DO 吸盘吸料SOL SuckingDisc_Work 107 192.168.200.10 0 吸盘吸料SOL Y08 DO-08 /// DO 吸盘吸料SOL SuckingDisc_Work 107 192.168.200.10 0 吸盘吸料SOL Y08 DO-08
/// </summary> /// </summary>
public static string SuckingDisc_Work = "SuckingDisc_Work"; public static string SuckingDisc_Work = "SuckingDisc_Work";
/// <summary>
/// DO DisableDoorControl 禁用门禁功能
/// </summary>
public static string DisableDoorControl = "DisableDoorControl";
//public static string TrayCheck_Door = "TrayCheck_Door"; //public static string TrayCheck_Door = "TrayCheck_Door";
//public static string TrayCheck_Door = "TrayCheck_Door"; //public static string TrayCheck_Door = "TrayCheck_Door";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!