From 7113711bc89507350e328357808ae6d7cef1c461 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 22 八月 2025 10:17:00 +0800
Subject: [PATCH] 称重
---
/dev/null | 120 ------------------------------
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 2
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs | 37 ---------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 --
DevApp/Gs.DevApp/Program.cs | 13 ---
5 files changed, 2 insertions(+), 179 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
index a972bb7..f2db1f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -46,14 +46,12 @@
this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
this.txtUser = new DevExpress.XtraEditors.TextEdit();
this.txtPwd = new DevExpress.XtraEditors.TextEdit();
- this.ckWeight = new DevExpress.XtraEditors.CheckEdit();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.panelLog = new System.Windows.Forms.Panel();
this.table1.SuspendLayout();
this.panel1.SuspendLayout();
@@ -62,14 +60,12 @@
((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.ckWeight.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
this.SuspendLayout();
//
// lbVersion
@@ -119,7 +115,6 @@
this.lay1.Controls.Add(this.btnLogin);
this.lay1.Controls.Add(this.txtUser);
this.lay1.Controls.Add(this.txtPwd);
- this.lay1.Controls.Add(this.ckWeight);
this.lay1.Dock = System.Windows.Forms.DockStyle.Fill;
this.lay1.Location = new System.Drawing.Point(0, 0);
this.lay1.Name = "lay1";
@@ -142,7 +137,6 @@
this.btnCancel.StyleController = this.lay1;
this.btnCancel.TabIndex = 15;
this.btnCancel.Text = "鍙栨秷 (&C)";
-
//
// ckRemember
//
@@ -171,7 +165,6 @@
this.btnLogin.StyleController = this.lay1;
this.btnLogin.TabIndex = 14;
this.btnLogin.Text = "鐧诲綍 (&L)";
-
//
// txtUser
//
@@ -198,16 +191,6 @@
this.txtPwd.StyleController = this.lay1;
this.txtPwd.TabIndex = 22;
//
- // ckWeight
- //
- this.ckWeight.Location = new System.Drawing.Point(189, 106);
- this.ckWeight.Name = "ckWeight";
- this.ckWeight.Properties.Caption = "浠呯О閲嶆ā寮�";
- this.ckWeight.Properties.ContentAlignment = DevExpress.Utils.HorzAlignment.Far;
- this.ckWeight.Size = new System.Drawing.Size(174, 24);
- this.ckWeight.StyleController = this.lay1;
- this.ckWeight.TabIndex = 23;
- //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -217,8 +200,7 @@
this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
- this.layoutControlItem5,
- this.layoutControlItem6});
+ this.layoutControlItem5});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -310,19 +292,6 @@
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
//
- // layoutControlItem6
- //
- this.layoutControlItem6.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
- this.layoutControlItem6.Control = this.ckWeight;
- this.layoutControlItem6.Location = new System.Drawing.Point(177, 94);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(178, 47);
- this.layoutControlItem6.Text = "绉伴噸妯″紡";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
// panelLog
//
this.panelLog.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
@@ -358,14 +327,12 @@
((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtPwd.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.ckWeight.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
this.ResumeLayout(false);
}
@@ -387,7 +354,5 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private System.Windows.Forms.Panel panelLog;
- private DevExpress.XtraEditors.CheckEdit ckWeight;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 001f9b8..c08ef43 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -74,7 +74,6 @@
Settings.Default.userName = ckRemember.Checked ? txtUser.Text.Trim() : "";
Settings.Default.userPwd = ckRemember.Checked ? txtPwd.Text.Trim() : "";
Settings.Default.remember = ckRemember.Checked;
- Settings.Default.isWeight = ckWeight.Checked;
Settings.Default.Save();
LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
@@ -103,7 +102,6 @@
txtUser.Text = Settings.Default.userName;
txtPwd.Text = Settings.Default.userPwd;
ckRemember.Checked = Settings.Default.remember;
- ckWeight.Checked = Settings.Default.isWeight;
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
deleted file mode 100644
index ae581db..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.Designer.cs
+++ /dev/null
@@ -1,561 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.Work
-{
- partial class Frm_Work09
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
- this.comLine = new Gs.DevApp.UserControl.UcLookWorkline();
- this.button1 = new DevExpress.XtraEditors.SimpleButton();
- this.cmbSerialPortNum = new DevExpress.XtraEditors.ComboBoxEdit();
- this.cmbBaudRate = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txtNum = new DevExpress.XtraEditors.TextEdit();
- this.txtMsg = new DevExpress.XtraEditors.MemoEdit();
- this.button2 = new DevExpress.XtraEditors.SimpleButton();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.cmbBaudRate1111 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
- this.split1.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
- this.split1.Panel2.SuspendLayout();
- this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
- this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.cmbSerialPortNum.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.cmbBaudRate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtNum.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtMsg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.cmbBaudRate1111)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- this.SuspendLayout();
- //
- // split1
- //
- this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.split1.Horizontal = false;
- this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Name = "split1";
- //
- // split1.Panel1
- //
- this.split1.Panel1.Controls.Add(this.layoutMx1);
- this.split1.Panel1.Text = "Panel1";
- //
- // split1.Panel2
- //
- this.split1.Panel2.Controls.Add(this.gcMx1);
- this.split1.Panel2.Text = "Panel2";
- this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1040, 511);
- this.split1.SplitterPosition = 113;
- this.split1.TabIndex = 1;
- //
- // layoutMx1
- //
- this.layoutMx1.Controls.Add(this.comLine);
- this.layoutMx1.Controls.Add(this.button1);
- this.layoutMx1.Controls.Add(this.cmbSerialPortNum);
- this.layoutMx1.Controls.Add(this.cmbBaudRate);
- this.layoutMx1.Controls.Add(this.txtNum);
- this.layoutMx1.Controls.Add(this.txtMsg);
- this.layoutMx1.Controls.Add(this.button2);
- this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(310, 455, 812, 500);
- this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1040, 113);
- this.layoutMx1.TabIndex = 0;
- this.layoutMx1.Text = "dataLayoutControl1";
- //
- // comLine
- //
- this.comLine.IsReadly = false;
- this.comLine.Location = new System.Drawing.Point(94, 12);
- this.comLine.Name = "comLine";
- this.comLine.Size = new System.Drawing.Size(164, 24);
- this.comLine.TabIndex = 14;
- //
- // button1
- //
- this.button1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
- this.button1.Appearance.Options.UseBackColor = true;
- this.button1.Appearance.Options.UseFont = true;
- this.button1.Location = new System.Drawing.Point(262, 12);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(246, 27);
- this.button1.StyleController = this.layoutMx1;
- this.button1.TabIndex = 5;
- this.button1.Text = "鍚姩";
- //
- // cmbSerialPortNum
- //
- this.cmbSerialPortNum.Location = new System.Drawing.Point(94, 43);
- this.cmbSerialPortNum.Name = "cmbSerialPortNum";
- this.cmbSerialPortNum.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.cmbSerialPortNum.Properties.NullText = "-璇烽�夋嫨-";
- this.cmbSerialPortNum.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.cmbSerialPortNum.Size = new System.Drawing.Size(164, 24);
- this.cmbSerialPortNum.StyleController = this.layoutMx1;
- this.cmbSerialPortNum.TabIndex = 4;
- //
- // cmbBaudRate
- //
- this.cmbBaudRate.EditValue = "9600";
- this.cmbBaudRate.Location = new System.Drawing.Point(94, 74);
- this.cmbBaudRate.Name = "cmbBaudRate";
- this.cmbBaudRate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.cmbBaudRate.Properties.Items.AddRange(new object[] {
- "14400",
- "9600",
- "4800",
- "2400",
- "1200"});
- this.cmbBaudRate.Properties.NullText = "-璇烽�夋嫨-";
- this.cmbBaudRate.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.cmbBaudRate.Size = new System.Drawing.Size(164, 24);
- this.cmbBaudRate.StyleController = this.layoutMx1;
- this.cmbBaudRate.TabIndex = 5;
- //
- // txtNum
- //
- this.txtNum.Location = new System.Drawing.Point(594, 22);
- this.txtNum.Name = "txtNum";
- this.txtNum.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
- this.txtNum.Properties.Appearance.Options.UseFont = true;
- this.txtNum.Properties.ReadOnly = true;
- this.txtNum.Size = new System.Drawing.Size(434, 36);
- this.txtNum.StyleController = this.layoutMx1;
- this.txtNum.TabIndex = 8;
- //
- // txtMsg
- //
- this.txtMsg.Location = new System.Drawing.Point(512, 74);
- this.txtMsg.Name = "txtMsg";
- this.txtMsg.Properties.ReadOnly = true;
- this.txtMsg.Size = new System.Drawing.Size(516, 27);
- this.txtMsg.StyleController = this.layoutMx1;
- this.txtMsg.TabIndex = 15;
- //
- // button2
- //
- this.button2.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
- this.button2.Appearance.Options.UseBackColor = true;
- this.button2.Location = new System.Drawing.Point(262, 43);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(246, 27);
- this.button2.StyleController = this.layoutMx1;
- this.button2.TabIndex = 16;
- this.button2.Text = "鍋滄";
- //
- // Root
- //
- this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.Root.GroupBordersVisible = false;
- this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem3,
- this.layoutControlItem1,
- this.cmbBaudRate1111,
- this.layoutControlItem2,
- this.layoutControlItem6,
- this.layoutControlItem4,
- this.layoutControlItem5});
- this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition1.Width = 250D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition2.Width = 250D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1040, 113);
- this.Root.TextVisible = false;
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.comLine;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.Size = new System.Drawing.Size(250, 31);
- this.layoutControlItem3.Text = "閫夌嚎浣�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(70, 18);
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.cmbSerialPortNum;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 31);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(250, 31);
- this.layoutControlItem1.Text = "涓插彛鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(70, 18);
- //
- // cmbBaudRate1111
- //
- this.cmbBaudRate1111.Control = this.cmbBaudRate;
- this.cmbBaudRate1111.Location = new System.Drawing.Point(0, 62);
- this.cmbBaudRate1111.Name = "cmbBaudRate1111";
- this.cmbBaudRate1111.OptionsTableLayoutItem.RowIndex = 2;
- this.cmbBaudRate1111.Size = new System.Drawing.Size(250, 31);
- this.cmbBaudRate1111.Text = "娉㈢壒鐜�";
- this.cmbBaudRate1111.TextSize = new System.Drawing.Size(70, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.button1;
- this.layoutControlItem2.Location = new System.Drawing.Point(250, 0);
- this.layoutControlItem2.MaxSize = new System.Drawing.Size(250, 31);
- this.layoutControlItem2.MinSize = new System.Drawing.Size(41, 31);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(250, 31);
- this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem2.Text = "鍚姩";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem2.TextVisible = false;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.button2;
- this.layoutControlItem6.Location = new System.Drawing.Point(250, 31);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(250, 31);
- this.layoutControlItem6.Text = "鍋滄";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold);
- this.layoutControlItem4.AppearanceItemCaption.Options.UseFont = true;
- this.layoutControlItem4.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
- this.layoutControlItem4.Control = this.txtNum;
- this.layoutControlItem4.Location = new System.Drawing.Point(500, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(520, 62);
- this.layoutControlItem4.Text = "閲嶉噺";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(70, 41);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txtMsg;
- this.layoutControlItem5.Location = new System.Drawing.Point(500, 62);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(520, 31);
- this.layoutControlItem5.Text = "鏀跺垪琛�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem5.TextVisible = false;
- //
- // gcMx1
- //
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
- this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1040, 386);
- this.gcMx1.TabIndex = 0;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
- //
- // gvMx1
- //
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn1,
- this.gridColumn2,
- this.gridColumn3,
- this.gridColumn4,
- this.gridColumn5,
- this.gridColumn6,
- this.gridColumn8,
- this.gridColumn9,
- this.gridColumn10,
- this.gridColumn11,
- this.gridColumn12,
- this.gridColumn13});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "鏉＄爜";
- this.gridColumn1.FieldName = "flowCode";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "宸ュ崟";
- this.gridColumn2.FieldName = "gdbh";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鐗╂枡缂栫爜";
- this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.OptionsColumn.ReadOnly = true;
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn4.FieldName = "itemName";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn5.FieldName = "itemModel";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 94;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "宸ュ簭";
- this.gridColumn6.FieldName = "processNo";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 94;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "绾垮埆";
- this.gridColumn8.FieldName = "lineName";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.OptionsColumn.ReadOnly = true;
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 6;
- this.gridColumn8.Width = 94;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "浣滀笟浜哄憳";
- this.gridColumn9.FieldName = "createBy";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.OptionsColumn.ReadOnly = true;
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 7;
- this.gridColumn9.Width = 94;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "浣滀笟鏃堕棿";
- this.gridColumn10.FieldName = "createDate";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.OptionsColumn.ReadOnly = true;
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 8;
- this.gridColumn10.Width = 94;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "瀹為檯閲嶉噺";
- this.gridColumn11.FieldName = "sjWeight";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.OptionsColumn.ReadOnly = true;
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 9;
- this.gridColumn11.Width = 94;
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "閲嶉噺涓婇檺";
- this.gridColumn12.FieldName = "maxWeight";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.OptionsColumn.ReadOnly = true;
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 10;
- this.gridColumn12.Width = 94;
- //
- // gridColumn13
- //
- this.gridColumn13.Caption = "閲嶉噺涓嬮檺";
- this.gridColumn13.FieldName = "minWeight";
- this.gridColumn13.MinWidth = 25;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.OptionsColumn.ReadOnly = true;
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 11;
- this.gridColumn13.Width = 94;
- //
- // Frm_Work09
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1040, 511);
- this.Controls.Add(this.split1);
- this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Name = "Frm_Work09";
- this.Text = "绉伴噸閲囬泦";
- this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
- this.split1.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
- this.split1.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
- this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
- this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.cmbSerialPortNum.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.cmbBaudRate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtNum.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtMsg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.cmbBaudRate1111)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
- private DevExpress.XtraEditors.SplitContainerControl split1;
- private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
- private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.ComboBoxEdit cmbSerialPortNum;
- private DevExpress.XtraEditors.ComboBoxEdit cmbBaudRate;
- private DevExpress.XtraEditors.TextEdit txtNum;
- private DevExpress.XtraEditors.SimpleButton button1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
- private UserControl.UcLookWorkline comLine;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraEditors.MemoEdit txtMsg;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem cmbBaudRate1111;
- private DevExpress.XtraEditors.SimpleButton button2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
deleted file mode 100644
index bb61c56..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.cs
+++ /dev/null
@@ -1,351 +0,0 @@
-锘縰sing DevExpress.Utils;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Microsoft.Win32;
-using Newtonsoft.Json;
-using NModbus;
-using NModbus.Serial;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Drawing;
-using System.IO.Ports;
-using System.Linq;
-using System.Threading;
-using System.Timers;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.Work
-{
- public partial class Frm_Work09 : DevExpress.XtraEditors.XtraForm
- {
- string _webServiceName = "WorkWeight/";
- public System.IO.Ports.SerialPort Sp = new System.IO.Ports.SerialPort();
- public delegate void HandleInterfaceUpdataDelegate(string text);
- private Frm_Work09.HandleInterfaceUpdataDelegate interfaceUpdataHandle;
- private Dictionary<string, Thread> dicThread = new Dictionary<string, Thread>();
- private System.Windows.Forms.Timer timer1 = new System.Windows.Forms.Timer();
-
- System.Timers.Timer timerGridview = new System.Timers.Timer(10000);
- public Frm_Work09(string strType)
- {
- InitializeComponent();
- GetComList();
- comLine.getSuppler("");
- #region MyRegion
- int int32 = 10000;
- string _vanishingSeconds = ConfigurationManager.AppSettings["TimingMailInterval"];
- if (!string.IsNullOrEmpty(_vanishingSeconds))
- int32 = int.Parse(_vanishingSeconds);
- this.timer1.Interval = int32;
- this.button1.Enabled = true;
- this.button2.Enabled = false;
- this.comLine.IsReadly = false;
- this.cmbSerialPortNum.Enabled = true;
- this.cmbBaudRate.Enabled = true;
- this.cmbBaudRate.SelectedIndex = 1;
- #endregion
- this.timer1.Tick += (s, e) =>
- {
- if (this.dicThread.Keys.Contains<string>("GetWeight"))
- return;
- Thread thread1 = new Thread(new ThreadStart(this.GetWeight));
- thread1.Start();
- this.dicThread.Add("GetWeight", thread1);
- };
- this.button1.Click += (s, e) =>
- {
- string _comLine = comLine.GetId();
- if (string.IsNullOrEmpty(_comLine))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨绾夸綋");
- this.comLine.Focus();
- return;
- }
- try
- {
- ToolBox.LogHelper.Debug(this.ToString(), " 寮�濮嬮噰闆�");
- if (this.cmbBaudRate.Text.Trim() != "" && this.cmbSerialPortNum.Text != "")
- {
- ToolBox.LogHelper.Debug(this.ToString(), "閰嶇疆涓插彛閫氫俊");
- this.interfaceUpdataHandle = new Frm_Work09.HandleInterfaceUpdataDelegate(this.UpdateTextBox);
- this.Sp.PortName = this.cmbSerialPortNum.Text.Trim();
- this.Sp.BaudRate = Convert.ToInt32(this.cmbBaudRate.Text.Trim());
- this.Sp.Parity = Parity.None;
- this.Sp.StopBits = StopBits.One;
- ToolBox.LogHelper.Debug(this.ToString(), "鎵撳紑涓插彛鍚岄�氫俊");
- this.Sp.Open();
- this.button1.Enabled = false;
- this.button2.Enabled = true;
- this.timer1.Enabled = false;
- this.comLine.IsReadly = true;
- this.cmbSerialPortNum.Enabled = false;
- this.cmbBaudRate.Enabled = false;
- ToolBox.LogHelper.Debug(this.ToString(), "鍚姩鍒锋柊鏁版嵁瀹氭椂鍣�");
- this.timer1.Start();
- }
- else
- {
- ToolBox.LogHelper.Debug(this.ToString(), "璇疯緭鍏ユ纭殑涓插彛鍙峰拰娉㈢壒鐜�");
- int num = (int)MessageBox.Show("璇疯緭鍏ユ纭殑涓插彛鍙峰拰娉㈢壒鐜囷紒");
- this.cmbSerialPortNum.Focus();
- }
- }
- catch (Exception ex)
- {
- ToolBox.LogHelper.Debug(this.ToString(), ex.Message);
- int num = (int)MessageBox.Show($"涓插彛{this.cmbSerialPortNum.Text.Trim()}鎵撳紑澶辫触锛亄ex.Message}");
- }
- };
- this.button2.Click += (s, e) =>
- {
- try
- {
- if (this.dicThread.Keys.Contains<string>("GetWeight"))
- {
- Thread thread = this.dicThread["GetWeight"];
- if (thread.IsAlive)
- thread.Abort();
- this.dicThread.Remove("GetWeight");
- }
- this.button1.Enabled = true;
- this.button2.Enabled = false;
- this.comLine.IsReadly = false;
- this.cmbSerialPortNum.Enabled = true;
- this.cmbBaudRate.Enabled = true;
- this.timer1.Stop();
- this.Sp.Close();
- }
- catch (Exception ex)
- {
- //int num = (int)MessageBox.Show(ex.Message);
- //Application.Exit();
- MessageBox.Show(ex.Message);
- ToolBox.LogHelper.Debug(this.ToString(), ex.Message);
- }
- };
- this.FormClosing += (s, e) =>
- {
- if (Sp.IsOpen)
- Sp.Close();
- if (timer1 != null)
- {
- timer1.Stop();
- timer1.Dispose();
- }
- if (timerGridview != null)
- {
- timerGridview.Stop();
- timerGridview.Dispose();
- }
- try
- {
- if (this.dicThread.Keys.Contains<string>("GetWeight"))
- {
- Thread thread = this.dicThread["GetWeight"];
- if (thread.IsAlive)
- thread.Abort();
- this.dicThread.Remove("GetWeight");
- }
- this.timer1.Stop();
- this.Sp.Close();
- }
- catch (Exception ex)
- {
- //int num = (int)MessageBox.Show(ex.Message);
- //Application.Exit();
- MessageBox.Show(ex.Message);
- }
- };
- #region gridview璁剧疆
- timerGridview.Elapsed += (s, e) => {
- var _obj = new
- {
- lineId = comLine.GetId(),
- };
- try
- {
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModelList", JsonConvert.SerializeObject(_obj), false);
- var dd = UtilityHelper.ReturnToList(strReturn);
- var dt = dd.rtnData;
- BeginInvoke(new Action(() =>
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- gvMx1.BestFitColumns();
- }));
- BeginInvoke(new Action(() => {
- this.txtMsg.Text = "鏈�杩戝埛鏂板垪琛ㄦ椂闂�:" + DateTime.Now.ToString();
- }));
- }
- catch (Exception ex)
- {
- Toast vm = new Toast(-1, "gvMx1:" + ex.Message);
- vm.Show();
- }
- };
- timerGridview.AutoReset = true; // 璁剧疆涓簍rue琛ㄧず閲嶅鎵ц锛宖alse琛ㄧず鎵ц涓�娆″悗鍋滄
- timerGridview.Enabled = true; // 寮�濮嬭鏃�
- gvMx1.OptionsFind.ShowSearchNavButtons = false;
- gvMx1.OptionsView.ShowAutoFilterRow = false;
- gvMx1.OptionsView.ShowGroupPanel = false;
- gvMx1.RowStyle += (s, e) =>
- {
- //榛樿閫変腑琛屼笉鍙樿壊
- gvMx1.OptionsSelection.EnableAppearanceFocusedRow = false;
- //榛樿閫変腑鍗曞厓鏍间笉鍙樿壊
- gvMx1.OptionsSelection.EnableAppearanceFocusedCell = false;
- if (e.RowHandle >= 0)
- {
- DataRow row = gvMx1.GetDataRow(e.RowHandle);
- if (row == null)
- return;
- string colorString = row["bgColor"].ToString(); // 浣跨敤鍗佸叚杩涘埗琛ㄧず棰滆壊鐨凙RGB鍊�
- Color color = ColorTranslator.FromHtml(colorString);
- e.Appearance.BackColor = color;
- }
- };
- gvMx1.IndicatorWidth = 60;
- gvMx1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- #endregion
- }
-
- /// <summary>
- /// 鑾峰彇閲嶉噺
- /// </summary>
- public void GetWeight()
- {
- ModbusFactory factory = new ModbusFactory();
- ToolBox.LogHelper.Debug(this.ToString(), "GetWeight鍒涘缓modbus瀵硅薄");
- IModbusMaster rtuMaster = (IModbusMaster)factory.CreateRtuMaster(this.Sp);
- bool flag = true;
- while (true)
- {
- // addModel("1", "2");
- //ToolBox.LogHelper.Debug(this.ToString(), "GetWeight鍒涘缓modbus瀵硅薄");
- try
- {
- if (!this.Sp.IsOpen)
- {
- ToolBox.LogHelper.Debug(this.ToString(), "GetWeight 閲嶆柊鎵撳紑涓插彛杩炴帴");
- this.Sp.Open();
- rtuMaster = (IModbusMaster)factory.CreateRtuMaster(this.Sp);
- }
- if (rtuMaster == null)
- {
- ToolBox.LogHelper.Debug(this.ToString(), "GetWeight 閲嶆柊鍒涘缓modbus瀵硅薄2");
- rtuMaster = (IModbusMaster)factory.CreateRtuMaster(this.Sp);
- }
- byte slaveAddress3 = byte.Parse("1");
- ushort startAddress3 = ushort.Parse("0002");
- ushort numberOfPoints1 = ushort.Parse("2");
- ushort[] numArray = rtuMaster.ReadHoldingRegisters(slaveAddress3, startAddress3, numberOfPoints1);
- float single = BitConverter.ToSingle(this.CombomBinaryArray(BitConverter.GetBytes(numArray[1]), BitConverter.GetBytes(numArray[0])), 0);
- this.Invoke((Delegate)this.interfaceUpdataHandle, (object)single.ToString());
- byte slaveAddress4 = byte.Parse("1");
- ushort startAddress4 = ushort.Parse("0001");
- ushort numberOfPoints2 = ushort.Parse("1");
- int int32 = Convert.ToInt32(rtuMaster.ReadHoldingRegisters(slaveAddress4, startAddress4, numberOfPoints2)[0].ToString());
- string str = Convert.ToString(int32, 2).PadLeft(16 /*0x10*/, '0');
- char ch1 = str[1];
- char ch2 = str[6];
- if (ch1 == '0' && ch2 == '0')
- {
- flag = true;
- }
- else if (flag)
- {
- flag = false;
- }
- addModel(single.ToString(), int32.ToString());
- ToolBox.LogHelper.Debug(this.ToString(), "single:" + single.ToString() + ",flag:" + flag.ToString() + ",int32:" + int32.ToString());
- Thread.Sleep(2000);
- }
- catch (Exception ex)
- {
- Thread.Sleep(2000);
- }
- }
- }
- /// <summary>
- /// 涓婁紶绉伴噸鏁版嵁
- /// </summary>
- /// <param name="_realWeight">鎴彇鍚庣殑鏁伴噺</param>
- /// <param name="_realWeightTxt">鍘熷瓙涓�</param>
- private void addModel(string _realWeight, string _realWeightTxt)
- {
- string _lineId = "0";
- var _obj = new
- {
- lineId = _lineId,
- realWeight = _realWeight.Trim(),
- realWeightTxt = _realWeightTxt.Trim(),
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", "WorkWeight/EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode <= 0)
- {
- ToolBox.LogHelper.Debug(this.ToString(), "WorkWeight/EditModel:" + strJson);
- }
- }
- catch (Exception ex)
- {
- ToolBox.LogHelper.Debug(this.ToString(), ex.Message);
- }
- }
-
-
- /// <summary>
- /// 鏇存柊UI
- /// </summary>
- /// <param name="text"></param>
-
- private void UpdateTextBox(string text)
- {
- try
- {
- this.txtMsg.Text ="鏈�杩戠О閲嶆椂闂�:"+ DateTime.Now.ToString();
- if (this.txtNum.Text == text)
- return;
- this.txtNum.Text = text;
- }
- catch (Exception ex)
- {
- ToolBox.LogHelper.Debug(this.ToString(), ex.Message);
- }
- }
-
- private void GetComList()
- {
- this.cmbSerialPortNum.Clear();
- RegistryKey registryKey = Registry.LocalMachine.OpenSubKey("Hardware\\DeviceMap\\SerialComm");
- if (registryKey == null)
- return;
- foreach (string valueName in registryKey.GetValueNames())
- {
- string description = (string)registryKey.GetValue(valueName);
- cmbSerialPortNum.Properties.Items.Add(description);
- }
- if (this.cmbSerialPortNum.Properties.Items.Count > 0)
- this.cmbSerialPortNum.SelectedIndex = 0;
- }
-
- private byte[] CombomBinaryArray(byte[] srcArray1, byte[] srcArray2)
- {
- byte[] destinationArray = new byte[srcArray1.Length + srcArray2.Length];
- Array.Copy((Array)srcArray1, 0, (Array)destinationArray, 0, srcArray1.Length);
- Array.Copy((Array)srcArray2, 0, (Array)destinationArray, srcArray1.Length, srcArray2.Length);
- return destinationArray;
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.resx b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 28e2fa4..81aba88 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1101,12 +1101,6 @@
<Compile Include="DevFrm\Work\Frm_Work01.Designer.cs">
<DependentUpon>Frm_Work01.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Work\Frm_Work09.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\Work\Frm_Work09.Designer.cs">
- <DependentUpon>Frm_Work09.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\Work\Frm_WorkProcesses.cs">
<SubType>Form</SubType>
</Compile>
@@ -1966,9 +1960,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx">
<DependentUpon>Frm_Work01.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Work\Frm_Work09.resx">
- <DependentUpon>Frm_Work09.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx">
<DependentUpon>Frm_WorkProcesses.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index da19396..213b64e 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -53,18 +53,7 @@
{
//Application.Run(new DevFrm.User.SysMenu());
//return;
- bool IsWeight = false;
- try
- {
- IsWeight = Settings.Default.isWeight;
- }
- catch (Exception)
- {
- }
- if (IsWeight == true)
- Application.Run(new Frm_Work09(QcSeason.浜х嚎绉伴噸.ToString()));
- else
- Application.Run(new FrmMain());
+ Application.Run(new FrmMain());
}
}
else
--
Gitblit v1.9.3