From c5cfa2df88c6d2e5b31e87e1d5a8fe49d585f0bb Mon Sep 17 00:00:00 2001
From: jinghz@oceic.com <jinghz@oceic.com>
Date: 星期四, 24 八月 2023 10:44:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimes.Designer.cs | 184 +++++++++++++++++++++++++--------------------
1 files changed, 101 insertions(+), 83 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
index 2300b7d..2e4b36b 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimes.Designer.cs"
@@ -1,5 +1,5 @@
锘�
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
partial class Gy_StdWorkTimes
{
@@ -34,12 +34,16 @@
this.P1 = new System.Windows.Forms.Panel();
this.lblCaption = new System.Windows.Forms.Label();
this.gbUp = new System.Windows.Forms.GroupBox();
- this.txtHStdWorkTimes = new System.Windows.Forms.TextBox();
+ this.txtHStdPric = new System.Windows.Forms.TextBox();
+ this.txtHStdPiece = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
this.txtHLowerlimit = new System.Windows.Forms.TextBox();
this.txtHUpperlimit = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
+ this.txtHStdWorkTimes = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
this.rbHSelectCusNone = new System.Windows.Forms.RadioButton();
this.rbHSelectMater = new System.Windows.Forms.RadioButton();
this.label7 = new System.Windows.Forms.Label();
@@ -55,6 +59,8 @@
this.txtHMaterID = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.textBox1 = new System.Windows.Forms.TextBox();
this.txtHProcID = new System.Windows.Forms.TextBox();
this.panel3 = new System.Windows.Forms.Panel();
this.timer1 = new System.Windows.Forms.Timer(this.components);
@@ -75,11 +81,8 @@
this.DelRow = new System.Windows.Forms.ToolStripButton();
this.bc = new System.Windows.Forms.ToolStripButton();
this.AddRow = new System.Windows.Forms.ToolStripButton();
- this.sc = new System.Windows.Forms.ToolStripButton();
this.xg = new System.Windows.Forms.ToolStripButton();
- this.xz = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
- this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.Tool = new System.Windows.Forms.ToolStrip();
this.tc = new System.Windows.Forms.ToolStripButton();
@@ -106,7 +109,7 @@
this.P1.Location = new System.Drawing.Point(52, 62);
this.P1.Margin = new System.Windows.Forms.Padding(4);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1109, 229);
+ this.P1.Size = new System.Drawing.Size(1109, 293);
this.P1.TabIndex = 53;
//
// lblCaption
@@ -122,12 +125,16 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
- this.gbUp.Controls.Add(this.txtHStdWorkTimes);
+ this.gbUp.Controls.Add(this.txtHStdPric);
+ this.gbUp.Controls.Add(this.txtHStdPiece);
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.label12);
this.gbUp.Controls.Add(this.txtHLowerlimit);
this.gbUp.Controls.Add(this.txtHUpperlimit);
- this.gbUp.Controls.Add(this.label12);
+ this.gbUp.Controls.Add(this.txtHStdWorkTimes);
this.gbUp.Controls.Add(this.label10);
this.gbUp.Controls.Add(this.label9);
+ this.gbUp.Controls.Add(this.label1);
this.gbUp.Controls.Add(this.rbHSelectCusNone);
this.gbUp.Controls.Add(this.rbHSelectMater);
this.gbUp.Controls.Add(this.label7);
@@ -143,62 +150,96 @@
this.gbUp.Controls.Add(this.txtHMaterID);
this.gbUp.Controls.Add(this.label5);
this.gbUp.Controls.Add(this.label4);
+ this.gbUp.Controls.Add(this.textBox2);
+ this.gbUp.Controls.Add(this.textBox1);
this.gbUp.Controls.Add(this.txtHProcID);
this.gbUp.Location = new System.Drawing.Point(19, 49);
this.gbUp.Margin = new System.Windows.Forms.Padding(4);
this.gbUp.Name = "gbUp";
this.gbUp.Padding = new System.Windows.Forms.Padding(4);
- this.gbUp.Size = new System.Drawing.Size(1064, 176);
+ this.gbUp.Size = new System.Drawing.Size(1064, 236);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
//
- // txtHStdWorkTimes
+ // txtHStdPric
//
- this.txtHStdWorkTimes.Location = new System.Drawing.Point(128, 130);
- this.txtHStdWorkTimes.Name = "txtHStdWorkTimes";
- this.txtHStdWorkTimes.Size = new System.Drawing.Size(221, 25);
- this.txtHStdWorkTimes.TabIndex = 49;
+ this.txtHStdPric.Location = new System.Drawing.Point(484, 163);
+ this.txtHStdPric.Name = "txtHStdPric";
+ this.txtHStdPric.Size = new System.Drawing.Size(221, 25);
+ this.txtHStdPric.TabIndex = 48;
+ //
+ // txtHStdPiece
+ //
+ this.txtHStdPiece.Location = new System.Drawing.Point(129, 163);
+ this.txtHStdPiece.Name = "txtHStdPiece";
+ this.txtHStdPiece.Size = new System.Drawing.Size(221, 25);
+ this.txtHStdPiece.TabIndex = 48;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(407, 168);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(67, 15);
+ this.label14.TabIndex = 47;
+ this.label14.Text = "鏍囧噯璁′环";
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Location = new System.Drawing.Point(36, 168);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(67, 15);
+ this.label12.TabIndex = 47;
+ this.label12.Text = "鏍囧噯璁′欢";
//
// txtHLowerlimit
//
this.txtHLowerlimit.Location = new System.Drawing.Point(805, 130);
this.txtHLowerlimit.Name = "txtHLowerlimit";
this.txtHLowerlimit.Size = new System.Drawing.Size(221, 25);
- this.txtHLowerlimit.TabIndex = 49;
+ this.txtHLowerlimit.TabIndex = 46;
//
// txtHUpperlimit
//
this.txtHUpperlimit.Location = new System.Drawing.Point(484, 130);
this.txtHUpperlimit.Name = "txtHUpperlimit";
this.txtHUpperlimit.Size = new System.Drawing.Size(221, 25);
- this.txtHUpperlimit.TabIndex = 49;
+ this.txtHUpperlimit.TabIndex = 46;
//
- // label12
+ // txtHStdWorkTimes
//
- this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(36, 135);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(67, 15);
- this.label12.TabIndex = 48;
- this.label12.Text = "鏍囧噯宸ユ椂";
+ this.txtHStdWorkTimes.Location = new System.Drawing.Point(129, 130);
+ this.txtHStdWorkTimes.Name = "txtHStdWorkTimes";
+ this.txtHStdWorkTimes.Size = new System.Drawing.Size(221, 25);
+ this.txtHStdWorkTimes.TabIndex = 46;
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(727, 135);
+ this.label10.Location = new System.Drawing.Point(407, 135);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(67, 15);
- this.label10.TabIndex = 48;
- this.label10.Text = "涓嬮檺姣斾緥";
+ this.label10.TabIndex = 45;
+ this.label10.Text = "涓婇檺姣斾緥";
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(407, 135);
+ this.label9.Location = new System.Drawing.Point(727, 135);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(67, 15);
- this.label9.TabIndex = 48;
- this.label9.Text = "涓婇檺姣斾緥";
+ this.label9.TabIndex = 45;
+ this.label9.Text = "涓嬮檺姣斾緥";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(36, 135);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.TabIndex = 45;
+ this.label1.Text = "鏍囧噯宸ユ椂";
//
// rbHSelectCusNone
//
@@ -334,7 +375,7 @@
//
// txtHMaterID
//
- this.txtHMaterID.Location = new System.Drawing.Point(128, 95);
+ this.txtHMaterID.Location = new System.Drawing.Point(129, 95);
this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
this.txtHMaterID.Name = "txtHMaterID";
this.txtHMaterID.Size = new System.Drawing.Size(221, 25);
@@ -362,6 +403,24 @@
this.label4.Size = new System.Drawing.Size(67, 15);
this.label4.TabIndex = 23;
this.label4.Text = "宸ュ簭浠ｇ爜";
+ //
+ // textBox2
+ //
+ this.textBox2.Location = new System.Drawing.Point(730, 26);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(220, 25);
+ this.textBox2.TabIndex = 24;
+ this.textBox2.Tag = "0";
+ //
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(485, 26);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(220, 25);
+ this.textBox1.TabIndex = 24;
+ this.textBox1.Tag = "0";
//
// txtHProcID
//
@@ -597,20 +656,6 @@
this.AddRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.AddRow.Click += new System.EventHandler(this.AddRow_Click);
//
- // sc
- //
- this.sc.AutoSize = false;
- this.sc.Image = ((System.Drawing.Image)(resources.GetObject("sc.Image")));
- this.sc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sc.Name = "sc";
- this.sc.Size = new System.Drawing.Size(35, 47);
- this.sc.Text = "鍒犻櫎";
- this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sc.Click += new System.EventHandler(this.sc_Click);
- //
// xg
//
this.xg.AutoSize = false;
@@ -625,37 +670,10 @@
this.xg.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.xg.Click += new System.EventHandler(this.xg_Click);
//
- // xz
- //
- this.xz.AutoSize = false;
- this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
- this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.xz.ImageTransparentColor = System.Drawing.Color.White;
- this.xz.Name = "xz";
- this.xz.Size = new System.Drawing.Size(35, 47);
- this.xz.Text = "鏂板";
- this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.xz.Click += new System.EventHandler(this.xz_Click);
- //
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
- //
- // yl
- //
- this.yl.AutoSize = false;
- this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
- this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.yl.Name = "yl";
- this.yl.Size = new System.Drawing.Size(35, 47);
- this.yl.Text = "棰勮";
- this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
//
// toolStripSeparator8
//
@@ -669,11 +687,8 @@
this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.yl,
this.toolStripSeparator2,
- this.xz,
this.xg,
- this.sc,
this.toolStripSeparator8,
this.AddRow,
this.DelRow,
@@ -757,13 +772,13 @@
this.grdMain1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain1.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.grdMain1.Location = new System.Drawing.Point(52, 291);
+ this.grdMain1.Location = new System.Drawing.Point(52, 355);
this.grdMain1.Margin = new System.Windows.Forms.Padding(4);
this.grdMain1.Name = "grdMain1";
this.grdMain1.ReadOnly = true;
this.grdMain1.RowHeadersWidth = 30;
this.grdMain1.RowTemplate.Height = 23;
- this.grdMain1.Size = new System.Drawing.Size(1109, 497);
+ this.grdMain1.Size = new System.Drawing.Size(1109, 433);
this.grdMain1.TabIndex = 59;
this.grdMain1.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
@@ -846,11 +861,8 @@
private System.Windows.Forms.ToolStripButton DelRow;
private System.Windows.Forms.ToolStripButton bc;
private System.Windows.Forms.ToolStripButton AddRow;
- private System.Windows.Forms.ToolStripButton sc;
private System.Windows.Forms.ToolStripButton xg;
- private System.Windows.Forms.ToolStripButton xz;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
- private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStrip Tool;
private System.Windows.Forms.ToolStripButton tc;
@@ -858,12 +870,18 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
- private System.Windows.Forms.TextBox txtHStdWorkTimes;
+ private System.Windows.Forms.DataGridView grdMain1;
private System.Windows.Forms.TextBox txtHLowerlimit;
private System.Windows.Forms.TextBox txtHUpperlimit;
- private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.TextBox txtHStdWorkTimes;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label9;
- private System.Windows.Forms.DataGridView grdMain1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.TextBox txtHStdPric;
+ private System.Windows.Forms.TextBox txtHStdPiece;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.Label label12;
}
}
\ No newline at end of file
--
Gitblit v1.9.1