Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 20634728 由 刘韬
选项

1

1 个父辈 351f8cbf
内嵌 并排
正在显示 11 个修改的文件 包含 169 行增加 和 101 行删除
source/ACSingleStore/Properties/AssemblyInfo.cs
...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices; ...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 5a1faba90251847885c81b6291b50d083a8262c9")] [assembly: AssemblyProduct("SO951-HC-ACSingleStore 351f8cbf8c7888864dfefdd40ed3c316e14ecb98")]
[assembly: AssemblyCopyright("Copyright ? 2017")] [assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
......
source/ACSingleStore/resources/en-US.lngres
FrmStoreBox_tabControl2_Text FrmStoreBox_tabControl2_Text FrmStoreBox_tabControl2_Text
FrmStoreBox_tabPage4_Text 料仓操作 Operation FrmStoreBox_tabPage4_Text 料仓操作 Operation
FrmStoreBox_tabPage9_Text IO调试 IO Debug FrmStoreBox_tabPage9_Text IO调试 IO Debug
FrmStoreBox_chbBuzzer_Text 启用蜂鸣器 Enable the buzzer FrmStoreBox_chbBuzzer_Text 启用蜂鸣器 Enable the buzzer
...@@ -89,7 +88,6 @@ FrmStoreBox_label27_Text 端口号: Port number: ...@@ -89,7 +88,6 @@ FrmStoreBox_label27_Text 端口号: Port number:
FrmStoreBox_btnTempClose_Text 断开 Disconnect FrmStoreBox_btnTempClose_Text 断开 Disconnect
FrmStoreBox_btnTempInit_Text 初始化 Initialize FrmStoreBox_btnTempInit_Text 初始化 Initialize
FrmStoreBox_groupBox3_Text 设备状态 Machine state FrmStoreBox_groupBox3_Text 设备状态 Machine state
FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text
FrmStoreBox_lblThisSta_Text 等待启动 Wait to start FrmStoreBox_lblThisSta_Text 等待启动 Wait to start
FrmStoreBox_groupInout_Text 料仓操作 Operation FrmStoreBox_groupInout_Text 料仓操作 Operation
FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- Current temperature--& current humidity-- FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- Current temperature--& current humidity--
......
source/ACSingleStore/resources/ja-JP.lngres
...@@ -89,7 +89,6 @@ FrmStoreBox_label27_Text 端口号: ポート番号 ...@@ -89,7 +89,6 @@ FrmStoreBox_label27_Text 端口号: ポート番号
FrmStoreBox_btnTempClose_Text 断开 接続解除 FrmStoreBox_btnTempClose_Text 断开 接続解除
FrmStoreBox_btnTempInit_Text 初始化 初期化 FrmStoreBox_btnTempInit_Text 初始化 初期化
FrmStoreBox_groupBox3_Text 设备状态 デバイスの状態 FrmStoreBox_groupBox3_Text 设备状态 デバイスの状態
FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text
FrmStoreBox_lblThisSta_Text 等待启动 起動待つ FrmStoreBox_lblThisSta_Text 等待启动 起動待つ
FrmStoreBox_groupInout_Text 料仓操作 BOX操作 FrmStoreBox_groupInout_Text 料仓操作 BOX操作
FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- 現在の温度-‐、現在の湿度-‐ FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- 現在の温度-‐、現在の湿度-‐
......
source/ACSingleStore/resources/zh-CN.lngres
...@@ -88,7 +88,6 @@ FrmStoreBox_label27_Text 端口号: 端口号: ...@@ -88,7 +88,6 @@ FrmStoreBox_label27_Text 端口号: 端口号:
FrmStoreBox_btnTempClose_Text 断开 断开 FrmStoreBox_btnTempClose_Text 断开 断开
FrmStoreBox_btnTempInit_Text 初始化 初始化 FrmStoreBox_btnTempInit_Text 初始化 初始化
FrmStoreBox_groupBox3_Text 设备状态 设备状态 FrmStoreBox_groupBox3_Text 设备状态 设备状态
FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text
FrmStoreBox_lblThisSta_Text 等待启动 等待启动 FrmStoreBox_lblThisSta_Text 等待启动 等待启动
FrmStoreBox_groupInout_Text 料仓操作 料仓操作 FrmStoreBox_groupInout_Text 料仓操作 料仓操作
FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- 当前温度--，当前湿度-- FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- 当前温度--，当前湿度--
......
source/ACSingleStore/useControl/uc_boxdebug.Designer.cs
...@@ -62,12 +62,14 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -62,12 +62,14 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP4 = new System.Windows.Forms.Button(); this.btnUpDownP4 = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.label_verify = new System.Windows.Forms.Label();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// groupInout // groupInout
// //
this.groupInout.Controls.Add(this.label_verify);
this.groupInout.Controls.Add(this.btnInOutP1); this.groupInout.Controls.Add(this.btnInOutP1);
this.groupInout.Controls.Add(this.checkBox_Double_Alternate); this.groupInout.Controls.Add(this.checkBox_Double_Alternate);
this.groupInout.Controls.Add(this.label_size); this.groupInout.Controls.Add(this.label_size);
...@@ -97,9 +99,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -97,9 +99,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.groupInout.Controls.Add(this.btnUpDownP6); this.groupInout.Controls.Add(this.btnUpDownP6);
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Location = new System.Drawing.Point(2, 315); this.groupInout.Location = new System.Drawing.Point(3, 394);
this.groupInout.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(779, 179); this.groupInout.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupInout.Size = new System.Drawing.Size(1039, 224);
this.groupInout.TabIndex = 101; this.groupInout.TabIndex = 101;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -113,10 +117,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -113,10 +117,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Black; this.btnInOutP1.ForeColor = System.Drawing.Color.Black;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(522, 146); this.btnInOutP1.Location = new System.Drawing.Point(696, 182);
this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP1.Name = "btnInOutP1"; this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(133, 29); this.btnInOutP1.Size = new System.Drawing.Size(177, 36);
this.btnInOutP1.TabIndex = 226; this.btnInOutP1.TabIndex = 226;
this.btnInOutP1.Text = "进出轴回待机点P1"; this.btnInOutP1.Text = "进出轴回待机点P1";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -126,9 +131,10 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -126,9 +131,10 @@ namespace OnlineStore.ACSingleStore.useControl
// checkBox_Double_Alternate // checkBox_Double_Alternate
// //
this.checkBox_Double_Alternate.AutoSize = true; this.checkBox_Double_Alternate.AutoSize = true;
this.checkBox_Double_Alternate.Location = new System.Drawing.Point(97, 154); this.checkBox_Double_Alternate.Location = new System.Drawing.Point(129, 192);
this.checkBox_Double_Alternate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.checkBox_Double_Alternate.Name = "checkBox_Double_Alternate"; this.checkBox_Double_Alternate.Name = "checkBox_Double_Alternate";
this.checkBox_Double_Alternate.Size = new System.Drawing.Size(72, 16); this.checkBox_Double_Alternate.Size = new System.Drawing.Size(86, 19);
this.checkBox_Double_Alternate.TabIndex = 225; this.checkBox_Double_Alternate.TabIndex = 225;
this.checkBox_Double_Alternate.Text = "双盘测试"; this.checkBox_Double_Alternate.Text = "双盘测试";
this.checkBox_Double_Alternate.UseVisualStyleBackColor = true; this.checkBox_Double_Alternate.UseVisualStyleBackColor = true;
...@@ -136,23 +142,26 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -136,23 +142,26 @@ namespace OnlineStore.ACSingleStore.useControl
// //
// label_size // label_size
// //
this.label_size.Location = new System.Drawing.Point(267, 0); this.label_size.Location = new System.Drawing.Point(356, 0);
this.label_size.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label_size.Name = "label_size"; this.label_size.Name = "label_size";
this.label_size.Size = new System.Drawing.Size(57, 10); this.label_size.Size = new System.Drawing.Size(76, 12);
this.label_size.TabIndex = 224; this.label_size.TabIndex = 224;
// //
// cmbPosition // cmbPosition
// //
this.cmbPosition.Location = new System.Drawing.Point(326, 0); this.cmbPosition.Location = new System.Drawing.Point(435, 0);
this.cmbPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.cmbPosition.Name = "cmbPosition"; this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(104, 11); this.cmbPosition.Size = new System.Drawing.Size(139, 14);
this.cmbPosition.TabIndex = 224; this.cmbPosition.TabIndex = 224;
// //
// txtJiange // txtJiange
// //
this.txtJiange.Location = new System.Drawing.Point(209, 87); this.txtJiange.Location = new System.Drawing.Point(279, 109);
this.txtJiange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtJiange.Name = "txtJiange"; this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(37, 21); this.txtJiange.Size = new System.Drawing.Size(48, 25);
this.txtJiange.TabIndex = 221; this.txtJiange.TabIndex = 221;
this.txtJiange.Text = "1"; this.txtJiange.Text = "1";
// //
...@@ -161,7 +170,8 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -161,7 +170,8 @@ namespace OnlineStore.ACSingleStore.useControl
this.lblMsg.AutoSize = true; this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Green; this.lblMsg.ForeColor = System.Drawing.Color.Green;
this.lblMsg.Location = new System.Drawing.Point(6, 19); this.lblMsg.Location = new System.Drawing.Point(8, 24);
this.lblMsg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblMsg.Name = "lblMsg"; this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(135, 20); this.lblMsg.Size = new System.Drawing.Size(135, 20);
this.lblMsg.TabIndex = 223; this.lblMsg.TabIndex = 223;
...@@ -172,9 +182,10 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -172,9 +182,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control; this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(672, 146); this.btnSavePosition.Location = new System.Drawing.Point(896, 182);
this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSavePosition.Name = "btnSavePosition"; this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(95, 29); this.btnSavePosition.Size = new System.Drawing.Size(127, 36);
this.btnSavePosition.TabIndex = 217; this.btnSavePosition.TabIndex = 217;
this.btnSavePosition.Text = "保存位置"; this.btnSavePosition.Text = "保存位置";
this.btnSavePosition.UseVisualStyleBackColor = false; this.btnSavePosition.UseVisualStyleBackColor = false;
...@@ -185,9 +196,10 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -185,9 +196,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control; this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control;
this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(97, 116); this.btnStartAuTo.Location = new System.Drawing.Point(129, 145);
this.btnStartAuTo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStartAuTo.Name = "btnStartAuTo"; this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(149, 32); this.btnStartAuTo.Size = new System.Drawing.Size(199, 40);
this.btnStartAuTo.TabIndex = 222; this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "启动自动模式"; this.btnStartAuTo.Text = "启动自动模式";
this.btnStartAuTo.UseVisualStyleBackColor = false; this.btnStartAuTo.UseVisualStyleBackColor = false;
...@@ -196,9 +208,10 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -196,9 +208,10 @@ namespace OnlineStore.ACSingleStore.useControl
// label9 // label9
// //
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(51, 90); this.label9.Location = new System.Drawing.Point(68, 112);
this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(152, 17); this.label9.Size = new System.Drawing.Size(203, 21);
this.label9.TabIndex = 220; this.label9.TabIndex = 220;
this.label9.Text = "入库间隔仓位："; this.label9.Text = "入库间隔仓位：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -210,11 +223,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -210,11 +223,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(689, 19); this.txtInOutP2.Location = new System.Drawing.Point(919, 24);
this.txtInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInOutP2.MaxLength = 20; this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2"; this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(78, 23); this.txtInOutP2.Size = new System.Drawing.Size(103, 23);
this.txtInOutP2.TabIndex = 212; this.txtInOutP2.TabIndex = 212;
this.txtInOutP2.Text = "-1"; this.txtInOutP2.Text = "-1";
// //
...@@ -225,11 +239,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -225,11 +239,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(690, 117); this.txtComP3.Location = new System.Drawing.Point(920, 146);
this.txtComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP3.MaxLength = 20; this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3"; this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3.Size = new System.Drawing.Size(78, 23); this.txtComP3.Size = new System.Drawing.Size(103, 23);
this.txtComP3.TabIndex = 198; this.txtComP3.TabIndex = 198;
this.txtComP3.Text = "-1"; this.txtComP3.Text = "-1";
// //
...@@ -240,11 +255,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -240,11 +255,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(689, 85); this.txtComP2.Location = new System.Drawing.Point(919, 106);
this.txtComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP2.MaxLength = 20; this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2"; this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP2.Size = new System.Drawing.Size(78, 23); this.txtComP2.Size = new System.Drawing.Size(103, 23);
this.txtComP2.TabIndex = 196; this.txtComP2.TabIndex = 196;
this.txtComP2.Text = "-1"; this.txtComP2.Text = "-1";
// //
...@@ -255,11 +271,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -255,11 +271,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(689, 52); this.txtInOutP3.Location = new System.Drawing.Point(919, 65);
this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInOutP3.MaxLength = 20; this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3"; this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(78, 23); this.txtInOutP3.Size = new System.Drawing.Size(103, 23);
this.txtInOutP3.TabIndex = 194; this.txtInOutP3.TabIndex = 194;
this.txtInOutP3.Text = "-1"; this.txtInOutP3.Text = "-1";
// //
...@@ -270,11 +287,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -270,11 +287,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(437, 149); this.txtMiddleP2.Location = new System.Drawing.Point(583, 186);
this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtMiddleP2.MaxLength = 20; this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP2.Size = new System.Drawing.Size(78, 23); this.txtMiddleP2.Size = new System.Drawing.Size(103, 23);
this.txtMiddleP2.TabIndex = 192; this.txtMiddleP2.TabIndex = 192;
this.txtMiddleP2.Text = "-1"; this.txtMiddleP2.Text = "-1";
// //
...@@ -285,11 +303,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -285,11 +303,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(437, 51); this.txtUpDownP5.Location = new System.Drawing.Point(583, 64);
this.txtUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP5.MaxLength = 20; this.txtUpDownP5.MaxLength = 20;
this.txtUpDownP5.Name = "txtUpDownP5"; this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP5.Size = new System.Drawing.Size(78, 23); this.txtUpDownP5.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP5.TabIndex = 188; this.txtUpDownP5.TabIndex = 188;
this.txtUpDownP5.Text = "-1"; this.txtUpDownP5.Text = "-1";
// //
...@@ -300,11 +319,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -300,11 +319,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(437, 116); this.txtUpDownP6.Location = new System.Drawing.Point(583, 145);
this.txtUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP6.MaxLength = 20; this.txtUpDownP6.MaxLength = 20;
this.txtUpDownP6.Name = "txtUpDownP6"; this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP6.Size = new System.Drawing.Size(78, 23); this.txtUpDownP6.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP6.TabIndex = 190; this.txtUpDownP6.TabIndex = 190;
this.txtUpDownP6.Text = "-1"; this.txtUpDownP6.Text = "-1";
// //
...@@ -315,11 +335,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -315,11 +335,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(437, 19); this.txtUpDownP3.Location = new System.Drawing.Point(583, 24);
this.txtUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP3.MaxLength = 20; this.txtUpDownP3.MaxLength = 20;
this.txtUpDownP3.Name = "txtUpDownP3"; this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP3.Size = new System.Drawing.Size(78, 23); this.txtUpDownP3.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP3.TabIndex = 162; this.txtUpDownP3.TabIndex = 162;
this.txtUpDownP3.Text = "-1"; this.txtUpDownP3.Text = "-1";
// //
...@@ -328,9 +349,10 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -328,9 +349,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInStore.BackColor = System.Drawing.SystemColors.Control; this.btnInStore.BackColor = System.Drawing.SystemColors.Control;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(6, 44); this.btnInStore.Location = new System.Drawing.Point(8, 55);
this.btnInStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInStore.Name = "btnInStore"; this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(117, 32); this.btnInStore.Size = new System.Drawing.Size(156, 40);
this.btnInStore.TabIndex = 102; this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试"; this.btnInStore.Text = "入库测试";
this.btnInStore.UseVisualStyleBackColor = false; this.btnInStore.UseVisualStyleBackColor = false;
...@@ -341,9 +363,10 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -341,9 +363,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnOutStore.BackColor = System.Drawing.SystemColors.Control; this.btnOutStore.BackColor = System.Drawing.SystemColors.Control;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(129, 44); this.btnOutStore.Location = new System.Drawing.Point(172, 55);
this.btnOutStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOutStore.Name = "btnOutStore"; this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(117, 32); this.btnOutStore.Size = new System.Drawing.Size(156, 40);
this.btnOutStore.TabIndex = 101; this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出库测试"; this.btnOutStore.Text = "出库测试";
this.btnOutStore.UseVisualStyleBackColor = false; this.btnOutStore.UseVisualStyleBackColor = false;
...@@ -356,11 +379,12 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -356,11 +379,12 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(437, 84); this.txtUpDownP4.Location = new System.Drawing.Point(583, 105);
this.txtUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP4.MaxLength = 20; this.txtUpDownP4.MaxLength = 20;
this.txtUpDownP4.Name = "txtUpDownP4"; this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP4.Size = new System.Drawing.Size(78, 23); this.txtUpDownP4.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP4.TabIndex = 166; this.txtUpDownP4.TabIndex = 166;
this.txtUpDownP4.Text = "-1"; this.txtUpDownP4.Text = "-1";
// //
...@@ -373,10 +397,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -373,10 +397,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green; this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(522, 14); this.btnInOutP2.Location = new System.Drawing.Point(696, 18);
this.btnInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP2.Name = "btnInOutP2"; this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(161, 29); this.btnInOutP2.Size = new System.Drawing.Size(215, 36);
this.btnInOutP2.TabIndex = 211; this.btnInOutP2.TabIndex = 211;
this.btnInOutP2.Text = "进出轴取料点P2："; this.btnInOutP2.Text = "进出轴取料点P2：";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -391,10 +416,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -391,10 +416,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple; this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(522, 113); this.btnComP3.Location = new System.Drawing.Point(696, 141);
this.btnComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP3.Name = "btnComP3"; this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(161, 29); this.btnComP3.Size = new System.Drawing.Size(215, 36);
this.btnComP3.TabIndex = 197; this.btnComP3.TabIndex = 197;
this.btnComP3.Text = "压紧轴压紧前点P3："; this.btnComP3.Text = "压紧轴压紧前点P3：";
this.btnComP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -409,10 +435,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -409,10 +435,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple; this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(522, 80); this.btnComP2.Location = new System.Drawing.Point(696, 100);
this.btnComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP2.Name = "btnComP2"; this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(161, 29); this.btnComP2.Size = new System.Drawing.Size(215, 36);
this.btnComP2.TabIndex = 195; this.btnComP2.TabIndex = 195;
this.btnComP2.Text = "压紧轴压紧点P2："; this.btnComP2.Text = "压紧轴压紧点P2：";
this.btnComP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -427,10 +454,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -427,10 +454,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green; this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(522, 47); this.btnInOutP3.Location = new System.Drawing.Point(696, 59);
this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP3.Name = "btnInOutP3"; this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(161, 29); this.btnInOutP3.Size = new System.Drawing.Size(215, 36);
this.btnInOutP3.TabIndex = 193; this.btnInOutP3.TabIndex = 193;
this.btnInOutP3.Text = "进出轴取料点P3："; this.btnInOutP3.Text = "进出轴取料点P3：";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -445,10 +473,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -445,10 +473,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(269, 146); this.btnMiddleP2.Location = new System.Drawing.Point(359, 182);
this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMiddleP2.Name = "btnMiddleP2"; this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(161, 29); this.btnMiddleP2.Size = new System.Drawing.Size(215, 36);
this.btnMiddleP2.TabIndex = 191; this.btnMiddleP2.TabIndex = 191;
this.btnMiddleP2.Text = "旋转轴库位点P2："; this.btnMiddleP2.Text = "旋转轴库位点P2：";
this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -463,10 +492,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -463,10 +492,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red; this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(269, 47); this.btnUpDownP5.Location = new System.Drawing.Point(359, 59);
this.btnUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP5.Name = "btnUpDownP5"; this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(161, 29); this.btnUpDownP5.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP5.TabIndex = 187; this.btnUpDownP5.TabIndex = 187;
this.btnUpDownP5.Text = "升降轴出料前点P5："; this.btnUpDownP5.Text = "升降轴出料前点P5：";
this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -481,10 +511,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -481,10 +511,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red; this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(269, 113); this.btnUpDownP6.Location = new System.Drawing.Point(359, 141);
this.btnUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP6.Name = "btnUpDownP6"; this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(161, 29); this.btnUpDownP6.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP6.TabIndex = 189; this.btnUpDownP6.TabIndex = 189;
this.btnUpDownP6.Text = "升降轴出料缓冲点P6："; this.btnUpDownP6.Text = "升降轴出料缓冲点P6：";
this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -499,10 +530,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -499,10 +530,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red; this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(269, 14); this.btnUpDownP3.Location = new System.Drawing.Point(359, 18);
this.btnUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP3.Name = "btnUpDownP3"; this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(161, 29); this.btnUpDownP3.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP3.TabIndex = 161; this.btnUpDownP3.TabIndex = 161;
this.btnUpDownP3.Text = "升降轴入料前点P3："; this.btnUpDownP3.Text = "升降轴入料前点P3：";
this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -517,10 +549,11 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -517,10 +549,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red; this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(269, 80); this.btnUpDownP4.Location = new System.Drawing.Point(359, 100);
this.btnUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP4.Name = "btnUpDownP4"; this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(161, 29); this.btnUpDownP4.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP4.TabIndex = 165; this.btnUpDownP4.TabIndex = 165;
this.btnUpDownP4.Text = "升降轴入料缓冲点P4："; this.btnUpDownP4.Text = "升降轴入料缓冲点P4：";
this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -544,6 +577,7 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -544,6 +577,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
this.dataGridView1.EnableHeadersVisualStyles = false; this.dataGridView1.EnableHeadersVisualStyles = false;
this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridView1.MultiSelect = false; this.dataGridView1.MultiSelect = false;
this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; this.dataGridView1.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
...@@ -555,19 +589,30 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -555,19 +589,30 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.ShowCellToolTips = false; this.dataGridView1.ShowCellToolTips = false;
this.dataGridView1.ShowEditingIcon = false; this.dataGridView1.ShowEditingIcon = false;
this.dataGridView1.ShowRowErrors = false; this.dataGridView1.ShowRowErrors = false;
this.dataGridView1.Size = new System.Drawing.Size(785, 313); this.dataGridView1.Size = new System.Drawing.Size(1047, 391);
this.dataGridView1.TabIndex = 103; this.dataGridView1.TabIndex = 103;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown); this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
// //
// label_verify
//
this.label_verify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label_verify.AutoSize = true;
this.label_verify.Location = new System.Drawing.Point(985, 0);
this.label_verify.Name = "label_verify";
this.label_verify.Size = new System.Drawing.Size(55, 15);
this.label_verify.TabIndex = 227;
this.label_verify.Text = "label1";
//
// uc_boxdebug // uc_boxdebug
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.dataGridView1); this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.groupInout); this.Controls.Add(this.groupInout);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "uc_boxdebug"; this.Name = "uc_boxdebug";
this.Size = new System.Drawing.Size(785, 530); this.Size = new System.Drawing.Size(1047, 662);
this.groupInout.ResumeLayout(false); this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout(); this.groupInout.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
...@@ -609,5 +654,6 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -609,5 +654,6 @@ namespace OnlineStore.ACSingleStore.useControl
private System.Windows.Forms.CheckBox checkBox_Double_Alternate; private System.Windows.Forms.CheckBox checkBox_Double_Alternate;
public System.Windows.Forms.Button btnInOutP1; public System.Windows.Forms.Button btnInOutP1;
private System.Windows.Forms.Label label_size; private System.Windows.Forms.Label label_size;
private System.Windows.Forms.Label label_verify;
} }
} }
source/ACSingleStore/useControl/uc_boxdebug.cs
...@@ -86,6 +86,7 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -86,6 +86,7 @@ namespace OnlineStore.ACSingleStore.useControl
var cells = dataGridView1.Rows[pp.row].Cells[pp.col]; var cells = dataGridView1.Rows[pp.row].Cells[pp.col];
cells.Style = GetStyle(arg1); cells.Style = GetStyle(arg1);
} }
checkVerify();
} }
DataGridViewCellStyle GetStyle(string posid) { DataGridViewCellStyle GetStyle(string posid) {
if (htpp.ContainsKey(posid) && posState.ContainsKey(posid)) if (htpp.ContainsKey(posid) && posState.ContainsKey(posid))
...@@ -95,7 +96,9 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -95,7 +96,9 @@ namespace OnlineStore.ACSingleStore.useControl
var cells = dataGridView1.Rows[pp.row].Cells[pp.col]; var cells = dataGridView1.Rows[pp.row].Cells[pp.col];
cells.Selected = true; cells.Selected = true;
if (pps.InStoreCheck == 1 && pps.OutStoreCheck == 1) if (pps.InStoreCheck == 1 && pps.OutStoreCheck == 1)
{
return dgv_ok; return dgv_ok;
}
else if (pps.InStoreCheck == 1) else if (pps.InStoreCheck == 1)
return dgv_oin; return dgv_oin;
else if (pps.OutStoreCheck == 1) else if (pps.OutStoreCheck == 1)
...@@ -103,6 +106,23 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -103,6 +106,23 @@ namespace OnlineStore.ACSingleStore.useControl
} }
return dgv_none; return dgv_none;
} }
void checkVerify() {
int finish = 0;
for (int i = 0; i < store.PositionNumList.Count; i++)
{
var posid = store.PositionNumList[i];
if (htpp.ContainsKey(posid) && posState.ContainsKey(posid))
{
var pps = (PosState)posState[posid];
if (pps.InStoreCheck == 1 && pps.OutStoreCheck == 1)
{
finish++;
}
}
}
double s = (double)finish / store.PositionNumList.Count;
label_verify.Text = s.ToString("0.0") + "%";
}
Hashtable htpp = new Hashtable(); Hashtable htpp = new Hashtable();
class PosPos { class PosPos {
public string Posid; public string Posid;
...@@ -309,6 +329,7 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -309,6 +329,7 @@ namespace OnlineStore.ACSingleStore.useControl
dataGridView1.Rows.RemoveAt(dataGridView1.Rows.Count - 1); dataGridView1.Rows.RemoveAt(dataGridView1.Rows.Count - 1);
setData(store.PositionNumList.Last()); setData(store.PositionNumList.Last());
checkVerify();
} }
void setData(string posid) { void setData(string posid) {
ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(posid); ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(posid);
......
source/DeviceLibrary/ResourceControl.cs
...@@ -148,11 +148,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -148,11 +148,11 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public static string TimeOut = "TimeOut"; public static string TimeOut = "TimeOut";
/// <summary> /// <summary>
///"收到急停信号，报警急停" ///"收到急停信号，报警急停" 1078
/// </summary> /// </summary>
public static string inSuddenStop = "inSuddenStop"; public static string inSuddenStop = "inSuddenStop";
/// <summary> /// <summary>
///"进出轴报警！复位失败，请检查" ///"进出轴报警！复位失败，请检查" 1070
/// </summary> /// </summary>
public static string InoutAlarm = "InoutAlarm"; public static string InoutAlarm = "InoutAlarm";
/// <summary> /// <summary>
...@@ -180,7 +180,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -180,7 +180,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public static string InStoreError = "InStoreError"; public static string InStoreError = "InStoreError";
/// <summary> /// <summary>
///"入库未找到库位：条码[{0}]库位号[{1}]" ///"入库未找到库位：条码[{0}]库位号[{1}]"[1080]
/// </summary> /// </summary>
public static string InStoreNoPosition = "InStoreNoPosition"; public static string InStoreNoPosition = "InStoreNoPosition";
/// <summary> /// <summary>
...@@ -188,7 +188,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -188,7 +188,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public static string OutStoreError = "OutStoreError"; public static string OutStoreError = "OutStoreError";
/// <summary> /// <summary>
///"出库未找库位：{0}" ///"出库未找库位：{0}" 1082
/// </summary> /// </summary>
public static string OutStoreNoPosition = "OutStoreNoPosition"; public static string OutStoreNoPosition = "OutStoreNoPosition";
...@@ -262,7 +262,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -262,7 +262,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public static string TakeTrayOut = "TakeTrayOut"; public static string TakeTrayOut = "TakeTrayOut";
/// <summary> /// <summary>
///未检测到气压信号 ///未检测到气压信号 1079
/// </summary> /// </summary>
public static string NoAIr = "NoAIr"; public static string NoAIr = "NoAIr";
/// <summary> /// <summary>
...@@ -346,13 +346,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -346,13 +346,14 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public static string OpenAxisFail = "OpenAxisFail"; public static string OpenAxisFail = "OpenAxisFail";
/// <summary> /// <summary>
/// 运动轴{0}报警 /// 运动轴{0}报警 1080
/// </summary> /// </summary>
public static string AxisAlarm = "AxisAlarm"; public static string AxisAlarm = "AxisAlarm";
public static string CustAlarm = "CustAlarm"; public static string CustAlarm = "CustAlarm";
/// <summary> /// <summary>
/// 等待信号{0}={1}超时 /// 等待信号{0}={1}超时 1084
/// </summary> /// </summary>
public static string WaitSingleTimeOut = "WaitSingleTimeOut"; public static string WaitSingleTimeOut = "WaitSingleTimeOut";
/// <summary> /// <summary>
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -146,7 +146,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -146,7 +146,7 @@ namespace OnlineStore.DeviceLibrary
isInSuddenDown = true; isInSuddenDown = true;
LogUtil.error(LOGGER, StoreName + "收到急停信号,报警急停"); LogUtil.error(LOGGER, StoreName + "收到急停信号,报警急停");
// WarnMsg = StoreName + "收到急停信号，报警急停"; // WarnMsg = StoreName + "收到急停信号，报警急停";
SetWarnMsg(ResourceControl.inSuddenStop); SetWarnMsg(ResourceControl.inSuddenStop);//[1078]
//报警时会关闭所有轴 //报警时会关闭所有轴
Alarm(StoreAlarmType.SuddenStop, "1", StoreMoveType.None); Alarm(StoreAlarmType.SuddenStop, "1", StoreMoveType.None);
} }
...@@ -511,7 +511,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -511,7 +511,7 @@ namespace OnlineStore.DeviceLibrary
//如果此时轴三还在报警，需要提示错误并等待 //如果此时轴三还在报警，需要提示错误并等待
if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0) if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
{ {
SetWarnMsg(ResourceControl.InoutAlarm); SetWarnMsg(ResourceControl.InoutAlarm);//1070
//WarnMsg = "进出轴报警！复位失败，请检查!"; //WarnMsg = "进出轴报警！复位失败，请检查!";
LogUtil.error(LOGGER, "进出轴报警！复位失败，请检查！"); LogUtil.error(LOGGER, "进出轴报警！复位失败，请检查！");
} }
...@@ -839,7 +839,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -839,7 +839,7 @@ namespace OnlineStore.DeviceLibrary
if (span.TotalSeconds > Config.AirCheckSeconds) if (span.TotalSeconds > Config.AirCheckSeconds)
{ {
//WarnMsg = "未检测到气压信号"; //WarnMsg = "未检测到气压信号";
SetWarnMsg(ResourceControl.NoAIr); SetWarnMsg(ResourceControl.NoAIr);//1079
preAirValue = IO_VALUE.LOW; preAirValue = IO_VALUE.LOW;
//LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警"); //LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警");
//Alarm(StoreAlarmType.NoAirCheck, "2", StoreMoveType.None); //Alarm(StoreAlarmType.NoAirCheck, "2", StoreMoveType.None);
...@@ -1190,17 +1190,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -1190,17 +1190,21 @@ namespace OnlineStore.DeviceLibrary
IsScanCode = true; IsScanCode = true;
CurrScanCount++; CurrScanCount++;
LogUtil.info(StoreName + "[" + CurrScanCount + "]检测到" + height + "mm料盘，开始扫码"); LogUtil.info(StoreName + "[" + CurrScanCount + "]检测到" + height + "mm料盘，开始扫码");
// GetCameraCode(); //GetCameraCode();
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
LastScanTime = DateTime.Now; LastScanTime = DateTime.Now;
var isdl = dlScanSocket.BeginScan(); var isdl = dlScanSocket.BeginScan();
if (isdl) LogUtil.info(StoreName + "DL扫码枪="+isdl);
if (!isdl)
{ {
Task.Run(() => Task.Run(() =>
{ {
List<string> codelist; List<string> codelist;
if (CodeManager.IsServerAccess()) var IsServerAccess = CodeManager.IsServerAccess();
LogUtil.info(StoreName + "IsServerAccess=" + IsServerAccess);
if (IsServerAccess)
{ {
codelist = new List<string>() { "server" }; codelist = new List<string>() { "server" };
} }
else else
...@@ -1386,7 +1390,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1386,7 +1390,7 @@ namespace OnlineStore.DeviceLibrary
if (alarmIo == 1) if (alarmIo == 1)
{ {
//WarnMsg = StoreName + " 运动轴" + axisInfo.Explain + "报警"; //WarnMsg = StoreName + " 运动轴" + axisInfo.Explain + "报警";
SetWarnMsg(ResourceControl.AxisAlarm, axisInfo.DisplayStr); SetWarnMsg(ResourceControl.AxisAlarm, axisInfo.DisplayStr);//1080
info.AlarmIoValue = alarmIo; info.AlarmIoValue = alarmIo;
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo).ToString(), StoreMoveType.None); Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo).ToString(), StoreMoveType.None);
isInAlarm = true; isInAlarm = true;
...@@ -1586,7 +1590,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1586,7 +1590,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//出入库没有找到服务器发送的库位，需要打印日志方便查询原因 //出入库没有找到服务器发送的库位，需要打印日志方便查询原因
InStoreFail = true; InStoreFail = true;
SetWarnMsg(ResourceControl.InStoreNoPosition, message, posId); SetWarnMsg(ResourceControl.InStoreNoPosition, message, posId);//[1081]
// WarnMsg = "入库未找到库位：二维码【" + message + "】库位【" + posId + "】 "; // WarnMsg = "入库未找到库位：二维码【" + message + "】库位【" + posId + "】 ";
LogUtil.error(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】"); LogUtil.error(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
LogUtil.info(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】"); LogUtil.info(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
...@@ -1822,7 +1826,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1822,7 +1826,7 @@ namespace OnlineStore.DeviceLibrary
{ {
result = 44; result = 44;
} }
else if (result >= 28) else if (result >= 32)
{ {
result = 32; result = 32;
} }
...@@ -2255,15 +2259,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -2255,15 +2259,15 @@ namespace OnlineStore.DeviceLibrary
index++; index++;
string plateW = plateWArray[index]; string plateW = plateWArray[index];
string plateH = plateHArray[index]; string plateH = plateHArray[index];
string[] posArray = posId.Split('#'); //string[] posArray = posId.Split('#');
if (posArray.Length != 2) //if (posArray.Length != 2)
{ //{
//WarnMsg = StoreName + "出库格式错误：库位号【" + posId + "】"; // //WarnMsg = StoreName + "出库格式错误：库位号【" + posId + "】";
SetWarnMsg(ResourceControl.OutStoreError, posId); // SetWarnMsg(ResourceControl.OutStoreError, posId);
LogUtil.error(LOGGER, "收到服务器出库命令：库位号【" + posId + "】格式错误"); // LogUtil.error(LOGGER, "收到服务器出库命令：库位号【" + posId + "】格式错误");
continue; // continue;
} //}
int storeId = int.Parse(posArray[0]); //int storeId = int.Parse(posArray[0]);
//根据发送的posId获取位置列表 //根据发送的posId获取位置列表
ACStorePosition position = CSVPositionReader<ACStorePosition>.GetPositon(posId); ACStorePosition position = CSVPositionReader<ACStorePosition>.GetPositon(posId);
...@@ -2271,7 +2275,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -2271,7 +2275,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//出入库没有找到服务器发送的库位，需要打印日志方便查询原因 //出入库没有找到服务器发送的库位，需要打印日志方便查询原因
//WarnMsg = StoreName + "出库未找库位：【" + posId + "】"; //WarnMsg = StoreName + "出库未找库位：【" + posId + "】";
SetWarnMsg(ResourceControl.OutStoreNoPosition, posId); SetWarnMsg(ResourceControl.OutStoreNoPosition, posId);//1082
LogUtil.error(LOGGER, "收到服务器出库命令：未找到【" + posId + "】的库位信息"); LogUtil.error(LOGGER, "收到服务器出库命令：未找到【" + posId + "】的库位信息");
continue; continue;
} }
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -172,7 +172,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -172,7 +172,7 @@ namespace OnlineStore.DeviceLibrary
{ {
ConfigIO io = Config.getWaitIO(wait.IoType); ConfigIO io = Config.getWaitIO(wait.IoType);
//WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！"; //WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
SetWarnMsg(ResourceControl.WaitSingleTimeOut, io.DisplayStr, wait.IoValue.ToString()); SetWarnMsg(ResourceControl.WaitSingleTimeOut, io.DisplayStr, wait.IoValue.ToString());//1084
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, StoreMove.MoveType); Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, StoreMove.MoveType);
LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14); LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
isOk = false; isOk = false;
...@@ -241,7 +241,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -241,7 +241,7 @@ namespace OnlineStore.DeviceLibrary
{ {
// WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg // WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg
// + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒"; // + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", NotOkMsg, Math.Round(span.TotalSeconds, 1) + ""); SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", NotOkMsg, Math.Round(span.TotalSeconds, 1) + ""); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100); LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
Alarm(StoreAlarmType.IoSingleTimeOut, "", StoreMove.MoveType); Alarm(StoreAlarmType.IoSingleTimeOut, "", StoreMove.MoveType);
} }
...@@ -330,7 +330,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -330,7 +330,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (!DoorIsClose() && IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW)) if (!DoorIsClose() && IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW))
{ {
SetWarnMsg(ResourceControl.safety_grating_covered, "开门时安全光栅被遮挡,暂停运行"); SetWarnMsg(ResourceControl.safety_grating_covered, "开门时安全光栅被遮挡,暂停运行");//1086
return; return;
} }
LineMoveP moveP = StoreMove.MoveParam.MoveP; LineMoveP moveP = StoreMove.MoveParam.MoveP;
...@@ -830,7 +830,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -830,7 +830,7 @@ namespace OnlineStore.DeviceLibrary
//OutStoreLog("出库：SO_12_DeviceOutFromDoor 升降轴返回，轴2至P1(待机点) ,关闭仓门,更改状态为出库完成"); //OutStoreLog("出库：SO_12_DeviceOutFromDoor 升降轴返回，轴2至P1(待机点) ,关闭仓门,更改状态为出库完成");
//ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed); //ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
//CloseDoor(); //CloseDoor();
SetWarnMsg(ResourceControl.take_out_reel_failure, posId); SetWarnMsg(ResourceControl.take_out_reel_failure, posId);//1083
OutStoreLog($"料叉没有成功取出料盘,请检查库位[{posId}]"); OutStoreLog($"料叉没有成功取出料盘,请检查库位[{posId}]");
} }
//改为出库完成 //改为出库完成
...@@ -840,7 +840,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -840,7 +840,7 @@ namespace OnlineStore.DeviceLibrary
else if (StoreMove.MoveStep == StoreMoveStep.SO_TakeReelFaile) else if (StoreMove.MoveStep == StoreMoveStep.SO_TakeReelFaile)
{ {
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : ""; string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
SetWarnMsg(ResourceControl.take_out_reel_failure, posId); SetWarnMsg(ResourceControl.take_out_reel_failure, posId); //1083
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray) else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray)
{ {
......
source/DeviceLibrary/acSingleStore/DoorControl.cs
...@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary
continue; continue;
} }
if (Config.Door_Axis==null && IOManager.IOValue(IO_Type.Motor_Error).Equals(IO_VALUE.HIGH)) { if (Config.Door_Axis==null && IOManager.IOValue(IO_Type.Motor_Error).Equals(IO_VALUE.HIGH)) {
SetWarnMsg(ResourceControl.WaitSingleTimeOut, "Motor_Error","Low"); SetWarnMsg(ResourceControl.WaitSingleTimeOut, "Motor_Error","Low");//1084
continue; continue;
} }
if (!SafetyLightCurtains && IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW)) if (!SafetyLightCurtains && IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW))
......
source/DeviceLibrary/halcon/CodeManager.cs
...@@ -137,7 +137,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -137,7 +137,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (cameraNameList != null && cameraNameList.Count >= 0) if (cameraNameList != null && cameraNameList.Count >= 0)
{ {
if (cameraNameList[0].Trim().ToLower().IndexOf("server") >= -1) if (cameraNameList[0].Trim().ToLower().IndexOf("server") >= 0)
{ {
return true; return true;
} }
...@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
if (String.IsNullOrEmpty(r)) if (String.IsNullOrEmpty(r))
{ {
// SaveImageToFile(deviceName, cameraName, bit); SaveImageToFile("camera", cameraName, bitmap);
} }
LogUtil.info(" 【" + cameraName + "】" + " 扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r); LogUtil.info(" 【" + cameraName + "】" + " 扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!