From 8706f94e79eea78f765b0fdfc8b84e3cd24b2b5f Mon Sep 17 00:00:00 2001
From: fajiao <1519100073@qq.com>
Date: Fri, 10 Jun 2022 11:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B8=83?=
=?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
AutoWeightServer/UI/FrmBill.Designer.cs | 1 -
AutoWeightServer/UI/FrmMainServer.Designer.cs | 1 +
AutoWeightServer/UI/UC/UCCarIn.Designer.cs | 150 +++++++++---------
AutoWeightServer/UI/UC/UCCarIn.cs | 127 ++++++++-------
.../UI/UC/UCLicensePlate.Designer.cs | 2 +-
5 files changed, 149 insertions(+), 132 deletions(-)
diff --git a/AutoWeightServer/UI/FrmBill.Designer.cs b/AutoWeightServer/UI/FrmBill.Designer.cs
index bb84327..4a2b2df 100644
--- a/AutoWeightServer/UI/FrmBill.Designer.cs
+++ b/AutoWeightServer/UI/FrmBill.Designer.cs
@@ -201,7 +201,6 @@ namespace EC.AutoWeightServer.UI
this.ClientSize = new System.Drawing.Size(1334, 461);
this.Controls.Add(this.dataGridView);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmBill";
this.Text = "当日运单";
diff --git a/AutoWeightServer/UI/FrmMainServer.Designer.cs b/AutoWeightServer/UI/FrmMainServer.Designer.cs
index 0c50a59..925052b 100644
--- a/AutoWeightServer/UI/FrmMainServer.Designer.cs
+++ b/AutoWeightServer/UI/FrmMainServer.Designer.cs
@@ -478,6 +478,7 @@
//
// ucCarIn
//
+ this.ucCarIn.Anchor = System.Windows.Forms.AnchorStyles.None;
this.ucCarIn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(43)))), ((int)(((byte)(96)))));
this.ucCarIn.Location = new System.Drawing.Point(75, 15);
this.ucCarIn.Margin = new System.Windows.Forms.Padding(1);
diff --git a/AutoWeightServer/UI/UC/UCCarIn.Designer.cs b/AutoWeightServer/UI/UC/UCCarIn.Designer.cs
index 96df65c..5c46ca6 100644
--- a/AutoWeightServer/UI/UC/UCCarIn.Designer.cs
+++ b/AutoWeightServer/UI/UC/UCCarIn.Designer.cs
@@ -84,10 +84,10 @@
this.panelOut.Controls.Add(this.label1);
this.panelOut.Controls.Add(this.txtPlate);
this.panelOut.Controls.Add(this.label3);
- this.panelOut.Location = new System.Drawing.Point(0, 60);
+ this.panelOut.Location = new System.Drawing.Point(0, 51);
this.panelOut.Margin = new System.Windows.Forms.Padding(0);
this.panelOut.Name = "panelOut";
- this.panelOut.Size = new System.Drawing.Size(700, 210);
+ this.panelOut.Size = new System.Drawing.Size(600, 180);
this.panelOut.TabIndex = 27;
this.panelOut.Click += new System.EventHandler(this.TxtBillWeight_Leave);
//
@@ -95,19 +95,23 @@
//
this.comboBoxTrailer.BackColor = System.Drawing.SystemColors.Info;
this.comboBoxTrailer.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.comboBoxTrailer.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.comboBoxTrailer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxTrailer.DropDownWidth = 128;
this.comboBoxTrailer.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.comboBoxTrailer.Font = new System.Drawing.Font("宋体", 14.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.comboBoxTrailer.Font = new System.Drawing.Font("宋体", 15F);
this.comboBoxTrailer.ForeColor = System.Drawing.SystemColors.WindowText;
this.comboBoxTrailer.FormattingEnabled = true;
this.comboBoxTrailer.IntegralHeight = false;
- this.comboBoxTrailer.Location = new System.Drawing.Point(470, 112);
+ this.comboBoxTrailer.ItemHeight = 26;
+ this.comboBoxTrailer.Location = new System.Drawing.Point(403, 94);
this.comboBoxTrailer.Margin = new System.Windows.Forms.Padding(0);
- this.comboBoxTrailer.MaxDropDownItems = 12;
+ this.comboBoxTrailer.MaxDropDownItems = 16;
this.comboBoxTrailer.Name = "comboBoxTrailer";
- this.comboBoxTrailer.Size = new System.Drawing.Size(130, 30);
+ this.comboBoxTrailer.Size = new System.Drawing.Size(110, 32);
this.comboBoxTrailer.Sorted = true;
this.comboBoxTrailer.TabIndex = 63;
+ this.comboBoxTrailer.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.ComboBox_Trailer_DrawItem);
this.comboBoxTrailer.DropDownClosed += new System.EventHandler(this.ComboBox_Trailer_DropDownClosed);
//
// btnResetTrailer
@@ -115,10 +119,10 @@
this.btnResetTrailer.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnResetTrailer.Font = new System.Drawing.Font("宋体", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetTrailer.Image = global::EC.AutoWeightServer.Properties.Resources.重置;
- this.btnResetTrailer.Location = new System.Drawing.Point(610, 108);
+ this.btnResetTrailer.Location = new System.Drawing.Point(523, 93);
this.btnResetTrailer.Margin = new System.Windows.Forms.Padding(0);
this.btnResetTrailer.Name = "btnResetTrailer";
- this.btnResetTrailer.Size = new System.Drawing.Size(40, 40);
+ this.btnResetTrailer.Size = new System.Drawing.Size(34, 34);
this.btnResetTrailer.TabIndex = 62;
this.btnResetTrailer.UseVisualStyleBackColor = true;
this.btnResetTrailer.Click += new System.EventHandler(this.Btn_ResetTrailer_Click);
@@ -128,10 +132,10 @@
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 19F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.White;
- this.label4.Location = new System.Drawing.Point(352, 111);
+ this.label4.Location = new System.Drawing.Point(302, 95);
this.label4.Margin = new System.Windows.Forms.Padding(0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(118, 30);
+ this.label4.Size = new System.Drawing.Size(103, 26);
this.label4.TabIndex = 61;
this.label4.Text = "挂车号:";
//
@@ -140,10 +144,10 @@
this.btnResetWeight.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnResetWeight.Font = new System.Drawing.Font("宋体", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetWeight.Image = global::EC.AutoWeightServer.Properties.Resources.重置;
- this.btnResetWeight.Location = new System.Drawing.Point(610, 158);
+ this.btnResetWeight.Location = new System.Drawing.Point(523, 135);
this.btnResetWeight.Margin = new System.Windows.Forms.Padding(0);
this.btnResetWeight.Name = "btnResetWeight";
- this.btnResetWeight.Size = new System.Drawing.Size(40, 40);
+ this.btnResetWeight.Size = new System.Drawing.Size(34, 34);
this.btnResetWeight.TabIndex = 60;
this.btnResetWeight.UseVisualStyleBackColor = true;
this.btnResetWeight.Click += new System.EventHandler(this.Btn_ResetWeight_Click);
@@ -154,11 +158,11 @@
this.txtMaterialNo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtMaterialNo.Enabled = false;
this.txtMaterialNo.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtMaterialNo.Location = new System.Drawing.Point(200, 60);
+ this.txtMaterialNo.Location = new System.Drawing.Point(171, 51);
this.txtMaterialNo.Margin = new System.Windows.Forms.Padding(0);
this.txtMaterialNo.Name = "txtMaterialNo";
this.txtMaterialNo.ReadOnly = true;
- this.txtMaterialNo.Size = new System.Drawing.Size(400, 35);
+ this.txtMaterialNo.Size = new System.Drawing.Size(343, 32);
this.txtMaterialNo.TabIndex = 55;
//
// txtInWeight
@@ -168,11 +172,11 @@
this.txtInWeight.Enabled = false;
this.txtInWeight.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInWeight.ForeColor = System.Drawing.Color.OliveDrab;
- this.txtInWeight.Location = new System.Drawing.Point(470, 160);
+ this.txtInWeight.Location = new System.Drawing.Point(403, 137);
this.txtInWeight.Margin = new System.Windows.Forms.Padding(0);
this.txtInWeight.Name = "txtInWeight";
this.txtInWeight.ReadOnly = true;
- this.txtInWeight.Size = new System.Drawing.Size(130, 35);
+ this.txtInWeight.Size = new System.Drawing.Size(112, 32);
this.txtInWeight.TabIndex = 59;
//
// txtBillWeight
@@ -180,11 +184,11 @@
this.txtBillWeight.BackColor = System.Drawing.SystemColors.Info;
this.txtBillWeight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtBillWeight.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtBillWeight.Location = new System.Drawing.Point(200, 160);
+ this.txtBillWeight.Location = new System.Drawing.Point(171, 137);
this.txtBillWeight.Margin = new System.Windows.Forms.Padding(0);
this.txtBillWeight.Name = "txtBillWeight";
this.txtBillWeight.ReadOnly = true;
- this.txtBillWeight.Size = new System.Drawing.Size(130, 35);
+ this.txtBillWeight.Size = new System.Drawing.Size(112, 32);
this.txtBillWeight.TabIndex = 58;
this.txtBillWeight.Click += new System.EventHandler(this.TxtBillWeight_Enter);
//
@@ -193,10 +197,10 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.White;
- this.label5.Location = new System.Drawing.Point(70, 163);
+ this.label5.Location = new System.Drawing.Point(60, 140);
this.label5.Margin = new System.Windows.Forms.Padding(0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(130, 25);
+ this.label5.Size = new System.Drawing.Size(114, 22);
this.label5.TabIndex = 57;
this.label5.Text = "运单重量:";
//
@@ -205,10 +209,10 @@
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.White;
- this.label6.Location = new System.Drawing.Point(340, 163);
+ this.label6.Location = new System.Drawing.Point(291, 140);
this.label6.Margin = new System.Windows.Forms.Padding(0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(130, 25);
+ this.label6.Size = new System.Drawing.Size(114, 22);
this.label6.TabIndex = 56;
this.label6.Text = "入场重量:";
//
@@ -217,10 +221,10 @@
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("宋体", 19F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.White;
- this.label2.Location = new System.Drawing.Point(82, 61);
+ this.label2.Location = new System.Drawing.Point(70, 52);
this.label2.Margin = new System.Windows.Forms.Padding(0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(118, 30);
+ this.label2.Size = new System.Drawing.Size(103, 26);
this.label2.TabIndex = 54;
this.label2.Text = "料 号:";
//
@@ -230,11 +234,11 @@
this.txtSerialNo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtSerialNo.Enabled = false;
this.txtSerialNo.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtSerialNo.Location = new System.Drawing.Point(200, 10);
+ this.txtSerialNo.Location = new System.Drawing.Point(171, 9);
this.txtSerialNo.Margin = new System.Windows.Forms.Padding(0);
this.txtSerialNo.Name = "txtSerialNo";
this.txtSerialNo.ReadOnly = true;
- this.txtSerialNo.Size = new System.Drawing.Size(400, 35);
+ this.txtSerialNo.Size = new System.Drawing.Size(343, 32);
this.txtSerialNo.TabIndex = 53;
//
// label1
@@ -242,10 +246,10 @@
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 19F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.White;
- this.label1.Location = new System.Drawing.Point(82, 11);
+ this.label1.Location = new System.Drawing.Point(70, 9);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(118, 30);
+ this.label1.Size = new System.Drawing.Size(103, 26);
this.label1.TabIndex = 52;
this.label1.Text = "单 号:";
//
@@ -255,11 +259,11 @@
this.txtPlate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtPlate.Enabled = false;
this.txtPlate.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtPlate.Location = new System.Drawing.Point(200, 110);
+ this.txtPlate.Location = new System.Drawing.Point(171, 94);
this.txtPlate.Margin = new System.Windows.Forms.Padding(0);
this.txtPlate.Name = "txtPlate";
this.txtPlate.ReadOnly = true;
- this.txtPlate.Size = new System.Drawing.Size(130, 35);
+ this.txtPlate.Size = new System.Drawing.Size(112, 32);
this.txtPlate.TabIndex = 51;
//
// label3
@@ -267,10 +271,10 @@
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("宋体", 19F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.White;
- this.label3.Location = new System.Drawing.Point(82, 111);
+ this.label3.Location = new System.Drawing.Point(70, 95);
this.label3.Margin = new System.Windows.Forms.Padding(0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(118, 30);
+ this.label3.Size = new System.Drawing.Size(103, 26);
this.label3.TabIndex = 50;
this.label3.Text = "车牌号:";
//
@@ -280,7 +284,7 @@
this.panelTop.Dock = System.Windows.Forms.DockStyle.Top;
this.panelTop.Location = new System.Drawing.Point(0, 0);
this.panelTop.Name = "panelTop";
- this.panelTop.Size = new System.Drawing.Size(700, 60);
+ this.panelTop.Size = new System.Drawing.Size(600, 51);
this.panelTop.TabIndex = 31;
this.panelTop.Click += new System.EventHandler(this.TxtBillWeight_Leave);
//
@@ -292,7 +296,7 @@
this.labelTop.Location = new System.Drawing.Point(0, 0);
this.labelTop.Margin = new System.Windows.Forms.Padding(0);
this.labelTop.Name = "labelTop";
- this.labelTop.Size = new System.Drawing.Size(700, 60);
+ this.labelTop.Size = new System.Drawing.Size(600, 51);
this.labelTop.TabIndex = 3;
this.labelTop.Text = "运单信息";
this.labelTop.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -301,10 +305,10 @@
//
this.labelDriver2.BackColor = System.Drawing.SystemColors.InactiveCaption;
this.labelDriver2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labelDriver2.Location = new System.Drawing.Point(375, 376);
+ this.labelDriver2.Location = new System.Drawing.Point(321, 322);
this.labelDriver2.Margin = new System.Windows.Forms.Padding(0);
this.labelDriver2.Name = "labelDriver2";
- this.labelDriver2.Size = new System.Drawing.Size(120, 45);
+ this.labelDriver2.Size = new System.Drawing.Size(103, 39);
this.labelDriver2.TabIndex = 54;
this.labelDriver2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -315,10 +319,10 @@
this.btnFinger2.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.Flat;
this.btnFinger2.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFinger2.ImageOptions.Image = global::EC.AutoWeightServer.Properties.Resources.指纹;
- this.btnFinger2.Location = new System.Drawing.Point(508, 376);
+ this.btnFinger2.Location = new System.Drawing.Point(435, 322);
this.btnFinger2.Margin = new System.Windows.Forms.Padding(0);
this.btnFinger2.Name = "btnFinger2";
- this.btnFinger2.Size = new System.Drawing.Size(130, 45);
+ this.btnFinger2.Size = new System.Drawing.Size(111, 39);
this.btnFinger2.TabIndex = 53;
this.btnFinger2.Text = "押运员指纹";
this.btnFinger2.Click += new System.EventHandler(this.Btn_Finger2_Click);
@@ -327,10 +331,10 @@
//
this.labelDriver1.BackColor = System.Drawing.SystemColors.InactiveCaption;
this.labelDriver1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labelDriver1.Location = new System.Drawing.Point(375, 306);
+ this.labelDriver1.Location = new System.Drawing.Point(321, 262);
this.labelDriver1.Margin = new System.Windows.Forms.Padding(0);
this.labelDriver1.Name = "labelDriver1";
- this.labelDriver1.Size = new System.Drawing.Size(120, 45);
+ this.labelDriver1.Size = new System.Drawing.Size(103, 39);
this.labelDriver1.TabIndex = 52;
this.labelDriver1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -341,10 +345,10 @@
this.btnFinger1.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.Flat;
this.btnFinger1.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFinger1.ImageOptions.Image = global::EC.AutoWeightServer.Properties.Resources.指纹;
- this.btnFinger1.Location = new System.Drawing.Point(508, 306);
+ this.btnFinger1.Location = new System.Drawing.Point(435, 262);
this.btnFinger1.Margin = new System.Windows.Forms.Padding(0);
this.btnFinger1.Name = "btnFinger1";
- this.btnFinger1.Size = new System.Drawing.Size(130, 45);
+ this.btnFinger1.Size = new System.Drawing.Size(111, 39);
this.btnFinger1.TabIndex = 51;
this.btnFinger1.Text = "运输员指纹";
this.btnFinger1.Click += new System.EventHandler(this.Btn_Finger1_Click);
@@ -363,10 +367,10 @@
this.numberPanel.Controls.Add(this.btn_dh);
this.numberPanel.Controls.Add(this.btn_0);
this.numberPanel.Controls.Add(this.btn_tg);
- this.numberPanel.Location = new System.Drawing.Point(50, 285);
+ this.numberPanel.Location = new System.Drawing.Point(43, 244);
this.numberPanel.Name = "numberPanel";
- this.numberPanel.Padding = new System.Windows.Forms.Padding(6);
- this.numberPanel.Size = new System.Drawing.Size(310, 290);
+ this.numberPanel.Padding = new System.Windows.Forms.Padding(5);
+ this.numberPanel.Size = new System.Drawing.Size(266, 249);
this.numberPanel.TabIndex = 50;
this.numberPanel.Visible = false;
//
@@ -374,10 +378,10 @@
//
this.btn_7.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_7.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_7.Location = new System.Drawing.Point(6, 6);
+ this.btn_7.Location = new System.Drawing.Point(5, 5);
this.btn_7.Margin = new System.Windows.Forms.Padding(0);
this.btn_7.Name = "btn_7";
- this.btn_7.Size = new System.Drawing.Size(99, 70);
+ this.btn_7.Size = new System.Drawing.Size(85, 60);
this.btn_7.TabIndex = 15;
this.btn_7.Text = "7";
this.btn_7.UseVisualStyleBackColor = true;
@@ -387,10 +391,10 @@
//
this.btn_8.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_8.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_8.Location = new System.Drawing.Point(105, 6);
+ this.btn_8.Location = new System.Drawing.Point(90, 5);
this.btn_8.Margin = new System.Windows.Forms.Padding(0);
this.btn_8.Name = "btn_8";
- this.btn_8.Size = new System.Drawing.Size(99, 70);
+ this.btn_8.Size = new System.Drawing.Size(85, 60);
this.btn_8.TabIndex = 16;
this.btn_8.Text = "8";
this.btn_8.UseVisualStyleBackColor = true;
@@ -400,10 +404,10 @@
//
this.btn_9.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_9.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_9.Location = new System.Drawing.Point(204, 6);
+ this.btn_9.Location = new System.Drawing.Point(175, 5);
this.btn_9.Margin = new System.Windows.Forms.Padding(0);
this.btn_9.Name = "btn_9";
- this.btn_9.Size = new System.Drawing.Size(99, 70);
+ this.btn_9.Size = new System.Drawing.Size(85, 60);
this.btn_9.TabIndex = 17;
this.btn_9.Text = "9";
this.btn_9.UseVisualStyleBackColor = true;
@@ -413,10 +417,10 @@
//
this.btn_4.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_4.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_4.Location = new System.Drawing.Point(6, 76);
+ this.btn_4.Location = new System.Drawing.Point(5, 65);
this.btn_4.Margin = new System.Windows.Forms.Padding(0);
this.btn_4.Name = "btn_4";
- this.btn_4.Size = new System.Drawing.Size(99, 70);
+ this.btn_4.Size = new System.Drawing.Size(85, 60);
this.btn_4.TabIndex = 20;
this.btn_4.Text = "4";
this.btn_4.UseVisualStyleBackColor = true;
@@ -426,10 +430,10 @@
//
this.btn_5.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_5.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_5.Location = new System.Drawing.Point(105, 76);
+ this.btn_5.Location = new System.Drawing.Point(90, 65);
this.btn_5.Margin = new System.Windows.Forms.Padding(0);
this.btn_5.Name = "btn_5";
- this.btn_5.Size = new System.Drawing.Size(99, 70);
+ this.btn_5.Size = new System.Drawing.Size(85, 60);
this.btn_5.TabIndex = 19;
this.btn_5.Text = "5";
this.btn_5.UseVisualStyleBackColor = true;
@@ -439,10 +443,10 @@
//
this.btn_6.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_6.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_6.Location = new System.Drawing.Point(204, 76);
+ this.btn_6.Location = new System.Drawing.Point(175, 65);
this.btn_6.Margin = new System.Windows.Forms.Padding(0);
this.btn_6.Name = "btn_6";
- this.btn_6.Size = new System.Drawing.Size(99, 70);
+ this.btn_6.Size = new System.Drawing.Size(85, 60);
this.btn_6.TabIndex = 18;
this.btn_6.Text = "6";
this.btn_6.UseVisualStyleBackColor = true;
@@ -452,10 +456,10 @@
//
this.btn_1.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_1.Location = new System.Drawing.Point(6, 146);
+ this.btn_1.Location = new System.Drawing.Point(5, 125);
this.btn_1.Margin = new System.Windows.Forms.Padding(0);
this.btn_1.Name = "btn_1";
- this.btn_1.Size = new System.Drawing.Size(99, 70);
+ this.btn_1.Size = new System.Drawing.Size(85, 60);
this.btn_1.TabIndex = 20;
this.btn_1.Text = "1";
this.btn_1.UseVisualStyleBackColor = true;
@@ -465,10 +469,10 @@
//
this.btn_2.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_2.Location = new System.Drawing.Point(105, 146);
+ this.btn_2.Location = new System.Drawing.Point(90, 125);
this.btn_2.Margin = new System.Windows.Forms.Padding(0);
this.btn_2.Name = "btn_2";
- this.btn_2.Size = new System.Drawing.Size(99, 70);
+ this.btn_2.Size = new System.Drawing.Size(85, 60);
this.btn_2.TabIndex = 19;
this.btn_2.Text = "2";
this.btn_2.UseVisualStyleBackColor = true;
@@ -478,10 +482,10 @@
//
this.btn_3.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_3.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_3.Location = new System.Drawing.Point(204, 146);
+ this.btn_3.Location = new System.Drawing.Point(175, 125);
this.btn_3.Margin = new System.Windows.Forms.Padding(0);
this.btn_3.Name = "btn_3";
- this.btn_3.Size = new System.Drawing.Size(99, 70);
+ this.btn_3.Size = new System.Drawing.Size(85, 60);
this.btn_3.TabIndex = 17;
this.btn_3.Text = "3";
this.btn_3.UseVisualStyleBackColor = true;
@@ -491,10 +495,10 @@
//
this.btn_dh.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_dh.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_dh.Location = new System.Drawing.Point(6, 216);
+ this.btn_dh.Location = new System.Drawing.Point(5, 185);
this.btn_dh.Margin = new System.Windows.Forms.Padding(0);
this.btn_dh.Name = "btn_dh";
- this.btn_dh.Size = new System.Drawing.Size(99, 70);
+ this.btn_dh.Size = new System.Drawing.Size(85, 60);
this.btn_dh.TabIndex = 23;
this.btn_dh.Text = ".";
this.btn_dh.UseVisualStyleBackColor = true;
@@ -504,10 +508,10 @@
//
this.btn_0.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_0.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_0.Location = new System.Drawing.Point(105, 216);
+ this.btn_0.Location = new System.Drawing.Point(90, 185);
this.btn_0.Margin = new System.Windows.Forms.Padding(0);
this.btn_0.Name = "btn_0";
- this.btn_0.Size = new System.Drawing.Size(99, 70);
+ this.btn_0.Size = new System.Drawing.Size(85, 60);
this.btn_0.TabIndex = 22;
this.btn_0.Text = "0";
this.btn_0.UseVisualStyleBackColor = true;
@@ -517,10 +521,10 @@
//
this.btn_tg.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_tg.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btn_tg.Location = new System.Drawing.Point(204, 216);
+ this.btn_tg.Location = new System.Drawing.Point(175, 185);
this.btn_tg.Margin = new System.Windows.Forms.Padding(0);
this.btn_tg.Name = "btn_tg";
- this.btn_tg.Size = new System.Drawing.Size(99, 70);
+ this.btn_tg.Size = new System.Drawing.Size(85, 60);
this.btn_tg.TabIndex = 21;
this.btn_tg.Text = "退格";
this.btn_tg.UseVisualStyleBackColor = true;
@@ -534,17 +538,17 @@
this.btnConfirm.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.Flat;
this.btnConfirm.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnConfirm.ImageOptions.Image = global::EC.AutoWeightServer.Properties.Resources.ok32;
- this.btnConfirm.Location = new System.Drawing.Point(508, 443);
+ this.btnConfirm.Location = new System.Drawing.Point(435, 380);
this.btnConfirm.Margin = new System.Windows.Forms.Padding(0);
this.btnConfirm.Name = "btnConfirm";
- this.btnConfirm.Size = new System.Drawing.Size(133, 47);
+ this.btnConfirm.Size = new System.Drawing.Size(114, 40);
this.btnConfirm.TabIndex = 49;
this.btnConfirm.Text = "确认";
this.btnConfirm.Click += new System.EventHandler(this.InFinishBill);
//
// UCCarIn
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(43)))), ((int)(((byte)(96)))));
this.Controls.Add(this.labelDriver2);
@@ -557,7 +561,7 @@
this.Controls.Add(this.panelTop);
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "UCCarIn";
- this.Size = new System.Drawing.Size(700, 600);
+ this.Size = new System.Drawing.Size(600, 514);
this.Click += new System.EventHandler(this.TxtBillWeight_Leave);
this.panelOut.ResumeLayout(false);
this.panelOut.PerformLayout();
diff --git a/AutoWeightServer/UI/UC/UCCarIn.cs b/AutoWeightServer/UI/UC/UCCarIn.cs
index db24680..3ed2f7e 100644
--- a/AutoWeightServer/UI/UC/UCCarIn.cs
+++ b/AutoWeightServer/UI/UC/UCCarIn.cs
@@ -5,6 +5,7 @@ using EC.AutoWeightServer.Model.State;
using EC.Entity.Transport;
using EC.Utils;
using System;
+using System.Drawing;
using System.Windows.Forms;
namespace EC.AutoWeightServer.UI.UC
@@ -183,6 +184,18 @@ namespace EC.AutoWeightServer.UI.UC
label4.Focus();//让 ComboBoxTrailer 失去焦点，避免整个Box获取焦点为蓝色
}
+ private void ComboBox_Trailer_DrawItem(object sender, DrawItemEventArgs e)
+ {
+ if (e.Index < 0)
+ {
+ return;
+ }
+ //comboBoxTrailer.ItemHeight = 40;
+ e.DrawBackground();
+ e.DrawFocusRectangle();
+ e.Graphics.DrawString(comboBoxTrailer.Items[e.Index].ToString(), e.Font, new SolidBrush(e.ForeColor), e.Bounds.X, e.Bounds.Y + 5);
+ }
+
private void Btn_ResetTrailer_Click(object sender, EventArgs e)
{
var plate = GetLabelPlate();
@@ -244,6 +257,63 @@ namespace EC.AutoWeightServer.UI.UC
}
}
+ #region 数字键盘输入事件
+
+ ///
+ /// 进入输入框，打开数值输入面板
+ ///
+ private void TxtBillWeight_Enter(object sender, EventArgs e)
+ {
+ numberPanel.Show();
+ }
+
+ ///
+ /// 离开输入框，关闭数值输入面板
+ ///
+ private void TxtBillWeight_Leave(object sender, EventArgs e)
+ {
+ panelOut.Focus();
+ numberPanel.Hide();
+ }
+
+ ///
+ /// 数值输入面板下的数字输入按钮响应事件
+ ///
+ private void Btn_Number_Click(object sender, EventArgs e)
+ {
+ var btn = (Button)sender;
+ var txt = GetLabelBillWeight();
+ txt += btn.Text;
+ SetLabelBillWeight(txt);
+ txtBillWeight.Focus();
+ txtBillWeight.SelectionStart = txt.Length;
+ }
+
+ ///
+ /// 数值输入面板下的逗号输入按钮响应事件
+ ///
+ private void Btn_dh_Click(object sender, EventArgs e)
+ {
+ var txt = GetLabelBillWeight();
+ if (txt.IndexOf(".", StringComparison.Ordinal) >= 0)
+ return;
+ txt += ".";
+ SetLabelBillWeight(txt);
+ }
+
+ ///
+ /// 数值输入面板下的退格按钮响应事件
+ ///
+ private void Btn_tg_Click(object sender, EventArgs e)
+ {
+ var txt = GetLabelBillWeight();
+ if (txt.Length <= 0)
+ return;
+ SetLabelBillWeight(txt.Substring(0, txt.Length - 1));
+ }
+
+ #endregion 数字键盘输入事件
+
#endregion 界面操作响应事件
#region 流程
@@ -453,62 +523,5 @@ namespace EC.AutoWeightServer.UI.UC
}
#endregion Other
-
- #region 数字键盘输入事件
-
- ///
- /// 进入输入框，打开数值输入面板
- ///
- private void TxtBillWeight_Enter(object sender, EventArgs e)
- {
- numberPanel.Show();
- }
-
- ///
- /// 离开输入框，关闭数值输入面板
- ///
- private void TxtBillWeight_Leave(object sender, EventArgs e)
- {
- panelOut.Focus();
- numberPanel.Hide();
- }
-
- ///
- /// 数值输入面板下的数字输入按钮响应事件
- ///
- private void Btn_Number_Click(object sender, EventArgs e)
- {
- var btn = (Button)sender;
- var txt = GetLabelBillWeight();
- txt += btn.Text;
- SetLabelBillWeight(txt);
- txtBillWeight.Focus();
- txtBillWeight.SelectionStart = txt.Length;
- }
-
- ///
- /// 数值输入面板下的逗号输入按钮响应事件
- ///
- private void Btn_dh_Click(object sender, EventArgs e)
- {
- var txt = GetLabelBillWeight();
- if (txt.IndexOf(".", StringComparison.Ordinal) >= 0)
- return;
- txt += ".";
- SetLabelBillWeight(txt);
- }
-
- ///
- /// 数值输入面板下的退格按钮响应事件
- ///
- private void Btn_tg_Click(object sender, EventArgs e)
- {
- var txt = GetLabelBillWeight();
- if (txt.Length <= 0)
- return;
- SetLabelBillWeight(txt.Substring(0, txt.Length - 1));
- }
-
- #endregion 数字键盘输入事件
}
}
\ No newline at end of file
diff --git a/AutoWeightServer/UI/UC/UCLicensePlate.Designer.cs b/AutoWeightServer/UI/UC/UCLicensePlate.Designer.cs
index f16f787..f08519b 100644
--- a/AutoWeightServer/UI/UC/UCLicensePlate.Designer.cs
+++ b/AutoWeightServer/UI/UC/UCLicensePlate.Designer.cs
@@ -50,7 +50,7 @@
this.btnMan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnMan.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnMan.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnMan.Location = new System.Drawing.Point(286, 1);
+ this.btnMan.Location = new System.Drawing.Point(328, 1);
this.btnMan.Margin = new System.Windows.Forms.Padding(2);
this.btnMan.Name = "btnMan";
this.btnMan.Size = new System.Drawing.Size(61, 23);