From 83d48bd7e1c1eccb9905cceae02e7b5b61c94156 Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期一, 16 八月 2021 19:26:33 +0800
Subject: [PATCH] 流转卡拆分增加字段；工艺路线导入增加进度条
---
BLL/公用模块/Gy_DataInTmp.designer.cs | 110 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 41 deletions(-)
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
index ddfb83e..d757a54 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
@@ -64,6 +64,7 @@
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.grdPrint = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
+ this.pb1 = new System.Windows.Forms.ProgressBar();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -104,7 +105,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(1095, 47);
+ this.Tool.Size = new System.Drawing.Size(1460, 59);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -113,7 +114,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
//
// mrlk
//
@@ -123,7 +124,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 44);
+ this.mrlk.Size = new System.Drawing.Size(73, 56);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -133,7 +134,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
//
// bclk
//
@@ -143,7 +144,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 44);
+ this.bclk.Size = new System.Drawing.Size(73, 56);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -153,7 +154,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
//
// dc
//
@@ -172,7 +173,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 59);
//
// set
//
@@ -219,7 +220,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
//
// sx
//
@@ -238,7 +239,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 59);
//
// Out
//
@@ -257,7 +258,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
//
// tc
//
@@ -276,13 +277,14 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
//
// pPic
//
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.pb1);
this.pPic.Controls.Add(this.txtHDataInTmp);
this.pPic.Controls.Add(this.cmdHDataInTmp);
this.pPic.Controls.Add(this.label5);
@@ -290,16 +292,18 @@
this.pPic.Controls.Add(this.lbljl);
this.pPic.Controls.Add(this.lbldj);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 47);
+ this.pPic.Location = new System.Drawing.Point(0, 59);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1095, 45);
+ this.pPic.Size = new System.Drawing.Size(1460, 56);
this.pPic.TabIndex = 18;
//
// txtHDataInTmp
//
- this.txtHDataInTmp.Location = new System.Drawing.Point(382, 14);
+ this.txtHDataInTmp.Location = new System.Drawing.Point(509, 18);
+ this.txtHDataInTmp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHDataInTmp.Name = "txtHDataInTmp";
- this.txtHDataInTmp.Size = new System.Drawing.Size(178, 21);
+ this.txtHDataInTmp.Size = new System.Drawing.Size(236, 25);
this.txtHDataInTmp.TabIndex = 103;
this.txtHDataInTmp.Visible = false;
//
@@ -307,9 +311,10 @@
//
this.cmdHDataInTmp.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDataInTmp.Image")));
this.cmdHDataInTmp.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHDataInTmp.Location = new System.Drawing.Point(560, 14);
+ this.cmdHDataInTmp.Location = new System.Drawing.Point(747, 18);
+ this.cmdHDataInTmp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHDataInTmp.Name = "cmdHDataInTmp";
- this.cmdHDataInTmp.Size = new System.Drawing.Size(22, 22);
+ this.cmdHDataInTmp.Size = new System.Drawing.Size(29, 28);
this.cmdHDataInTmp.TabIndex = 102;
this.cmdHDataInTmp.UseVisualStyleBackColor = true;
this.cmdHDataInTmp.Visible = false;
@@ -318,9 +323,10 @@
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(314, 15);
+ this.label5.Location = new System.Drawing.Point(419, 19);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.Size = new System.Drawing.Size(82, 15);
this.label5.TabIndex = 35;
this.label5.Text = "瀵煎叆妯℃澘锛�";
this.label5.Visible = false;
@@ -331,55 +337,61 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(12, 16);
+ this.lblCaption.Location = new System.Drawing.Point(16, 20);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(89, 19);
+ this.lblCaption.Size = new System.Drawing.Size(110, 24);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鏁版嵁瀵煎叆";
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(943, 32);
+ this.lbljl.Location = new System.Drawing.Point(1257, 40);
+ this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(11, 12);
+ this.lbljl.Size = new System.Drawing.Size(15, 15);
this.lbljl.TabIndex = 99;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(943, 14);
+ this.lbldj.Location = new System.Drawing.Point(1257, 18);
+ this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 12);
+ this.lbldj.Size = new System.Drawing.Size(0, 15);
this.lbldj.TabIndex = 98;
//
// cmdHPath
//
this.cmdHPath.Image = ((System.Drawing.Image)(resources.GetObject("cmdHPath.Image")));
this.cmdHPath.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHPath.Location = new System.Drawing.Point(797, 6);
+ this.cmdHPath.Location = new System.Drawing.Point(1063, 8);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmdHPath.Name = "cmdHPath";
- this.cmdHPath.Size = new System.Drawing.Size(22, 22);
+ this.cmdHPath.Size = new System.Drawing.Size(29, 28);
this.cmdHPath.TabIndex = 34;
this.cmdHPath.UseVisualStyleBackColor = true;
this.cmdHPath.Click += new System.EventHandler(this.cmdHPath_Click);
//
// txtHPath
//
- this.txtHPath.Location = new System.Drawing.Point(460, 7);
+ this.txtHPath.Location = new System.Drawing.Point(613, 9);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHPath.Multiline = true;
this.txtHPath.Name = "txtHPath";
- this.txtHPath.Size = new System.Drawing.Size(336, 40);
+ this.txtHPath.Size = new System.Drawing.Size(447, 49);
this.txtHPath.TabIndex = 33;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(390, 7);
+ this.label4.Location = new System.Drawing.Point(520, 9);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(65, 12);
+ this.label4.Size = new System.Drawing.Size(82, 15);
this.label4.TabIndex = 32;
this.label4.Text = "鏂囦欢璺緞锛�";
//
@@ -390,11 +402,13 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 142);
+ this.grdMain.Location = new System.Drawing.Point(0, 177);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1095, 470);
+ this.grdMain.Size = new System.Drawing.Size(1460, 588);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -406,12 +420,14 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 612);
+ this.grdSum.Location = new System.Drawing.Point(0, 765);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1095, 19);
+ this.grdSum.Size = new System.Drawing.Size(1460, 24);
this.grdSum.TabIndex = 48;
//
// timer1
@@ -421,10 +437,12 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(535, 303);
+ this.grdPrint.Location = new System.Drawing.Point(713, 379);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 49;
this.grdPrint.Visible = false;
//
@@ -435,22 +453,31 @@
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.cmdHPath);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 92);
+ this.panel1.Location = new System.Drawing.Point(0, 115);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1095, 50);
+ this.panel1.Size = new System.Drawing.Size(1460, 62);
this.panel1.TabIndex = 50;
+ //
+ // pb1
+ //
+ this.pb1.Location = new System.Drawing.Point(920, 18);
+ this.pb1.Name = "pb1";
+ this.pb1.Size = new System.Drawing.Size(391, 23);
+ this.pb1.TabIndex = 104;
//
// Gy_DataInTmp
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1095, 631);
+ this.ClientSize = new System.Drawing.Size(1460, 789);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.panel1);
this.Controls.Add(this.grdPrint);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_DataInTmp";
this.Text = "鏁版嵁瀵煎叆";
this.Load += new System.EventHandler(this.Gy_DataInTmp_Load);
@@ -503,5 +530,6 @@
public System.Windows.Forms.Button cmdHPath;
public System.Windows.Forms.TextBox txtHPath;
public System.Windows.Forms.Label label4;
+ private System.Windows.Forms.ProgressBar pb1;
}
}
\ No newline at end of file
--
Gitblit v1.9.1