From 695d9c4cda618bae357d6f70a068b604dac4fdd3 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 23 十一月 2022 10:17:45 +0800
Subject: [PATCH] 合并
---
WorkM/流转卡管理/MES_StationInBill.designer.cs | 152 +++++++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 75 deletions(-)
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs"
index 7097216..29a68a9 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/MES_StationInBill.designer.cs"
@@ -62,7 +62,6 @@
this.cmdCancel = new System.Windows.Forms.Button();
this.lblCaption = new System.Windows.Forms.Label();
this.gbUp = new System.Windows.Forms.GroupBox();
- this.grdSub = new System.Windows.Forms.DataGridView();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.txtHGroupName = new System.Windows.Forms.TextBox();
@@ -100,15 +99,18 @@
this.label23 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
this.label21 = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.grdCardList = new System.Windows.Forms.DataGridView();
this.panel2 = new System.Windows.Forms.Panel();
this.txtHBarCode_Mater = new System.Windows.Forms.TextBox();
this.label25 = new System.Windows.Forms.Label();
this.txtHBarCode = new System.Windows.Forms.TextBox();
this.label19 = new System.Windows.Forms.Label();
+ this.grdSub = new System.Windows.Forms.DataGridView();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.grdCardList = new System.Windows.Forms.DataGridView();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.panel1 = new System.Windows.Forms.Panel();
+ this.cmdHmrlk = new System.Windows.Forms.Button();
+ this.cmdHbclk = new System.Windows.Forms.Button();
this.cmdDelLine = new System.Windows.Forms.Button();
this.cmdXZ = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
@@ -116,16 +118,14 @@
this.cmdHDelBill = new System.Windows.Forms.Button();
this.cmdXG = new System.Windows.Forms.Button();
this.cmdAddNew = new System.Windows.Forms.Button();
- this.cmdHbclk = new System.Windows.Forms.Button();
- this.cmdHmrlk = new System.Windows.Forms.Button();
this.gbUp.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdCardList)).BeginInit();
- this.panel2.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
@@ -513,35 +513,20 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
- this.gbUp.Controls.Add(this.grdSub);
this.gbUp.Controls.Add(this.tabControl1);
- this.gbUp.Controls.Add(this.groupBox1);
this.gbUp.Controls.Add(this.panel2);
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
this.gbUp.Location = new System.Drawing.Point(0, 0);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(1036, 589);
+ this.gbUp.Size = new System.Drawing.Size(811, 413);
this.gbUp.TabIndex = 114;
this.gbUp.TabStop = false;
- //
- // grdSub
- //
- this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdSub.Location = new System.Drawing.Point(3, 407);
- this.grdSub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.grdSub.Name = "grdSub";
- this.grdSub.RowHeadersWidth = 51;
- this.grdSub.RowTemplate.Height = 27;
- this.grdSub.Size = new System.Drawing.Size(752, 179);
- this.grdSub.TabIndex = 149;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
- this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.tabControl1.Location = new System.Drawing.Point(3, 61);
+ this.tabControl1.Location = new System.Drawing.Point(3, 65);
this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
@@ -1046,33 +1031,6 @@
this.label21.TabIndex = 122;
this.label21.Text = "鐢熶骇璧勬簮2锛�";
//
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.grdCardList);
- this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
- this.groupBox1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
- this.groupBox1.Location = new System.Drawing.Point(755, 61);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.groupBox1.Size = new System.Drawing.Size(278, 525);
- this.groupBox1.TabIndex = 152;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "鏈珯宸ュ崟";
- //
- // grdCardList
- //
- this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdCardList.Location = new System.Drawing.Point(2, 21);
- this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.grdCardList.Name = "grdCardList";
- this.grdCardList.RowHeadersWidth = 51;
- this.grdCardList.RowTemplate.Height = 27;
- this.grdCardList.Size = new System.Drawing.Size(274, 502);
- this.grdCardList.TabIndex = 150;
- //
// panel2
//
this.panel2.Controls.Add(this.txtHBarCode_Mater);
@@ -1084,7 +1042,7 @@
this.panel2.Location = new System.Drawing.Point(3, 17);
this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1030, 44);
+ this.panel2.Size = new System.Drawing.Size(805, 44);
this.panel2.TabIndex = 151;
//
// txtHBarCode_Mater
@@ -1137,6 +1095,46 @@
this.label19.TabIndex = 112;
this.label19.Text = "娴佽浆鍗★細";
//
+ // grdSub
+ //
+ this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSub.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSub.Location = new System.Drawing.Point(0, 413);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.grdSub.Name = "grdSub";
+ this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 51;
+ this.grdSub.RowTemplate.Height = 27;
+ this.grdSub.Size = new System.Drawing.Size(811, 176);
+ this.grdSub.TabIndex = 149;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.grdCardList);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+ this.groupBox1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
+ this.groupBox1.Location = new System.Drawing.Point(811, 0);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.groupBox1.Size = new System.Drawing.Size(225, 589);
+ this.groupBox1.TabIndex = 152;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "鏈珯宸ュ崟";
+ //
+ // grdCardList
+ //
+ this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdCardList.Location = new System.Drawing.Point(2, 21);
+ this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.grdCardList.Name = "grdCardList";
+ this.grdCardList.RowHeadersWidth = 51;
+ this.grdCardList.RowTemplate.Height = 27;
+ this.grdCardList.Size = new System.Drawing.Size(221, 566);
+ this.grdCardList.TabIndex = 150;
+ //
// timer1
//
this.timer1.Enabled = true;
@@ -1160,6 +1158,28 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1036, 65);
this.panel1.TabIndex = 115;
+ //
+ // cmdHmrlk
+ //
+ this.cmdHmrlk.Location = new System.Drawing.Point(659, 33);
+ this.cmdHmrlk.Name = "cmdHmrlk";
+ this.cmdHmrlk.Size = new System.Drawing.Size(85, 28);
+ this.cmdHmrlk.TabIndex = 127;
+ this.cmdHmrlk.Text = "榛樿鍒楀";
+ this.cmdHmrlk.UseVisualStyleBackColor = true;
+ this.cmdHmrlk.Visible = false;
+ this.cmdHmrlk.Click += new System.EventHandler(this.cmdHmrlk_Click);
+ //
+ // cmdHbclk
+ //
+ this.cmdHbclk.Location = new System.Drawing.Point(659, 5);
+ this.cmdHbclk.Name = "cmdHbclk";
+ this.cmdHbclk.Size = new System.Drawing.Size(85, 28);
+ this.cmdHbclk.TabIndex = 126;
+ this.cmdHbclk.Text = "淇濆瓨鍒楀";
+ this.cmdHbclk.UseVisualStyleBackColor = true;
+ this.cmdHbclk.Visible = false;
+ this.cmdHbclk.Click += new System.EventHandler(this.cmdHbclk_Click);
//
// cmdDelLine
//
@@ -1235,26 +1255,6 @@
this.cmdAddNew.Visible = false;
this.cmdAddNew.Click += new System.EventHandler(this.cmdAddNew_Click);
//
- // cmdHbclk
- //
- this.cmdHbclk.Location = new System.Drawing.Point(659, 5);
- this.cmdHbclk.Name = "cmdHbclk";
- this.cmdHbclk.Size = new System.Drawing.Size(85, 28);
- this.cmdHbclk.TabIndex = 126;
- this.cmdHbclk.Text = "淇濆瓨鍒楀";
- this.cmdHbclk.UseVisualStyleBackColor = true;
- this.cmdHbclk.Click += new System.EventHandler(this.cmdHbclk_Click);
- //
- // cmdHmrlk
- //
- this.cmdHmrlk.Location = new System.Drawing.Point(659, 33);
- this.cmdHmrlk.Name = "cmdHmrlk";
- this.cmdHmrlk.Size = new System.Drawing.Size(85, 28);
- this.cmdHmrlk.TabIndex = 127;
- this.cmdHmrlk.Text = "榛樿鍒楀";
- this.cmdHmrlk.UseVisualStyleBackColor = true;
- this.cmdHmrlk.Click += new System.EventHandler(this.cmdHmrlk_Click);
- //
// MES_StationInBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1262,6 +1262,8 @@
this.BackColor = System.Drawing.Color.Gray;
this.ClientSize = new System.Drawing.Size(1036, 654);
this.Controls.Add(this.gbUp);
+ this.Controls.Add(this.grdSub);
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.KeyPreview = true;
@@ -1273,16 +1275,16 @@
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MES_StationInBill_KeyDown);
this.Resize += new System.EventHandler(this.Sc_StationInBill_Resize);
this.gbUp.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
- this.groupBox1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).EndInit();
this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
--
Gitblit v1.9.1