From 123305d663e337f9ea1318bf50c83a60bd4011f0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 18 十月 2024 12:29:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Kf_WeighToBarCode.designer.cs | 174 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 94 insertions(+), 80 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
index a98477c..5ad10db 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Kf_WeighToBarCode.designer.cs"
@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.Tool = new System.Windows.Forms.ToolStrip();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.mrlk = new System.Windows.Forms.ToolStripButton();
@@ -55,6 +55,11 @@
this.label4 = new System.Windows.Forms.Label();
this.txtHMaterNumber = new System.Windows.Forms.TextBox();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.lblSNo = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.txtHBarCode_Pack = new System.Windows.Forms.TextBox();
+ this.cmdHEPack = new System.Windows.Forms.Button();
+ this.cmdHBPack = new System.Windows.Forms.Button();
this.textBox_COM = new System.Windows.Forms.TextBox();
this.label_COM = new System.Windows.Forms.Label();
this.button_OpenCom = new System.Windows.Forms.Button();
@@ -106,10 +111,6 @@
this.鍙充晶 = new System.Windows.Forms.Panel();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
- this.cmdHBPack = new System.Windows.Forms.Button();
- this.cmdHEPack = new System.Windows.Forms.Button();
- this.label18 = new System.Windows.Forms.Label();
- this.txtHBarCode_Pack = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.gbUp.SuspendLayout();
@@ -282,14 +283,14 @@
this.grdMain.AllowUserToDeleteRows = false;
this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle3.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Margin = new System.Windows.Forms.Padding(0);
@@ -366,6 +367,7 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.lblSNo);
this.gbUp.Controls.Add(this.label18);
this.gbUp.Controls.Add(this.txtHBarCode_Pack);
this.gbUp.Controls.Add(this.cmdHEPack);
@@ -419,6 +421,64 @@
this.gbUp.TabIndex = 58;
this.gbUp.TabStop = false;
//
+ // lblSNo
+ //
+ this.lblSNo.AutoSize = true;
+ this.lblSNo.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblSNo.ForeColor = System.Drawing.Color.Red;
+ this.lblSNo.Location = new System.Drawing.Point(843, 158);
+ this.lblSNo.Name = "lblSNo";
+ this.lblSNo.Size = new System.Drawing.Size(20, 19);
+ this.lblSNo.TabIndex = 334;
+ this.lblSNo.Text = ".";
+ //
+ // label18
+ //
+ this.label18.AutoSize = true;
+ this.label18.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label18.ForeColor = System.Drawing.Color.Black;
+ this.label18.Location = new System.Drawing.Point(638, 116);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(53, 12);
+ this.label18.TabIndex = 332;
+ this.label18.Text = "鎵樼洏鏉＄爜";
+ //
+ // txtHBarCode_Pack
+ //
+ this.txtHBarCode_Pack.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHBarCode_Pack.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHBarCode_Pack.Location = new System.Drawing.Point(693, 112);
+ this.txtHBarCode_Pack.Name = "txtHBarCode_Pack";
+ this.txtHBarCode_Pack.ReadOnly = true;
+ this.txtHBarCode_Pack.Size = new System.Drawing.Size(128, 21);
+ this.txtHBarCode_Pack.TabIndex = 333;
+ //
+ // cmdHEPack
+ //
+ this.cmdHEPack.BackColor = System.Drawing.Color.White;
+ this.cmdHEPack.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdHEPack.Location = new System.Drawing.Point(847, 89);
+ this.cmdHEPack.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHEPack.Name = "cmdHEPack";
+ this.cmdHEPack.Size = new System.Drawing.Size(86, 44);
+ this.cmdHEPack.TabIndex = 331;
+ this.cmdHEPack.Text = "缁撴潫缁勬墭";
+ this.cmdHEPack.UseVisualStyleBackColor = false;
+ this.cmdHEPack.Click += new System.EventHandler(this.cmdHEPack_Click);
+ //
+ // cmdHBPack
+ //
+ this.cmdHBPack.BackColor = System.Drawing.Color.White;
+ this.cmdHBPack.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cmdHBPack.Location = new System.Drawing.Point(847, 28);
+ this.cmdHBPack.Margin = new System.Windows.Forms.Padding(2);
+ this.cmdHBPack.Name = "cmdHBPack";
+ this.cmdHBPack.Size = new System.Drawing.Size(86, 44);
+ this.cmdHBPack.TabIndex = 330;
+ this.cmdHBPack.Text = "寮�濮嬬粍鎵�";
+ this.cmdHBPack.UseVisualStyleBackColor = false;
+ this.cmdHBPack.Click += new System.EventHandler(this.cmdHBPack_Click);
+ //
// textBox_COM
//
this.textBox_COM.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -444,7 +504,7 @@
this.button_OpenCom.BackColor = System.Drawing.Color.White;
this.button_OpenCom.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button_OpenCom.Location = new System.Drawing.Point(429, 222);
- this.button_OpenCom.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.button_OpenCom.Margin = new System.Windows.Forms.Padding(2);
this.button_OpenCom.Name = "button_OpenCom";
this.button_OpenCom.Size = new System.Drawing.Size(86, 32);
this.button_OpenCom.TabIndex = 327;
@@ -457,7 +517,7 @@
this.button_getHWeight.BackColor = System.Drawing.Color.White;
this.button_getHWeight.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button_getHWeight.Location = new System.Drawing.Point(322, 222);
- this.button_getHWeight.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.button_getHWeight.Margin = new System.Windows.Forms.Padding(2);
this.button_getHWeight.Name = "button_getHWeight";
this.button_getHWeight.Size = new System.Drawing.Size(86, 32);
this.button_getHWeight.TabIndex = 326;
@@ -568,7 +628,7 @@
//
this.chkHDYFlag.AutoSize = true;
this.chkHDYFlag.Location = new System.Drawing.Point(558, 236);
- this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
this.chkHDYFlag.Name = "chkHDYFlag";
this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
this.chkHDYFlag.TabIndex = 316;
@@ -580,7 +640,7 @@
this.cmdFZF.BackColor = System.Drawing.Color.White;
this.cmdFZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdFZF.Location = new System.Drawing.Point(729, 222);
- this.cmdFZF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.cmdFZF.Margin = new System.Windows.Forms.Padding(2);
this.cmdFZF.Name = "cmdFZF";
this.cmdFZF.Size = new System.Drawing.Size(86, 32);
this.cmdFZF.TabIndex = 157;
@@ -593,7 +653,7 @@
this.cmdZF.BackColor = System.Drawing.Color.White;
this.cmdZF.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdZF.Location = new System.Drawing.Point(635, 222);
- this.cmdZF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.cmdZF.Margin = new System.Windows.Forms.Padding(2);
this.cmdZF.Name = "cmdZF";
this.cmdZF.Size = new System.Drawing.Size(86, 32);
this.cmdZF.TabIndex = 156;
@@ -729,7 +789,7 @@
this.cmdSave.BackColor = System.Drawing.Color.White;
this.cmdSave.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdSave.Location = new System.Drawing.Point(209, 222);
- this.cmdSave.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.cmdSave.Margin = new System.Windows.Forms.Padding(2);
this.cmdSave.Name = "cmdSave";
this.cmdSave.Size = new System.Drawing.Size(86, 32);
this.cmdSave.TabIndex = 139;
@@ -753,7 +813,7 @@
this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
this.cmdSourceBillNo.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 222);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
this.cmdSourceBillNo.TabIndex = 138;
@@ -778,7 +838,7 @@
this.cmbHBarCodeType.Items.AddRange(new object[] {
"鍞竴鏉＄爜"});
this.cmbHBarCodeType.Location = new System.Drawing.Point(693, 28);
- this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
this.cmbHBarCodeType.Name = "cmbHBarCodeType";
this.cmbHBarCodeType.Size = new System.Drawing.Size(128, 20);
this.cmbHBarCodeType.TabIndex = 139;
@@ -799,7 +859,7 @@
this.dtpHDate.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHDate.Location = new System.Drawing.Point(303, 28);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
this.dtpHDate.Name = "dtpHDate";
this.dtpHDate.Size = new System.Drawing.Size(128, 21);
this.dtpHDate.TabIndex = 100;
@@ -821,14 +881,14 @@
this.grdSub.AllowUserToDeleteRows = false;
this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.grdSub.DefaultCellStyle = dataGridViewCellStyle2;
this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdSub.Location = new System.Drawing.Point(0, 73);
this.grdSub.Margin = new System.Windows.Forms.Padding(0);
@@ -855,7 +915,7 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(984, 340);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "绉伴噸璁板綍";
@@ -910,7 +970,7 @@
this.cmdOK.Cursor = System.Windows.Forms.Cursors.Default;
this.cmdOK.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmdOK.Location = new System.Drawing.Point(189, 33);
- this.cmdOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.cmdOK.Margin = new System.Windows.Forms.Padding(2);
this.cmdOK.Name = "cmdOK";
this.cmdOK.Size = new System.Drawing.Size(55, 27);
this.cmdOK.TabIndex = 150;
@@ -963,53 +1023,6 @@
// timer2
//
this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
- //
- // cmdHBPack
- //
- this.cmdHBPack.BackColor = System.Drawing.Color.White;
- this.cmdHBPack.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHBPack.Location = new System.Drawing.Point(847, 40);
- this.cmdHBPack.Margin = new System.Windows.Forms.Padding(2);
- this.cmdHBPack.Name = "cmdHBPack";
- this.cmdHBPack.Size = new System.Drawing.Size(86, 32);
- this.cmdHBPack.TabIndex = 330;
- this.cmdHBPack.Text = "寮�濮嬬粍鎵�";
- this.cmdHBPack.UseVisualStyleBackColor = false;
- this.cmdHBPack.Click += new System.EventHandler(this.cmdHBPack_Click);
- //
- // cmdHEPack
- //
- this.cmdHEPack.BackColor = System.Drawing.Color.White;
- this.cmdHEPack.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.cmdHEPack.Location = new System.Drawing.Point(847, 94);
- this.cmdHEPack.Margin = new System.Windows.Forms.Padding(2);
- this.cmdHEPack.Name = "cmdHEPack";
- this.cmdHEPack.Size = new System.Drawing.Size(86, 32);
- this.cmdHEPack.TabIndex = 331;
- this.cmdHEPack.Text = "缁撴潫缁勬墭";
- this.cmdHEPack.UseVisualStyleBackColor = false;
- this.cmdHEPack.Click += new System.EventHandler(this.cmdHEPack_Click);
- //
- // label18
- //
- this.label18.AutoSize = true;
- this.label18.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.ForeColor = System.Drawing.Color.Black;
- this.label18.Location = new System.Drawing.Point(638, 116);
- this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(53, 12);
- this.label18.TabIndex = 332;
- this.label18.Text = "鎵樼洏鏉＄爜";
- //
- // txtHBarCode_Pack
- //
- this.txtHBarCode_Pack.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtHBarCode_Pack.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBarCode_Pack.Location = new System.Drawing.Point(693, 112);
- this.txtHBarCode_Pack.Name = "txtHBarCode_Pack";
- this.txtHBarCode_Pack.ReadOnly = true;
- this.txtHBarCode_Pack.Size = new System.Drawing.Size(128, 21);
- this.txtHBarCode_Pack.TabIndex = 333;
//
// Kf_WeighToBarCode
//
@@ -1124,5 +1137,6 @@
private System.Windows.Forms.Button cmdHBPack;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.TextBox txtHBarCode_Pack;
+ private System.Windows.Forms.Label lblSNo;
}
}
\ No newline at end of file
--
Gitblit v1.9.1