From 753b5add58defa5c09015308efb81bcaea0ebe91 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期六, 04 七月 2020 12:36:55 +0800
Subject: [PATCH] 修改板卡操作配置基类复数化
---
src/Bro.M071.Process/UI/M071_MainForm.cs | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.cs b/src/Bro.M071.Process/UI/M071_MainForm.cs
index 2ec9284..97904b6 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.cs
@@ -12,7 +12,7 @@
namespace Bro.M071.Process.UI
{
- [MenuNode("M071_MainForm", "閿洏妫�娴嬩富鐣岄潰", 3, "M071Node", true)]
+ [MenuNode("M071_MainForm", "杩愯鐣岄潰", 1, "M071Node", true)]
public partial class M071_MainForm : MenuFrmBase
{
Canvas cvImage = new Canvas();
@@ -26,7 +26,7 @@
tsmiShowStatusBar.Checked = cvImage.IsShowStatusBar = false;
tsmiShowToolBar.Checked = cvImage.IsShowToolBar = false;
cvImage.Dock = DockStyle.Fill;
- this.Controls.Add(cvImage);
+ plImage.Controls.Add(cvImage);
tscEditLocation.Visible = tsmiShowEditor.Checked = false;
}
@@ -66,17 +66,14 @@
item.Tag = u.Id;
lvMeasures.Items.Add(item);
});
- }
-
- private void lvMeasures_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (lvMeasures.SelectedItems.Count <= 0)
- return;
- var ele = cvImage.Elements.FirstOrDefault(u => u.ID == lvMeasures.SelectedItems[0].Tag.ToString());
- propGridKeyIndicator.SelectedObject = ele;
+ txtBarcode.ReadOnly = Config.IsBarcodeManulInputBlocked;
+
+ (Process as M071Process).OnClearBarcode -= M071_MainForm_OnClearBarcode;
+ (Process as M071Process).OnClearBarcode += M071_MainForm_OnClearBarcode;
}
+ #region 鍥剧墖鍖哄彸閿彍鍗�
private void tsmiShowToolBar_CheckedChanged(object sender, EventArgs e)
{
cvImage.IsShowToolBar = tsmiShowToolBar.Checked;
@@ -90,6 +87,18 @@
private void tsmiShowEditor_CheckedChanged(object sender, EventArgs e)
{
tscEditLocation.Visible = tsmiShowEditor.Checked;
+ tscEditLocation.BringToFront();
+ }
+ #endregion
+
+ #region 鏍囩缂栬緫鍖�
+ private void lvMeasures_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (lvMeasures.SelectedItems.Count <= 0)
+ return;
+
+ var ele = cvImage.Elements.FirstOrDefault(u => u.ID == lvMeasures.SelectedItems[0].Tag.ToString());
+ propGridKeyIndicator.SelectedObject = ele;
}
private void btnCancelEdit_Click(object sender, EventArgs e)
@@ -125,5 +134,39 @@
MessageBox.Show("鏍囩淇敼瀹屾垚");
}
+ #endregion
+
+ #region 涓婃柟鐘舵�佸尯
+
+ #region 鏉＄爜
+ string _barcode = "";
+ private void M071_MainForm_KeyUp(object sender, KeyEventArgs e)
+ {
+ string keyStr = e.KeyCode.ToString();
+ if (keyStr.Length == 1)
+ {
+ _barcode += keyStr.ToUpper();
+ }
+
+ if (e.KeyValue == 13)
+ {
+ txtBarcode.Text = _barcode;
+ _barcode = "";
+ }
+ }
+
+ private void txtBarcode_TextChanged(object sender, EventArgs e)
+ {
+ (Process as M071Process).BarCode = txtBarcode.Text.Trim();
+ }
+
+ private void M071_MainForm_OnClearBarcode()
+ {
+ txtBarcode.BeginInvoke(new Action(() => txtBarcode.Clear()));
+ }
+ #endregion
+
+ #endregion
+
}
}
--
Gitblit v1.8.0