Quellcode durchsuchen

成型线管理增加部门

dk-xuwei vor 4 Jahren
Ursprung
Commit
55dc6e82c5

+ 243 - 159
DK.Client/PCModule/F_PC_0102_1_1.Designer.cs

@@ -85,6 +85,7 @@
             this.Remarks1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.rabBinding = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.rabAuto = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.pnlBinding = new System.Windows.Forms.Panel();
             this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
@@ -93,16 +94,17 @@
             this.txtGMouldCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.pnlAuto = new System.Windows.Forms.Panel();
-            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtStandardGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblstart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtBeginNum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
-            this.rabBinding = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.btnAdaptive = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
+            this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtWorkShop = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDetail)).BeginInit();
             this.c_GroupBox1.SuspendLayout();
             this.tabControl1.SuspendLayout();
@@ -121,9 +123,10 @@
             this.lblBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblBuildingNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblBuildingNo.IsMustInput = true;
-            this.lblBuildingNo.Location = new System.Drawing.Point(6, 24);
+            this.lblBuildingNo.Location = new System.Drawing.Point(8, 30);
+            this.lblBuildingNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblBuildingNo.Name = "lblBuildingNo";
-            this.lblBuildingNo.Size = new System.Drawing.Size(29, 12);
+            this.lblBuildingNo.Size = new System.Drawing.Size(37, 15);
             this.lblBuildingNo.TabIndex = 0;
             this.lblBuildingNo.Text = "楼号";
             // 
@@ -136,10 +139,11 @@
             this.txtBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBuildingNo.HasError = true;
             this.txtBuildingNo.IsMustInput = true;
-            this.txtBuildingNo.Location = new System.Drawing.Point(41, 20);
+            this.txtBuildingNo.Location = new System.Drawing.Point(55, 25);
+            this.txtBuildingNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtBuildingNo.MaxLength = 10;
             this.txtBuildingNo.Name = "txtBuildingNo";
-            this.txtBuildingNo.Size = new System.Drawing.Size(100, 21);
+            this.txtBuildingNo.Size = new System.Drawing.Size(132, 25);
             this.txtBuildingNo.TabIndex = 1;
             this.txtBuildingNo.TextChanged += new System.EventHandler(this.txtBuildingNo_TextChanged);
             // 
@@ -150,9 +154,10 @@
             this.lblFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblFloorNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblFloorNo.IsMustInput = true;
-            this.lblFloorNo.Location = new System.Drawing.Point(147, 24);
+            this.lblFloorNo.Location = new System.Drawing.Point(196, 30);
+            this.lblFloorNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblFloorNo.Name = "lblFloorNo";
-            this.lblFloorNo.Size = new System.Drawing.Size(29, 12);
+            this.lblFloorNo.Size = new System.Drawing.Size(37, 15);
             this.lblFloorNo.TabIndex = 2;
             this.lblFloorNo.Text = "楼层";
             // 
@@ -163,9 +168,10 @@
             this.lblGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineNo.IsMustInput = true;
-            this.lblGroutingLineNo.Location = new System.Drawing.Point(288, 24);
+            this.lblGroutingLineNo.Location = new System.Drawing.Point(384, 30);
+            this.lblGroutingLineNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGroutingLineNo.Name = "lblGroutingLineNo";
-            this.lblGroutingLineNo.Size = new System.Drawing.Size(29, 12);
+            this.lblGroutingLineNo.Size = new System.Drawing.Size(37, 15);
             this.lblGroutingLineNo.TabIndex = 4;
             this.lblGroutingLineNo.Text = "线号";
             // 
@@ -176,9 +182,10 @@
             this.lblGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineCode.IsMustInput = true;
-            this.lblGroutingLineCode.Location = new System.Drawing.Point(6, 51);
+            this.lblGroutingLineCode.Location = new System.Drawing.Point(8, 64);
+            this.lblGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGroutingLineCode.Name = "lblGroutingLineCode";
-            this.lblGroutingLineCode.Size = new System.Drawing.Size(29, 12);
+            this.lblGroutingLineCode.Size = new System.Drawing.Size(37, 15);
             this.lblGroutingLineCode.TabIndex = 6;
             this.lblGroutingLineCode.Text = "编码";
             // 
@@ -191,11 +198,12 @@
             this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGroutingLineCode.HasError = true;
             this.txtGroutingLineCode.IsMustInput = true;
-            this.txtGroutingLineCode.Location = new System.Drawing.Point(41, 47);
+            this.txtGroutingLineCode.Location = new System.Drawing.Point(55, 59);
+            this.txtGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGroutingLineCode.MaxLength = 30;
             this.txtGroutingLineCode.Name = "txtGroutingLineCode";
             this.txtGroutingLineCode.ReadOnly = true;
-            this.txtGroutingLineCode.Size = new System.Drawing.Size(100, 21);
+            this.txtGroutingLineCode.Size = new System.Drawing.Size(132, 25);
             this.txtGroutingLineCode.TabIndex = 7;
             this.txtGroutingLineCode.TextChanged += new System.EventHandler(this.txtGroutingLineCode_TextChanged);
             // 
@@ -206,9 +214,10 @@
             this.lblGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineName.IsMustInput = true;
-            this.lblGroutingLineName.Location = new System.Drawing.Point(147, 51);
+            this.lblGroutingLineName.Location = new System.Drawing.Point(196, 64);
+            this.lblGroutingLineName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGroutingLineName.Name = "lblGroutingLineName";
-            this.lblGroutingLineName.Size = new System.Drawing.Size(29, 12);
+            this.lblGroutingLineName.Size = new System.Drawing.Size(37, 15);
             this.lblGroutingLineName.TabIndex = 8;
             this.lblGroutingLineName.Text = "名称";
             // 
@@ -220,10 +229,11 @@
             this.txtGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGroutingLineName.HasError = true;
             this.txtGroutingLineName.IsMustInput = true;
-            this.txtGroutingLineName.Location = new System.Drawing.Point(182, 47);
+            this.txtGroutingLineName.Location = new System.Drawing.Point(243, 59);
+            this.txtGroutingLineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGroutingLineName.MaxLength = 50;
             this.txtGroutingLineName.Name = "txtGroutingLineName";
-            this.txtGroutingLineName.Size = new System.Drawing.Size(100, 21);
+            this.txtGroutingLineName.Size = new System.Drawing.Size(132, 25);
             this.txtGroutingLineName.TabIndex = 9;
             // 
             // lblRemarks
@@ -232,9 +242,10 @@
             this.lblRemarks.BackColor = System.Drawing.Color.Transparent;
             this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblRemarks.Location = new System.Drawing.Point(6, 77);
+            this.lblRemarks.Location = new System.Drawing.Point(8, 96);
+            this.lblRemarks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblRemarks.Name = "lblRemarks";
-            this.lblRemarks.Size = new System.Drawing.Size(29, 12);
+            this.lblRemarks.Size = new System.Drawing.Size(37, 15);
             this.lblRemarks.TabIndex = 12;
             this.lblRemarks.Text = "备注";
             // 
@@ -244,11 +255,12 @@
             this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
             this.txtRemarks.ErrorMessage = "";
             this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtRemarks.Location = new System.Drawing.Point(41, 74);
+            this.txtRemarks.Location = new System.Drawing.Point(55, 92);
+            this.txtRemarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtRemarks.MaxLength = 500;
             this.txtRemarks.Name = "txtRemarks";
             this.txtRemarks.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtRemarks.Size = new System.Drawing.Size(523, 21);
+            this.txtRemarks.Size = new System.Drawing.Size(696, 25);
             this.txtRemarks.TabIndex = 13;
             // 
             // lblCount
@@ -257,9 +269,10 @@
             this.lblCount.BackColor = System.Drawing.Color.Transparent;
             this.lblCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblCount.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblCount.Location = new System.Drawing.Point(283, 9);
+            this.lblCount.Location = new System.Drawing.Point(377, 11);
+            this.lblCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblCount.Name = "lblCount";
-            this.lblCount.Size = new System.Drawing.Size(29, 12);
+            this.lblCount.Size = new System.Drawing.Size(37, 15);
             this.lblCount.TabIndex = 4;
             this.lblCount.Text = "数量";
             // 
@@ -270,7 +283,8 @@
             this.txtCount.ErrorMessage = "";
             this.txtCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtCount.Location = new System.Drawing.Point(315, 5);
+            this.txtCount.Location = new System.Drawing.Point(420, 6);
+            this.txtCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtCount.MaxLength = 3;
             this.txtCount.MaxValue = new decimal(new int[] {
             999,
@@ -283,7 +297,7 @@
             0,
             0});
             this.txtCount.Name = "txtCount";
-            this.txtCount.Size = new System.Drawing.Size(36, 21);
+            this.txtCount.Size = new System.Drawing.Size(47, 25);
             this.txtCount.TabIndex = 5;
             this.txtCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtCount.TextValue = "";
@@ -294,9 +308,10 @@
             this.btnAddMould.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnAddMould.BackgroundImage")));
             this.btnAddMould.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAddMould.ForeColor = System.Drawing.Color.White;
-            this.btnAddMould.Location = new System.Drawing.Point(547, 0);
+            this.btnAddMould.Location = new System.Drawing.Point(729, 0);
+            this.btnAddMould.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAddMould.Name = "btnAddMould";
-            this.btnAddMould.Size = new System.Drawing.Size(85, 30);
+            this.btnAddMould.Size = new System.Drawing.Size(113, 38);
             this.btnAddMould.TabIndex = 10;
             this.btnAddMould.Text = "添加模具(&A)";
             this.btnAddMould.UseVisualStyleBackColor = false;
@@ -361,7 +376,8 @@
             this.dgvDetail.IsOpenMergeCellFlag = false;
             this.dgvDetail.IsSubTotalFlag = false;
             this.dgvDetail.IsTopDeep = false;
-            this.dgvDetail.Location = new System.Drawing.Point(3, 68);
+            this.dgvDetail.Location = new System.Drawing.Point(4, 85);
+            this.dgvDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvDetail.MergeColumnNames = null;
             this.dgvDetail.MergeDetailColumnNames = null;
             this.dgvDetail.MergeDetailOnlyColumn = null;
@@ -373,7 +389,7 @@
             dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvDetail.RowTemplate.Height = 21;
-            this.dgvDetail.Size = new System.Drawing.Size(706, 236);
+            this.dgvDetail.Size = new System.Drawing.Size(944, 298);
             this.dgvDetail.SortOrderColumnName = null;
             this.dgvDetail.TabIndex = 5;
             this.dgvDetail.Tag = true;
@@ -526,9 +542,10 @@
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(556, 457);
+            this.btnSave.Location = new System.Drawing.Point(741, 571);
+            this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(85, 30);
+            this.btnSave.Size = new System.Drawing.Size(113, 38);
             this.btnSave.TabIndex = 14;
             this.btnSave.Text = "保存(&S)";
             this.btnSave.UseVisualStyleBackColor = false;
@@ -542,9 +559,10 @@
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(647, 457);
+            this.btnCancel.Location = new System.Drawing.Point(863, 571);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(85, 30);
+            this.btnCancel.Size = new System.Drawing.Size(113, 38);
             this.btnCancel.TabIndex = 15;
             this.btnCancel.Text = "关闭";
             this.btnCancel.UseVisualStyleBackColor = false;
@@ -556,9 +574,10 @@
             this.btnDeleteSelected.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnDeleteSelected.BackgroundImage")));
             this.btnDeleteSelected.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnDeleteSelected.ForeColor = System.Drawing.Color.White;
-            this.btnDeleteSelected.Location = new System.Drawing.Point(512, 31);
+            this.btnDeleteSelected.Location = new System.Drawing.Point(683, 39);
+            this.btnDeleteSelected.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnDeleteSelected.Name = "btnDeleteSelected";
-            this.btnDeleteSelected.Size = new System.Drawing.Size(85, 30);
+            this.btnDeleteSelected.Size = new System.Drawing.Size(113, 38);
             this.btnDeleteSelected.TabIndex = 4;
             this.btnDeleteSelected.Text = "删除模具(&D)";
             this.btnDeleteSelected.UseVisualStyleBackColor = false;
@@ -571,7 +590,8 @@
             this.txtFloorNo.ErrorMessage = "";
             this.txtFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtFloorNo.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtFloorNo.Location = new System.Drawing.Point(182, 20);
+            this.txtFloorNo.Location = new System.Drawing.Point(243, 25);
+            this.txtFloorNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtFloorNo.MaxLength = 5;
             this.txtFloorNo.MaxValue = new decimal(new int[] {
             -1,
@@ -584,7 +604,7 @@
             -1,
             -2147483648});
             this.txtFloorNo.Name = "txtFloorNo";
-            this.txtFloorNo.Size = new System.Drawing.Size(100, 21);
+            this.txtFloorNo.Size = new System.Drawing.Size(132, 25);
             this.txtFloorNo.TabIndex = 3;
             this.txtFloorNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtFloorNo.TextValue = "";
@@ -597,6 +617,8 @@
             this.c_GroupBox1.BackColor = System.Drawing.Color.Transparent;
             this.c_GroupBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("c_GroupBox1.BackgroundImage")));
             this.c_GroupBox1.CanExpand = false;
+            this.c_GroupBox1.Controls.Add(this.c_Label5);
+            this.c_GroupBox1.Controls.Add(this.txtWorkShop);
             this.c_GroupBox1.Controls.Add(this.HighPressureFlag);
             this.c_GroupBox1.Controls.Add(this.scbUser1);
             this.c_GroupBox1.Controls.Add(this.lblGMouldType);
@@ -617,23 +639,25 @@
             this.c_GroupBox1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_GroupBox1.ForeColor = System.Drawing.SystemColors.ControlText;
             this.c_GroupBox1.IsMustInput = false;
-            this.c_GroupBox1.Location = new System.Drawing.Point(12, 12);
+            this.c_GroupBox1.Location = new System.Drawing.Point(16, 15);
+            this.c_GroupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.c_GroupBox1.Name = "c_GroupBox1";
             this.c_GroupBox1.OpeningMark = "";
             this.c_GroupBox1.OriginalHeight = -1;
-            this.c_GroupBox1.Size = new System.Drawing.Size(720, 100);
+            this.c_GroupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.c_GroupBox1.Size = new System.Drawing.Size(960, 125);
             this.c_GroupBox1.TabIndex = 0;
             this.c_GroupBox1.TabStop = false;
-            this.c_GroupBox1.Text = "成型线信息           ";
+            this.c_GroupBox1.Text = "成型线信息            ";
             // 
             // HighPressureFlag
             // 
             this.HighPressureFlag.AutoSize = true;
             this.HighPressureFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.HighPressureFlag.Location = new System.Drawing.Point(464, 21);
-            this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(2);
+            this.HighPressureFlag.Location = new System.Drawing.Point(763, 31);
+            this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.HighPressureFlag.Name = "HighPressureFlag";
-            this.HighPressureFlag.Size = new System.Drawing.Size(72, 16);
+            this.HighPressureFlag.Size = new System.Drawing.Size(89, 19);
             this.HighPressureFlag.TabIndex = 21;
             this.HighPressureFlag.Text = "高压注浆";
             this.HighPressureFlag.UseVisualStyleBackColor = true;
@@ -642,11 +666,12 @@
             // 
             this.scbUser1.CheckedData = null;
             this.scbUser1.IsWorker = false;
-            this.scbUser1.Location = new System.Drawing.Point(464, 47);
+            this.scbUser1.Location = new System.Drawing.Point(619, 59);
+            this.scbUser1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.scbUser1.Name = "scbUser1";
             this.scbUser1.ShowBorderColor = false;
             this.scbUser1.ShowMustInputAlert = false;
-            this.scbUser1.Size = new System.Drawing.Size(100, 21);
+            this.scbUser1.Size = new System.Drawing.Size(133, 26);
             this.scbUser1.TabIndex = 20;
             // 
             // lblGMouldType
@@ -656,20 +681,22 @@
             this.lblGMouldType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGMouldType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGMouldType.IsMustInput = true;
-            this.lblGMouldType.Location = new System.Drawing.Point(288, 51);
+            this.lblGMouldType.Location = new System.Drawing.Point(384, 64);
+            this.lblGMouldType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGMouldType.Name = "lblGMouldType";
-            this.lblGMouldType.Size = new System.Drawing.Size(29, 12);
+            this.lblGMouldType.Size = new System.Drawing.Size(37, 15);
             this.lblGMouldType.TabIndex = 19;
             this.lblGMouldType.Text = "类型";
             // 
             // scbGMouldType
             // 
             this.scbGMouldType.CheckedData = null;
-            this.scbGMouldType.Location = new System.Drawing.Point(323, 47);
+            this.scbGMouldType.Location = new System.Drawing.Point(431, 59);
+            this.scbGMouldType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.scbGMouldType.Name = "scbGMouldType";
             this.scbGMouldType.ShowBorderColor = false;
             this.scbGMouldType.ShowMustInputAlert = false;
-            this.scbGMouldType.Size = new System.Drawing.Size(100, 21);
+            this.scbGMouldType.Size = new System.Drawing.Size(133, 26);
             this.scbGMouldType.TabIndex = 18;
             // 
             // txtGroutingLineNo
@@ -679,10 +706,11 @@
             this.txtGroutingLineNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
             this.txtGroutingLineNo.ErrorMessage = "";
             this.txtGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroutingLineNo.Location = new System.Drawing.Point(323, 20);
+            this.txtGroutingLineNo.Location = new System.Drawing.Point(431, 25);
+            this.txtGroutingLineNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGroutingLineNo.MaxLength = 10;
             this.txtGroutingLineNo.Name = "txtGroutingLineNo";
-            this.txtGroutingLineNo.Size = new System.Drawing.Size(100, 21);
+            this.txtGroutingLineNo.Size = new System.Drawing.Size(132, 25);
             this.txtGroutingLineNo.TabIndex = 5;
             this.txtGroutingLineNo.TextValue = "";
             this.txtGroutingLineNo.TextChanged += new System.EventHandler(this.txtGroutingLineNo_TextChanged);
@@ -693,9 +721,10 @@
             this.c_Label3.BackColor = System.Drawing.Color.Transparent;
             this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label3.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label3.Location = new System.Drawing.Point(429, 51);
+            this.c_Label3.Location = new System.Drawing.Point(572, 64);
+            this.c_Label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label3.Name = "c_Label3";
-            this.c_Label3.Size = new System.Drawing.Size(29, 12);
+            this.c_Label3.Size = new System.Drawing.Size(37, 15);
             this.c_Label3.TabIndex = 12;
             this.c_Label3.Text = "班长";
             // 
@@ -706,20 +735,22 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Location = new System.Drawing.Point(12, 118);
+            this.tabControl1.Location = new System.Drawing.Point(16, 148);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(720, 333);
+            this.tabControl1.Size = new System.Drawing.Size(960, 416);
             this.tabControl1.TabIndex = 8;
             this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
             // 
             // tabPage1
             // 
             this.tabPage1.Controls.Add(this.dgvUser);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Location = new System.Drawing.Point(4, 25);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(712, 307);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage1.Size = new System.Drawing.Size(952, 387);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "成型工号";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -767,7 +798,8 @@
             this.dgvUser.IsOpenMergeCellFlag = false;
             this.dgvUser.IsSubTotalFlag = false;
             this.dgvUser.IsTopDeep = false;
-            this.dgvUser.Location = new System.Drawing.Point(3, 3);
+            this.dgvUser.Location = new System.Drawing.Point(4, 4);
+            this.dgvUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvUser.MergeColumnNames = null;
             this.dgvUser.MergeDetailColumnNames = null;
             this.dgvUser.MergeDetailOnlyColumn = null;
@@ -779,7 +811,7 @@
             dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvUser.RowTemplate.Height = 21;
-            this.dgvUser.Size = new System.Drawing.Size(706, 301);
+            this.dgvUser.Size = new System.Drawing.Size(944, 379);
             this.dgvUser.SortOrderColumnName = null;
             this.dgvUser.TabIndex = 55;
             this.dgvUser.Tag = true;
@@ -849,10 +881,11 @@
             this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
             this.tabPage2.Controls.Add(this.dgvDetail);
             this.tabPage2.Controls.Add(this.panel1);
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Location = new System.Drawing.Point(4, 25);
+            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(712, 307);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage2.Size = new System.Drawing.Size(952, 387);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "模具产品";
             // 
@@ -864,18 +897,35 @@
             this.panel1.Controls.Add(this.btnDeleteSelected);
             this.panel1.Controls.Add(this.pnlAuto);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(3, 3);
+            this.panel1.Location = new System.Drawing.Point(4, 4);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(706, 65);
+            this.panel1.Size = new System.Drawing.Size(944, 81);
             this.panel1.TabIndex = 0;
             // 
+            // rabBinding
+            // 
+            this.rabBinding.AutoSize = true;
+            this.rabBinding.Checked = true;
+            this.rabBinding.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rabBinding.Location = new System.Drawing.Point(9, 48);
+            this.rabBinding.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rabBinding.Name = "rabBinding";
+            this.rabBinding.Size = new System.Drawing.Size(88, 19);
+            this.rabBinding.TabIndex = 2;
+            this.rabBinding.TabStop = true;
+            this.rabBinding.Text = "条码模具";
+            this.rabBinding.UseVisualStyleBackColor = true;
+            this.rabBinding.CheckedChanged += new System.EventHandler(this.rabAuto_CheckedChanged);
+            // 
             // rabAuto
             // 
             this.rabAuto.AutoSize = true;
             this.rabAuto.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rabAuto.Location = new System.Drawing.Point(7, 7);
+            this.rabAuto.Location = new System.Drawing.Point(9, 9);
+            this.rabAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rabAuto.Name = "rabAuto";
-            this.rabAuto.Size = new System.Drawing.Size(71, 16);
+            this.rabAuto.Size = new System.Drawing.Size(88, 19);
             this.rabAuto.TabIndex = 0;
             this.rabAuto.Text = "自动模具";
             this.rabAuto.UseVisualStyleBackColor = true;
@@ -888,24 +938,27 @@
             this.pnlBinding.Controls.Add(this.txtBarcode);
             this.pnlBinding.Controls.Add(this.txtGMouldCode);
             this.pnlBinding.Controls.Add(this.c_Label1);
-            this.pnlBinding.Location = new System.Drawing.Point(75, 31);
+            this.pnlBinding.Location = new System.Drawing.Point(100, 39);
+            this.pnlBinding.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pnlBinding.Name = "pnlBinding";
-            this.pnlBinding.Size = new System.Drawing.Size(436, 30);
+            this.pnlBinding.Size = new System.Drawing.Size(581, 38);
             this.pnlBinding.TabIndex = 3;
             // 
             // lblLabel1
             // 
-            this.lblLabel1.Location = new System.Drawing.Point(121, 9);
+            this.lblLabel1.Location = new System.Drawing.Point(161, 11);
+            this.lblLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblLabel1.Name = "lblLabel1";
-            this.lblLabel1.Size = new System.Drawing.Size(53, 12);
+            this.lblLabel1.Size = new System.Drawing.Size(67, 15);
             this.lblLabel1.TabIndex = 2;
             this.lblLabel1.Text = "模具条码";
             // 
             // btnAddMouldBarcode
             // 
-            this.btnAddMouldBarcode.Location = new System.Drawing.Point(301, 0);
+            this.btnAddMouldBarcode.Location = new System.Drawing.Point(401, 0);
+            this.btnAddMouldBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAddMouldBarcode.Name = "btnAddMouldBarcode";
-            this.btnAddMouldBarcode.Size = new System.Drawing.Size(120, 30);
+            this.btnAddMouldBarcode.Size = new System.Drawing.Size(160, 38);
             this.btnAddMouldBarcode.TabIndex = 4;
             this.btnAddMouldBarcode.Text = "添加模具(条码)(&M)";
             this.btnAddMouldBarcode.UseVisualStyleBackColor = true;
@@ -913,10 +966,11 @@
             // 
             // txtBarcode
             // 
-            this.txtBarcode.Location = new System.Drawing.Point(178, 5);
+            this.txtBarcode.Location = new System.Drawing.Point(237, 6);
+            this.txtBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtBarcode.MaxLength = 50;
             this.txtBarcode.Name = "txtBarcode";
-            this.txtBarcode.Size = new System.Drawing.Size(120, 21);
+            this.txtBarcode.Size = new System.Drawing.Size(159, 25);
             this.txtBarcode.TabIndex = 3;
             this.txtBarcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarcode_KeyDown);
             // 
@@ -927,7 +981,8 @@
             this.txtGMouldCode.ErrorMessage = "";
             this.txtGMouldCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGMouldCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtGMouldCode.Location = new System.Drawing.Point(59, 5);
+            this.txtGMouldCode.Location = new System.Drawing.Point(79, 6);
+            this.txtGMouldCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGMouldCode.MaxLength = 3;
             this.txtGMouldCode.MaxValue = new decimal(new int[] {
             999,
@@ -940,7 +995,7 @@
             0,
             0});
             this.txtGMouldCode.Name = "txtGMouldCode";
-            this.txtGMouldCode.Size = new System.Drawing.Size(55, 21);
+            this.txtGMouldCode.Size = new System.Drawing.Size(72, 25);
             this.txtGMouldCode.TabIndex = 1;
             this.txtGMouldCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtGMouldCode.TextValue = "";
@@ -952,9 +1007,10 @@
             this.c_Label1.BackColor = System.Drawing.Color.Transparent;
             this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label1.Location = new System.Drawing.Point(15, 9);
+            this.c_Label1.Location = new System.Drawing.Point(20, 11);
+            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(41, 12);
+            this.c_Label1.Size = new System.Drawing.Size(52, 15);
             this.c_Label1.TabIndex = 0;
             this.c_Label1.Text = "模具号";
             // 
@@ -972,32 +1028,75 @@
             this.pnlAuto.Controls.Add(this.txtBeginNum);
             this.pnlAuto.Controls.Add(this.btnAddMould);
             this.pnlAuto.Enabled = false;
-            this.pnlAuto.Location = new System.Drawing.Point(75, 0);
+            this.pnlAuto.Location = new System.Drawing.Point(100, 0);
+            this.pnlAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pnlAuto.Name = "pnlAuto";
-            this.pnlAuto.Size = new System.Drawing.Size(631, 30);
+            this.pnlAuto.Size = new System.Drawing.Size(841, 38);
             this.pnlAuto.TabIndex = 1;
             // 
-            // scbGoods
-            // 
-            this.scbGoods.CheckedData = null;
-            this.scbGoods.DisplayMember = "GoodsCode";
-            this.scbGoods.Location = new System.Drawing.Point(59, 5);
-            this.scbGoods.Name = "scbGoods";
-            this.scbGoods.Size = new System.Drawing.Size(115, 21);
-            this.scbGoods.TabIndex = 1;
-            // 
             // lblGoods
             // 
             this.lblGoods.AutoSize = true;
             this.lblGoods.BackColor = System.Drawing.Color.Transparent;
             this.lblGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoods.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoods.Location = new System.Drawing.Point(3, 9);
+            this.lblGoods.Location = new System.Drawing.Point(4, 11);
+            this.lblGoods.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGoods.Name = "lblGoods";
-            this.lblGoods.Size = new System.Drawing.Size(53, 12);
+            this.lblGoods.Size = new System.Drawing.Size(67, 15);
             this.lblGoods.TabIndex = 0;
             this.lblGoods.Text = "产品编码";
             // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.DisplayMember = "GoodsCode";
+            this.scbGoods.Location = new System.Drawing.Point(79, 6);
+            this.scbGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(153, 26);
+            this.scbGoods.TabIndex = 1;
+            // 
+            // txtGroutingCount
+            // 
+            this.txtGroutingCount.AllowNegative = false;
+            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.ErrorMessage = "";
+            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGroutingCount.Location = new System.Drawing.Point(673, 6);
+            this.txtGroutingCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGroutingCount.MaxLength = 0;
+            this.txtGroutingCount.MaxValue = new decimal(new int[] {
+            999999,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.MinValue = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.Name = "txtGroutingCount";
+            this.txtGroutingCount.Size = new System.Drawing.Size(47, 25);
+            this.txtGroutingCount.TabIndex = 9;
+            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.txtGroutingCount.TextValue = "";
+            // 
+            // c_Label4
+            // 
+            this.c_Label4.AutoSize = true;
+            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label4.Location = new System.Drawing.Point(599, 11);
+            this.c_Label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(67, 15);
+            this.c_Label4.TabIndex = 8;
+            this.c_Label4.Text = "已注次数";
+            // 
             // txtStandardGroutingCount
             // 
             this.txtStandardGroutingCount.AllowNegative = false;
@@ -1006,7 +1105,8 @@
             this.txtStandardGroutingCount.ErrorMessage = "";
             this.txtStandardGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtStandardGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtStandardGroutingCount.Location = new System.Drawing.Point(410, 5);
+            this.txtStandardGroutingCount.Location = new System.Drawing.Point(547, 6);
+            this.txtStandardGroutingCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtStandardGroutingCount.MaxLength = 0;
             this.txtStandardGroutingCount.MaxValue = new decimal(new int[] {
             999999,
@@ -1019,7 +1119,7 @@
             0,
             0});
             this.txtStandardGroutingCount.Name = "txtStandardGroutingCount";
-            this.txtStandardGroutingCount.Size = new System.Drawing.Size(36, 21);
+            this.txtStandardGroutingCount.Size = new System.Drawing.Size(47, 25);
             this.txtStandardGroutingCount.TabIndex = 7;
             this.txtStandardGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtStandardGroutingCount.TextValue = "";
@@ -1030,9 +1130,10 @@
             this.c_Label2.BackColor = System.Drawing.Color.Transparent;
             this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label2.Location = new System.Drawing.Point(354, 9);
+            this.c_Label2.Location = new System.Drawing.Point(472, 11);
+            this.c_Label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label2.Name = "c_Label2";
-            this.c_Label2.Size = new System.Drawing.Size(53, 12);
+            this.c_Label2.Size = new System.Drawing.Size(67, 15);
             this.c_Label2.TabIndex = 6;
             this.c_Label2.Text = "标准次数";
             // 
@@ -1042,9 +1143,10 @@
             this.lblstart.BackColor = System.Drawing.Color.Transparent;
             this.lblstart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblstart.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblstart.Location = new System.Drawing.Point(176, 9);
+            this.lblstart.Location = new System.Drawing.Point(235, 11);
+            this.lblstart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblstart.Name = "lblstart";
-            this.lblstart.Size = new System.Drawing.Size(65, 12);
+            this.lblstart.Size = new System.Drawing.Size(82, 15);
             this.lblstart.TabIndex = 2;
             this.lblstart.Text = "起始模具号";
             // 
@@ -1055,7 +1157,8 @@
             this.txtBeginNum.ErrorMessage = "";
             this.txtBeginNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBeginNum.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtBeginNum.Location = new System.Drawing.Point(244, 5);
+            this.txtBeginNum.Location = new System.Drawing.Point(325, 6);
+            this.txtBeginNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtBeginNum.MaxLength = 3;
             this.txtBeginNum.MaxValue = new decimal(new int[] {
             999,
@@ -1068,25 +1171,11 @@
             0,
             0});
             this.txtBeginNum.Name = "txtBeginNum";
-            this.txtBeginNum.Size = new System.Drawing.Size(36, 21);
+            this.txtBeginNum.Size = new System.Drawing.Size(47, 25);
             this.txtBeginNum.TabIndex = 3;
             this.txtBeginNum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtBeginNum.TextValue = "";
             // 
-            // rabBinding
-            // 
-            this.rabBinding.AutoSize = true;
-            this.rabBinding.Checked = true;
-            this.rabBinding.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rabBinding.Location = new System.Drawing.Point(7, 38);
-            this.rabBinding.Name = "rabBinding";
-            this.rabBinding.Size = new System.Drawing.Size(71, 16);
-            this.rabBinding.TabIndex = 2;
-            this.rabBinding.TabStop = true;
-            this.rabBinding.Text = "条码模具";
-            this.rabBinding.UseVisualStyleBackColor = true;
-            this.rabBinding.CheckedChanged += new System.EventHandler(this.rabAuto_CheckedChanged);
-            // 
             // btnAdaptive
             // 
             this.btnAdaptive.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1094,58 +1183,51 @@
             this.btnAdaptive.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnAdaptive.BackgroundImage")));
             this.btnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAdaptive.ForeColor = System.Drawing.Color.White;
-            this.btnAdaptive.Location = new System.Drawing.Point(12, 457);
+            this.btnAdaptive.Location = new System.Drawing.Point(16, 571);
+            this.btnAdaptive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAdaptive.Name = "btnAdaptive";
-            this.btnAdaptive.Size = new System.Drawing.Size(85, 30);
+            this.btnAdaptive.Size = new System.Drawing.Size(113, 38);
             this.btnAdaptive.TabIndex = 10;
             this.btnAdaptive.Text = "自适应列宽";
             this.btnAdaptive.UseVisualStyleBackColor = false;
             this.btnAdaptive.Click += new System.EventHandler(this.btnAdaptive_Click);
             // 
-            // c_Label4
-            // 
-            this.c_Label4.AutoSize = true;
-            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
-            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label4.Location = new System.Drawing.Point(449, 9);
-            this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(53, 12);
-            this.c_Label4.TabIndex = 8;
-            this.c_Label4.Text = "已注次数";
-            // 
-            // txtGroutingCount
-            // 
-            this.txtGroutingCount.AllowNegative = false;
-            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.ErrorMessage = "";
-            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtGroutingCount.Location = new System.Drawing.Point(505, 5);
-            this.txtGroutingCount.MaxLength = 0;
-            this.txtGroutingCount.MaxValue = new decimal(new int[] {
-            999999,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.MinValue = new decimal(new int[] {
-            0,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.Name = "txtGroutingCount";
-            this.txtGroutingCount.Size = new System.Drawing.Size(36, 21);
-            this.txtGroutingCount.TabIndex = 9;
-            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.txtGroutingCount.TextValue = "";
+            // c_Label5
+            // 
+            this.c_Label5.AutoSize = true;
+            this.c_Label5.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label5.IsMustInput = true;
+            this.c_Label5.Location = new System.Drawing.Point(572, 30);
+            this.c_Label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label5.Name = "c_Label5";
+            this.c_Label5.Size = new System.Drawing.Size(37, 15);
+            this.c_Label5.TabIndex = 22;
+            this.c_Label5.Text = "部门";
+            // 
+            // txtWorkShop
+            // 
+            this.txtWorkShop.BackColor = System.Drawing.Color.Yellow;
+            this.txtWorkShop.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtWorkShop.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtWorkShop.ErrorMessage = "必须输入项目";
+            this.txtWorkShop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtWorkShop.HasError = true;
+            this.txtWorkShop.IsMustInput = true;
+            this.txtWorkShop.Location = new System.Drawing.Point(619, 25);
+            this.txtWorkShop.Margin = new System.Windows.Forms.Padding(4);
+            this.txtWorkShop.MaxLength = 10;
+            this.txtWorkShop.Name = "txtWorkShop";
+            this.txtWorkShop.Size = new System.Drawing.Size(132, 25);
+            this.txtWorkShop.TabIndex = 23;
             // 
             // F_PC_0102_1_1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(744, 512);
+            this.ClientSize = new System.Drawing.Size(992, 640);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.c_GroupBox1);
             this.Controls.Add(this.btnCancel);
@@ -1153,7 +1235,7 @@
             this.Controls.Add(this.btnSave);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsSaveFormSize = false;
-            this.Margin = new System.Windows.Forms.Padding(5);
+            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.Name = "F_PC_0102_1_1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "新建成型线";
@@ -1249,5 +1331,7 @@
         private Controls.SearchBox.ScbGoods scbGoods;
         private Basics.BaseControls.C_TXT_Digital txtGroutingCount;
         private Basics.BaseControls.C_Label c_Label4;
+        private Basics.BaseControls.C_Label c_Label5;
+        private Basics.BaseControls.C_TextBox txtWorkShop;
     }
 }

+ 21 - 1
DK.Client/PCModule/F_PC_0102_1_1.cs

@@ -341,6 +341,12 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 							this.scbGMouldType.Focus();
 							errorAddress = "成型线类别";
 							break;
+						//xuwei add 2021-09-21
+						case 9:
+							this.txtWorkShop.Focus();
+							errorAddress = "部门";
+							break;
+						//xuwei end
 						default:
 							break;
 					};
@@ -410,7 +416,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 }
                 //xuwei add 2019-11-13 高压注浆
                 ginfo.HIGHPRESSUREFLAG = HighPressureFlag.Checked ? 1 : 0;
-                //xuwei end
+				//xuwei end
+				//xuwei add 2021-09-12 部门
+				ginfo.WORKSHOP = Convert.ToInt32(txtWorkShop.Text);
+				//xuwei end
 				ginfo.MOULDTYPEID = this.scbGMouldType.SearchedPKMember;
 				ginfo.MouldStatus = Convert.ToInt32(Constant.GMouldStatus.Normal);
 				ginfo.VALUEFLAG = Convert.ToInt32(Constant.ValueFlag.Effective);
@@ -1049,6 +1058,9 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 			string txtGroutingLineCode = this.txtGroutingLineCode.Text.Trim();
 			string txtGroutingLineName = this.txtGroutingLineName.Text.Trim();
 			string txtRemarks = this.txtRemarks.Text.Trim();
+			//xuwei add 2021-09-12
+			string txtWorkShop = this.txtWorkShop.Text.Trim();
+			//xuwei end 
 			if (txtBuildingNo == string.Empty)
 			{
 				ErrorId = 1;
@@ -1084,6 +1096,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 				ErrorId = 8;
 				return ErrorId;
 			}
+			//xuwei add 2021-09-12
+			if(txtWorkShop == string.Empty)
+            {
+				ErrorId = 9;
+				return ErrorId;
+            }
+			//xuwei end
+
 			return ErrorId;
 		}
 

+ 268 - 189
DK.Client/PCModule/F_PC_0103_1.Designer.cs

@@ -29,17 +29,17 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PC_0103_1));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
             this.lblGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.lblGroutingLineName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -83,6 +83,9 @@
             this.lblGStatus = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.pnlAuto = new System.Windows.Forms.Panel();
+            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblstart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtBeginNum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
@@ -99,9 +102,8 @@
             this.rabBinding = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.rabAuto = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.btnAdaptive = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
-            this.txtGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
-            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtWorkShop = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.c_GroupBox1.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
@@ -120,9 +122,10 @@
             this.lblGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineCode.IsMustInput = true;
-            this.lblGroutingLineCode.Location = new System.Drawing.Point(6, 24);
+            this.lblGroutingLineCode.Location = new System.Drawing.Point(8, 30);
+            this.lblGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGroutingLineCode.Name = "lblGroutingLineCode";
-            this.lblGroutingLineCode.Size = new System.Drawing.Size(29, 12);
+            this.lblGroutingLineCode.Size = new System.Drawing.Size(37, 15);
             this.lblGroutingLineCode.TabIndex = 6;
             this.lblGroutingLineCode.Text = "编码";
             // 
@@ -136,11 +139,12 @@
             this.txtGroutingLineCode.HasError = true;
             this.txtGroutingLineCode.ImeMode = System.Windows.Forms.ImeMode.Off;
             this.txtGroutingLineCode.IsMustInput = true;
-            this.txtGroutingLineCode.Location = new System.Drawing.Point(41, 20);
+            this.txtGroutingLineCode.Location = new System.Drawing.Point(55, 25);
+            this.txtGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGroutingLineCode.MaxLength = 30;
             this.txtGroutingLineCode.Name = "txtGroutingLineCode";
             this.txtGroutingLineCode.ReadOnly = true;
-            this.txtGroutingLineCode.Size = new System.Drawing.Size(100, 21);
+            this.txtGroutingLineCode.Size = new System.Drawing.Size(132, 25);
             this.txtGroutingLineCode.TabIndex = 7;
             // 
             // lblGroutingLineName
@@ -150,9 +154,10 @@
             this.lblGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineName.IsMustInput = true;
-            this.lblGroutingLineName.Location = new System.Drawing.Point(147, 24);
+            this.lblGroutingLineName.Location = new System.Drawing.Point(196, 30);
+            this.lblGroutingLineName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGroutingLineName.Name = "lblGroutingLineName";
-            this.lblGroutingLineName.Size = new System.Drawing.Size(29, 12);
+            this.lblGroutingLineName.Size = new System.Drawing.Size(37, 15);
             this.lblGroutingLineName.TabIndex = 8;
             this.lblGroutingLineName.Text = "名称";
             // 
@@ -164,10 +169,11 @@
             this.txtGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGroutingLineName.HasError = true;
             this.txtGroutingLineName.IsMustInput = true;
-            this.txtGroutingLineName.Location = new System.Drawing.Point(182, 20);
+            this.txtGroutingLineName.Location = new System.Drawing.Point(243, 25);
+            this.txtGroutingLineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGroutingLineName.MaxLength = 50;
             this.txtGroutingLineName.Name = "txtGroutingLineName";
-            this.txtGroutingLineName.Size = new System.Drawing.Size(100, 21);
+            this.txtGroutingLineName.Size = new System.Drawing.Size(132, 25);
             this.txtGroutingLineName.TabIndex = 9;
             // 
             // lblRemarks
@@ -176,9 +182,10 @@
             this.lblRemarks.BackColor = System.Drawing.Color.Transparent;
             this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblRemarks.Location = new System.Drawing.Point(6, 51);
+            this.lblRemarks.Location = new System.Drawing.Point(8, 64);
+            this.lblRemarks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblRemarks.Name = "lblRemarks";
-            this.lblRemarks.Size = new System.Drawing.Size(29, 12);
+            this.lblRemarks.Size = new System.Drawing.Size(37, 15);
             this.lblRemarks.TabIndex = 11;
             this.lblRemarks.Text = "备注";
             // 
@@ -188,10 +195,11 @@
             this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
             this.txtRemarks.ErrorMessage = "";
             this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtRemarks.Location = new System.Drawing.Point(41, 47);
+            this.txtRemarks.Location = new System.Drawing.Point(55, 59);
+            this.txtRemarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtRemarks.MaxLength = 500;
             this.txtRemarks.Name = "txtRemarks";
-            this.txtRemarks.Size = new System.Drawing.Size(543, 21);
+            this.txtRemarks.Size = new System.Drawing.Size(536, 25);
             this.txtRemarks.TabIndex = 12;
             // 
             // btnAddMould
@@ -200,9 +208,10 @@
             this.btnAddMould.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnAddMould.BackgroundImage")));
             this.btnAddMould.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAddMould.ForeColor = System.Drawing.Color.White;
-            this.btnAddMould.Location = new System.Drawing.Point(546, 0);
+            this.btnAddMould.Location = new System.Drawing.Point(728, 0);
+            this.btnAddMould.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAddMould.Name = "btnAddMould";
-            this.btnAddMould.Size = new System.Drawing.Size(85, 30);
+            this.btnAddMould.Size = new System.Drawing.Size(113, 38);
             this.btnAddMould.TabIndex = 99;
             this.btnAddMould.Text = "添加模具(&A)";
             this.btnAddMould.UseVisualStyleBackColor = false;
@@ -215,9 +224,10 @@
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(559, 457);
+            this.btnSave.Location = new System.Drawing.Point(745, 571);
+            this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(85, 30);
+            this.btnSave.Size = new System.Drawing.Size(113, 38);
             this.btnSave.TabIndex = 15;
             this.btnSave.Text = "保存(&S)";
             this.btnSave.UseVisualStyleBackColor = false;
@@ -231,9 +241,10 @@
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(647, 457);
+            this.btnCancel.Location = new System.Drawing.Point(863, 571);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(85, 30);
+            this.btnCancel.Size = new System.Drawing.Size(113, 38);
             this.btnCancel.TabIndex = 16;
             this.btnCancel.Text = "关闭";
             this.btnCancel.UseVisualStyleBackColor = false;
@@ -245,9 +256,10 @@
             this.btnDeleteSelected.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnDeleteSelected.BackgroundImage")));
             this.btnDeleteSelected.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnDeleteSelected.ForeColor = System.Drawing.Color.White;
-            this.btnDeleteSelected.Location = new System.Drawing.Point(512, 31);
+            this.btnDeleteSelected.Location = new System.Drawing.Point(683, 39);
+            this.btnDeleteSelected.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnDeleteSelected.Name = "btnDeleteSelected";
-            this.btnDeleteSelected.Size = new System.Drawing.Size(85, 30);
+            this.btnDeleteSelected.Size = new System.Drawing.Size(113, 38);
             this.btnDeleteSelected.TabIndex = 6;
             this.btnDeleteSelected.Text = "删除新建(&D)";
             this.btnDeleteSelected.UseVisualStyleBackColor = false;
@@ -260,6 +272,8 @@
             this.c_GroupBox1.BackColor = System.Drawing.Color.Transparent;
             this.c_GroupBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("c_GroupBox1.BackgroundImage")));
             this.c_GroupBox1.CanExpand = false;
+            this.c_GroupBox1.Controls.Add(this.c_Label5);
+            this.c_GroupBox1.Controls.Add(this.txtWorkShop);
             this.c_GroupBox1.Controls.Add(this.HighPressureFlag);
             this.c_GroupBox1.Controls.Add(this.scbUser1);
             this.c_GroupBox1.Controls.Add(this.c_Label3);
@@ -275,23 +289,25 @@
             this.c_GroupBox1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_GroupBox1.ForeColor = System.Drawing.SystemColors.ControlText;
             this.c_GroupBox1.IsMustInput = false;
-            this.c_GroupBox1.Location = new System.Drawing.Point(12, 12);
+            this.c_GroupBox1.Location = new System.Drawing.Point(16, 15);
+            this.c_GroupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.c_GroupBox1.Name = "c_GroupBox1";
             this.c_GroupBox1.OpeningMark = "";
             this.c_GroupBox1.OriginalHeight = -1;
-            this.c_GroupBox1.Size = new System.Drawing.Size(720, 75);
+            this.c_GroupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.c_GroupBox1.Size = new System.Drawing.Size(960, 94);
             this.c_GroupBox1.TabIndex = 0;
             this.c_GroupBox1.TabStop = false;
-            this.c_GroupBox1.Text = "成型线信息    ";
+            this.c_GroupBox1.Text = "成型线信息     ";
             // 
             // HighPressureFlag
             // 
             this.HighPressureFlag.AutoSize = true;
             this.HighPressureFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.HighPressureFlag.Location = new System.Drawing.Point(640, 23);
-            this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.HighPressureFlag.Location = new System.Drawing.Point(853, 29);
+            this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.HighPressureFlag.Name = "HighPressureFlag";
-            this.HighPressureFlag.Size = new System.Drawing.Size(72, 16);
+            this.HighPressureFlag.Size = new System.Drawing.Size(89, 19);
             this.HighPressureFlag.TabIndex = 24;
             this.HighPressureFlag.Text = "高压注浆";
             this.HighPressureFlag.UseVisualStyleBackColor = true;
@@ -300,11 +316,12 @@
             // 
             this.scbUser1.CheckedData = null;
             this.scbUser1.IsWorker = false;
-            this.scbUser1.Location = new System.Drawing.Point(484, 20);
+            this.scbUser1.Location = new System.Drawing.Point(645, 25);
+            this.scbUser1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.scbUser1.Name = "scbUser1";
             this.scbUser1.ShowBorderColor = false;
             this.scbUser1.ShowMustInputAlert = false;
-            this.scbUser1.Size = new System.Drawing.Size(100, 21);
+            this.scbUser1.Size = new System.Drawing.Size(133, 26);
             this.scbUser1.TabIndex = 23;
             // 
             // c_Label3
@@ -313,9 +330,10 @@
             this.c_Label3.BackColor = System.Drawing.Color.Transparent;
             this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label3.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label3.Location = new System.Drawing.Point(449, 24);
+            this.c_Label3.Location = new System.Drawing.Point(599, 30);
+            this.c_Label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label3.Name = "c_Label3";
-            this.c_Label3.Size = new System.Drawing.Size(29, 12);
+            this.c_Label3.Size = new System.Drawing.Size(37, 15);
             this.c_Label3.TabIndex = 22;
             this.c_Label3.Text = "班长";
             // 
@@ -326,18 +344,20 @@
             this.lblGMouldType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGMouldType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGMouldType.IsMustInput = true;
-            this.lblGMouldType.Location = new System.Drawing.Point(288, 24);
+            this.lblGMouldType.Location = new System.Drawing.Point(384, 30);
+            this.lblGMouldType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGMouldType.Name = "lblGMouldType";
-            this.lblGMouldType.Size = new System.Drawing.Size(29, 12);
+            this.lblGMouldType.Size = new System.Drawing.Size(37, 15);
             this.lblGMouldType.TabIndex = 21;
             this.lblGMouldType.Text = "类型";
             // 
             // scbGMouldType
             // 
             this.scbGMouldType.CheckedData = null;
-            this.scbGMouldType.Location = new System.Drawing.Point(323, 20);
+            this.scbGMouldType.Location = new System.Drawing.Point(431, 25);
+            this.scbGMouldType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.scbGMouldType.Name = "scbGMouldType";
-            this.scbGMouldType.Size = new System.Drawing.Size(120, 21);
+            this.scbGMouldType.Size = new System.Drawing.Size(160, 26);
             this.scbGMouldType.TabIndex = 20;
             // 
             // chkEnable
@@ -346,9 +366,10 @@
             this.chkEnable.Checked = true;
             this.chkEnable.CheckState = System.Windows.Forms.CheckState.Checked;
             this.chkEnable.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkEnable.Location = new System.Drawing.Point(590, 22);
+            this.chkEnable.Location = new System.Drawing.Point(787, 28);
+            this.chkEnable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkEnable.Name = "chkEnable";
-            this.chkEnable.Size = new System.Drawing.Size(48, 16);
+            this.chkEnable.Size = new System.Drawing.Size(59, 19);
             this.chkEnable.TabIndex = 2;
             this.chkEnable.Text = "有效";
             this.chkEnable.UseVisualStyleBackColor = true;
@@ -360,20 +381,22 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Location = new System.Drawing.Point(12, 93);
+            this.tabControl1.Location = new System.Drawing.Point(16, 116);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(720, 358);
+            this.tabControl1.Size = new System.Drawing.Size(960, 448);
             this.tabControl1.TabIndex = 1;
             this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
             // 
             // tabPage1
             // 
             this.tabPage1.Controls.Add(this.dgvUser);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Location = new System.Drawing.Point(4, 25);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
-            this.tabPage1.Size = new System.Drawing.Size(712, 332);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage1.Size = new System.Drawing.Size(952, 419);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "成型工号";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -381,8 +404,8 @@
             // dgvUser
             // 
             this.dgvUser.AllowUserToModifyRows = true;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12;
             this.dgvUser.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvUser.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvUser.CellHeight = 23;
@@ -390,14 +413,14 @@
             this.dgvUser.ChildNodeColumnText = null;
             this.dgvUser.ColumnDeep = 1;
             this.dgvUser.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
             this.dgvUser.ColumnHeadersHeight = 29;
             this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -421,7 +444,8 @@
             this.dgvUser.IsOpenMergeCellFlag = false;
             this.dgvUser.IsSubTotalFlag = false;
             this.dgvUser.IsTopDeep = false;
-            this.dgvUser.Location = new System.Drawing.Point(3, 3);
+            this.dgvUser.Location = new System.Drawing.Point(4, 4);
+            this.dgvUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvUser.MergeColumnNames = null;
             this.dgvUser.MergeDetailColumnNames = null;
             this.dgvUser.MergeDetailOnlyColumn = null;
@@ -430,10 +454,10 @@
             this.dgvUser.RefreshAtHscroll = false;
             this.dgvUser.RowHeadersWidth = 50;
             this.dgvUser.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle14;
             this.dgvUser.RowTemplate.Height = 21;
-            this.dgvUser.Size = new System.Drawing.Size(706, 326);
+            this.dgvUser.Size = new System.Drawing.Size(944, 411);
             this.dgvUser.SortOrderColumnName = null;
             this.dgvUser.TabIndex = 0;
             this.dgvUser.Tag = true;
@@ -504,10 +528,11 @@
             this.tabPage2.Controls.Add(this.dgvDetail);
             this.tabPage2.Controls.Add(this.lblGStatus);
             this.tabPage2.Controls.Add(this.panel1);
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Location = new System.Drawing.Point(4, 25);
+            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
-            this.tabPage2.Size = new System.Drawing.Size(712, 332);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage2.Size = new System.Drawing.Size(952, 419);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "模具产品";
             // 
@@ -516,8 +541,8 @@
             this.dgvDetail.AllowUserToAddRows = false;
             this.dgvDetail.AllowUserToDeleteRows = false;
             this.dgvDetail.AllowUserToModifyRows = true;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15;
             this.dgvDetail.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvDetail.CellBackColorReadOnly = System.Drawing.SystemColors.HighlightText;
             this.dgvDetail.CellHeight = 23;
@@ -525,14 +550,14 @@
             this.dgvDetail.ChildNodeColumnText = null;
             this.dgvDetail.ColumnDeep = 1;
             this.dgvDetail.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
             this.dgvDetail.ColumnHeadersHeight = 29;
             this.dgvDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -550,14 +575,14 @@
             this.NewFlag});
             this.dgvDetail.ColumnTreeView = null;
             this.dgvDetail.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle21;
             this.dgvDetail.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvDetail.DynamicColumnName = "";
             this.dgvDetail.EnableHeadersVisualStyles = false;
@@ -570,7 +595,8 @@
             this.dgvDetail.IsOpenMergeCellFlag = false;
             this.dgvDetail.IsSubTotalFlag = false;
             this.dgvDetail.IsTopDeep = false;
-            this.dgvDetail.Location = new System.Drawing.Point(3, 80);
+            this.dgvDetail.Location = new System.Drawing.Point(4, 100);
+            this.dgvDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvDetail.MergeColumnNames = null;
             this.dgvDetail.MergeDetailColumnNames = null;
             this.dgvDetail.MergeDetailOnlyColumn = null;
@@ -579,10 +605,10 @@
             this.dgvDetail.RefreshAtHscroll = false;
             this.dgvDetail.RowHeadersWidth = 50;
             this.dgvDetail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle22;
             this.dgvDetail.RowTemplate.Height = 21;
-            this.dgvDetail.Size = new System.Drawing.Size(706, 249);
+            this.dgvDetail.Size = new System.Drawing.Size(944, 315);
             this.dgvDetail.SortOrderColumnName = null;
             this.dgvDetail.TabIndex = 7;
             this.dgvDetail.Tag = true;
@@ -594,8 +620,8 @@
             // GroutingMouldCode
             // 
             this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.White;
-            this.GroutingMouldCode.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle17.BackColor = System.Drawing.Color.White;
+            this.GroutingMouldCode.DefaultCellStyle = dataGridViewCellStyle17;
             this.GroutingMouldCode.HeaderText = "模具编号";
             this.GroutingMouldCode.MinimumWidth = 6;
             this.GroutingMouldCode.Name = "GroutingMouldCode";
@@ -674,8 +700,8 @@
             // GROUTINGCOUNT
             // 
             this.GROUTINGCOUNT.DataPropertyName = "GROUTINGCOUNT";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle18;
             this.GROUTINGCOUNT.HeaderText = "注浆次数";
             this.GROUTINGCOUNT.MaxValue = new decimal(new int[] {
             999999,
@@ -698,8 +724,8 @@
             // 
             this.StandardGroutingCount.AllowNegative = false;
             this.StandardGroutingCount.DataPropertyName = "StandardGroutingCount";
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle19;
             this.StandardGroutingCount.HeaderText = "标准注浆次数";
             this.StandardGroutingCount.MaxValue = new decimal(new int[] {
             999999,
@@ -720,8 +746,8 @@
             // Remarks
             // 
             this.Remarks.DataPropertyName = "Remarks";
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(233)))), ((int)(((byte)(217)))));
-            this.Remarks.DefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(233)))), ((int)(((byte)(217)))));
+            this.Remarks.DefaultCellStyle = dataGridViewCellStyle20;
             this.Remarks.HeaderText = "备注";
             this.Remarks.MinimumWidth = 6;
             this.Remarks.Name = "Remarks";
@@ -742,9 +768,10 @@
             this.lblGStatus.AutoSize = true;
             this.lblGStatus.Dock = System.Windows.Forms.DockStyle.Top;
             this.lblGStatus.ForeColor = System.Drawing.Color.Red;
-            this.lblGStatus.Location = new System.Drawing.Point(3, 68);
+            this.lblGStatus.Location = new System.Drawing.Point(4, 85);
+            this.lblGStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGStatus.Name = "lblGStatus";
-            this.lblGStatus.Size = new System.Drawing.Size(233, 12);
+            this.lblGStatus.Size = new System.Drawing.Size(292, 15);
             this.lblGStatus.TabIndex = 10;
             this.lblGStatus.Text = "此成型线状态为【整线变产】不能添加模具";
             this.lblGStatus.Visible = false;
@@ -757,9 +784,10 @@
             this.panel1.Controls.Add(this.rabAuto);
             this.panel1.Controls.Add(this.btnDeleteSelected);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(3, 3);
+            this.panel1.Location = new System.Drawing.Point(4, 4);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(706, 65);
+            this.panel1.Size = new System.Drawing.Size(944, 81);
             this.panel1.TabIndex = 0;
             // 
             // pnlAuto
@@ -776,20 +804,72 @@
             this.pnlAuto.Controls.Add(this.c_Label1);
             this.pnlAuto.Controls.Add(this.txtCount);
             this.pnlAuto.Enabled = false;
-            this.pnlAuto.Location = new System.Drawing.Point(75, 0);
+            this.pnlAuto.Location = new System.Drawing.Point(100, 0);
+            this.pnlAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pnlAuto.Name = "pnlAuto";
-            this.pnlAuto.Size = new System.Drawing.Size(631, 30);
+            this.pnlAuto.Size = new System.Drawing.Size(841, 38);
             this.pnlAuto.TabIndex = 13;
             // 
+            // txtGroutingCount
+            // 
+            this.txtGroutingCount.AllowNegative = false;
+            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingCount.ErrorMessage = "";
+            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGroutingCount.Location = new System.Drawing.Point(673, 5);
+            this.txtGroutingCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGroutingCount.MaxLength = 0;
+            this.txtGroutingCount.MaxValue = new decimal(new int[] {
+            999999,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.MinValue = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+            this.txtGroutingCount.Name = "txtGroutingCount";
+            this.txtGroutingCount.Size = new System.Drawing.Size(47, 25);
+            this.txtGroutingCount.TabIndex = 9;
+            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.txtGroutingCount.TextValue = "";
+            // 
+            // c_Label4
+            // 
+            this.c_Label4.AutoSize = true;
+            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label4.Location = new System.Drawing.Point(599, 10);
+            this.c_Label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(67, 15);
+            this.c_Label4.TabIndex = 8;
+            this.c_Label4.Text = "已注次数";
+            // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.DisplayMember = "GoodsCode";
+            this.scbGoods.Location = new System.Drawing.Point(79, 6);
+            this.scbGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(153, 26);
+            this.scbGoods.TabIndex = 1;
+            // 
             // lblGoods
             // 
             this.lblGoods.AutoSize = true;
             this.lblGoods.BackColor = System.Drawing.Color.Transparent;
             this.lblGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoods.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoods.Location = new System.Drawing.Point(3, 9);
+            this.lblGoods.Location = new System.Drawing.Point(4, 11);
+            this.lblGoods.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGoods.Name = "lblGoods";
-            this.lblGoods.Size = new System.Drawing.Size(53, 12);
+            this.lblGoods.Size = new System.Drawing.Size(67, 15);
             this.lblGoods.TabIndex = 0;
             this.lblGoods.Text = "产品编码";
             // 
@@ -799,9 +879,10 @@
             this.lblstart.BackColor = System.Drawing.Color.Transparent;
             this.lblstart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblstart.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblstart.Location = new System.Drawing.Point(176, 9);
+            this.lblstart.Location = new System.Drawing.Point(235, 11);
+            this.lblstart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblstart.Name = "lblstart";
-            this.lblstart.Size = new System.Drawing.Size(65, 12);
+            this.lblstart.Size = new System.Drawing.Size(82, 15);
             this.lblstart.TabIndex = 2;
             this.lblstart.Text = "起始模具号";
             // 
@@ -812,7 +893,8 @@
             this.txtBeginNum.ErrorMessage = "";
             this.txtBeginNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBeginNum.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtBeginNum.Location = new System.Drawing.Point(244, 5);
+            this.txtBeginNum.Location = new System.Drawing.Point(325, 6);
+            this.txtBeginNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtBeginNum.MaxLength = 3;
             this.txtBeginNum.MaxValue = new decimal(new int[] {
             999,
@@ -825,7 +907,7 @@
             0,
             0});
             this.txtBeginNum.Name = "txtBeginNum";
-            this.txtBeginNum.Size = new System.Drawing.Size(36, 21);
+            this.txtBeginNum.Size = new System.Drawing.Size(47, 25);
             this.txtBeginNum.TabIndex = 3;
             this.txtBeginNum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtBeginNum.TextValue = "";
@@ -836,9 +918,10 @@
             this.lblCount.BackColor = System.Drawing.Color.Transparent;
             this.lblCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblCount.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblCount.Location = new System.Drawing.Point(283, 9);
+            this.lblCount.Location = new System.Drawing.Point(377, 11);
+            this.lblCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblCount.Name = "lblCount";
-            this.lblCount.Size = new System.Drawing.Size(29, 12);
+            this.lblCount.Size = new System.Drawing.Size(37, 15);
             this.lblCount.TabIndex = 4;
             this.lblCount.Text = "数量";
             // 
@@ -850,7 +933,8 @@
             this.txtStandardGroutingCount.ErrorMessage = "";
             this.txtStandardGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtStandardGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtStandardGroutingCount.Location = new System.Drawing.Point(410, 5);
+            this.txtStandardGroutingCount.Location = new System.Drawing.Point(547, 6);
+            this.txtStandardGroutingCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtStandardGroutingCount.MaxLength = 0;
             this.txtStandardGroutingCount.MaxValue = new decimal(new int[] {
             999999,
@@ -863,7 +947,7 @@
             0,
             0});
             this.txtStandardGroutingCount.Name = "txtStandardGroutingCount";
-            this.txtStandardGroutingCount.Size = new System.Drawing.Size(36, 21);
+            this.txtStandardGroutingCount.Size = new System.Drawing.Size(47, 25);
             this.txtStandardGroutingCount.TabIndex = 7;
             this.txtStandardGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtStandardGroutingCount.TextValue = "";
@@ -874,9 +958,10 @@
             this.c_Label1.BackColor = System.Drawing.Color.Transparent;
             this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label1.Location = new System.Drawing.Point(354, 9);
+            this.c_Label1.Location = new System.Drawing.Point(472, 11);
+            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(53, 12);
+            this.c_Label1.Size = new System.Drawing.Size(67, 15);
             this.c_Label1.TabIndex = 6;
             this.c_Label1.Text = "标准次数";
             // 
@@ -887,7 +972,8 @@
             this.txtCount.ErrorMessage = "";
             this.txtCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtCount.Location = new System.Drawing.Point(315, 5);
+            this.txtCount.Location = new System.Drawing.Point(420, 6);
+            this.txtCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtCount.MaxLength = 3;
             this.txtCount.MaxValue = new decimal(new int[] {
             999,
@@ -900,7 +986,7 @@
             0,
             0});
             this.txtCount.Name = "txtCount";
-            this.txtCount.Size = new System.Drawing.Size(36, 21);
+            this.txtCount.Size = new System.Drawing.Size(47, 25);
             this.txtCount.TabIndex = 5;
             this.txtCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtCount.TextValue = "";
@@ -912,24 +998,27 @@
             this.pnlBinding.Controls.Add(this.txtBarcode);
             this.pnlBinding.Controls.Add(this.txtGMouldCode);
             this.pnlBinding.Controls.Add(this.c_Label2);
-            this.pnlBinding.Location = new System.Drawing.Point(75, 31);
+            this.pnlBinding.Location = new System.Drawing.Point(100, 39);
+            this.pnlBinding.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pnlBinding.Name = "pnlBinding";
-            this.pnlBinding.Size = new System.Drawing.Size(427, 30);
+            this.pnlBinding.Size = new System.Drawing.Size(569, 38);
             this.pnlBinding.TabIndex = 12;
             // 
             // lblLabel1
             // 
-            this.lblLabel1.Location = new System.Drawing.Point(119, 9);
+            this.lblLabel1.Location = new System.Drawing.Point(159, 11);
+            this.lblLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblLabel1.Name = "lblLabel1";
-            this.lblLabel1.Size = new System.Drawing.Size(53, 12);
+            this.lblLabel1.Size = new System.Drawing.Size(67, 15);
             this.lblLabel1.TabIndex = 2;
             this.lblLabel1.Text = "模具条码";
             // 
             // btnAddMouldBarcode
             // 
-            this.btnAddMouldBarcode.Location = new System.Drawing.Point(301, 0);
+            this.btnAddMouldBarcode.Location = new System.Drawing.Point(401, 0);
+            this.btnAddMouldBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAddMouldBarcode.Name = "btnAddMouldBarcode";
-            this.btnAddMouldBarcode.Size = new System.Drawing.Size(120, 30);
+            this.btnAddMouldBarcode.Size = new System.Drawing.Size(160, 38);
             this.btnAddMouldBarcode.TabIndex = 99;
             this.btnAddMouldBarcode.Text = "添加模具(条码)(&M)";
             this.btnAddMouldBarcode.UseVisualStyleBackColor = true;
@@ -937,10 +1026,11 @@
             // 
             // txtBarcode
             // 
-            this.txtBarcode.Location = new System.Drawing.Point(175, 5);
+            this.txtBarcode.Location = new System.Drawing.Point(233, 6);
+            this.txtBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtBarcode.MaxLength = 50;
             this.txtBarcode.Name = "txtBarcode";
-            this.txtBarcode.Size = new System.Drawing.Size(120, 21);
+            this.txtBarcode.Size = new System.Drawing.Size(159, 25);
             this.txtBarcode.TabIndex = 3;
             this.txtBarcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarcode_KeyDown);
             // 
@@ -951,7 +1041,8 @@
             this.txtGMouldCode.ErrorMessage = "";
             this.txtGMouldCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGMouldCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtGMouldCode.Location = new System.Drawing.Point(59, 5);
+            this.txtGMouldCode.Location = new System.Drawing.Point(79, 6);
+            this.txtGMouldCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGMouldCode.MaxLength = 3;
             this.txtGMouldCode.MaxValue = new decimal(new int[] {
             999,
@@ -964,7 +1055,7 @@
             0,
             0});
             this.txtGMouldCode.Name = "txtGMouldCode";
-            this.txtGMouldCode.Size = new System.Drawing.Size(55, 21);
+            this.txtGMouldCode.Size = new System.Drawing.Size(72, 25);
             this.txtGMouldCode.TabIndex = 1;
             this.txtGMouldCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtGMouldCode.TextValue = "";
@@ -976,9 +1067,10 @@
             this.c_Label2.BackColor = System.Drawing.Color.Transparent;
             this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label2.Location = new System.Drawing.Point(15, 9);
+            this.c_Label2.Location = new System.Drawing.Point(20, 11);
+            this.c_Label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label2.Name = "c_Label2";
-            this.c_Label2.Size = new System.Drawing.Size(41, 12);
+            this.c_Label2.Size = new System.Drawing.Size(52, 15);
             this.c_Label2.TabIndex = 0;
             this.c_Label2.Text = "模具号";
             // 
@@ -987,9 +1079,10 @@
             this.rabBinding.AutoSize = true;
             this.rabBinding.Checked = true;
             this.rabBinding.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rabBinding.Location = new System.Drawing.Point(7, 38);
+            this.rabBinding.Location = new System.Drawing.Point(9, 48);
+            this.rabBinding.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rabBinding.Name = "rabBinding";
-            this.rabBinding.Size = new System.Drawing.Size(71, 16);
+            this.rabBinding.Size = new System.Drawing.Size(88, 19);
             this.rabBinding.TabIndex = 11;
             this.rabBinding.TabStop = true;
             this.rabBinding.Text = "条码模具";
@@ -1000,9 +1093,10 @@
             // 
             this.rabAuto.AutoSize = true;
             this.rabAuto.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rabAuto.Location = new System.Drawing.Point(7, 7);
+            this.rabAuto.Location = new System.Drawing.Point(9, 9);
+            this.rabAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rabAuto.Name = "rabAuto";
-            this.rabAuto.Size = new System.Drawing.Size(71, 16);
+            this.rabAuto.Size = new System.Drawing.Size(88, 19);
             this.rabAuto.TabIndex = 10;
             this.rabAuto.Text = "自动模具";
             this.rabAuto.UseVisualStyleBackColor = true;
@@ -1015,67 +1109,50 @@
             this.btnAdaptive.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnAdaptive.BackgroundImage")));
             this.btnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAdaptive.ForeColor = System.Drawing.Color.White;
-            this.btnAdaptive.Location = new System.Drawing.Point(12, 457);
+            this.btnAdaptive.Location = new System.Drawing.Point(16, 571);
+            this.btnAdaptive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAdaptive.Name = "btnAdaptive";
-            this.btnAdaptive.Size = new System.Drawing.Size(85, 30);
+            this.btnAdaptive.Size = new System.Drawing.Size(113, 38);
             this.btnAdaptive.TabIndex = 17;
             this.btnAdaptive.Text = "自适应列宽";
             this.btnAdaptive.UseVisualStyleBackColor = false;
             this.btnAdaptive.Click += new System.EventHandler(this.btnAdaptive_Click);
             // 
-            // scbGoods
-            // 
-            this.scbGoods.CheckedData = null;
-            this.scbGoods.DisplayMember = "GoodsCode";
-            this.scbGoods.Location = new System.Drawing.Point(59, 5);
-            this.scbGoods.Name = "scbGoods";
-            this.scbGoods.Size = new System.Drawing.Size(115, 21);
-            this.scbGoods.TabIndex = 1;
-            // 
-            // txtGroutingCount
-            // 
-            this.txtGroutingCount.AllowNegative = false;
-            this.txtGroutingCount.BackColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtGroutingCount.ErrorMessage = "";
-            this.txtGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtGroutingCount.Location = new System.Drawing.Point(505, 4);
-            this.txtGroutingCount.MaxLength = 0;
-            this.txtGroutingCount.MaxValue = new decimal(new int[] {
-            999999,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.MinValue = new decimal(new int[] {
-            0,
-            0,
-            0,
-            0});
-            this.txtGroutingCount.Name = "txtGroutingCount";
-            this.txtGroutingCount.Size = new System.Drawing.Size(36, 21);
-            this.txtGroutingCount.TabIndex = 9;
-            this.txtGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.txtGroutingCount.TextValue = "";
-            // 
-            // c_Label4
-            // 
-            this.c_Label4.AutoSize = true;
-            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
-            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label4.Location = new System.Drawing.Point(449, 8);
-            this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(53, 12);
-            this.c_Label4.TabIndex = 8;
-            this.c_Label4.Text = "已注次数";
+            // c_Label5
+            // 
+            this.c_Label5.AutoSize = true;
+            this.c_Label5.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.c_Label5.IsMustInput = true;
+            this.c_Label5.Location = new System.Drawing.Point(598, 64);
+            this.c_Label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label5.Name = "c_Label5";
+            this.c_Label5.Size = new System.Drawing.Size(37, 15);
+            this.c_Label5.TabIndex = 25;
+            this.c_Label5.Text = "部门";
+            // 
+            // txtWorkShop
+            // 
+            this.txtWorkShop.BackColor = System.Drawing.Color.Yellow;
+            this.txtWorkShop.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtWorkShop.ErrorMessage = "必须输入项目";
+            this.txtWorkShop.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtWorkShop.HasError = true;
+            this.txtWorkShop.IsMustInput = true;
+            this.txtWorkShop.Location = new System.Drawing.Point(645, 59);
+            this.txtWorkShop.Margin = new System.Windows.Forms.Padding(4);
+            this.txtWorkShop.MaxLength = 50;
+            this.txtWorkShop.Name = "txtWorkShop";
+            this.txtWorkShop.Size = new System.Drawing.Size(99, 25);
+            this.txtWorkShop.TabIndex = 26;
             // 
             // F_PC_0103_1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(744, 512);
+            this.ClientSize = new System.Drawing.Size(992, 640);
             this.Controls.Add(this.btnAdaptive);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.c_GroupBox1);
@@ -1083,7 +1160,7 @@
             this.Controls.Add(this.btnSave);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsSaveFormSize = false;
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.Name = "F_PC_0103_1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "编辑成型线(上模)";
@@ -1176,5 +1253,7 @@
         private Controls.SearchBox.ScbGoods scbGoods;
         private Basics.BaseControls.C_TXT_Digital txtGroutingCount;
         private Basics.BaseControls.C_Label c_Label4;
+        private Basics.BaseControls.C_Label c_Label5;
+        private Basics.BaseControls.C_TextBox txtWorkShop;
     }
 }

+ 22 - 6
DK.Client/PCModule/F_PC_0103_1.cs

@@ -232,10 +232,13 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 
                 //xuwei add 2019-11-13 高压注浆
                 this._lineEntity.HIGHPRESSUREFLAG = HighPressureFlag.Checked ? 1 : 0;
-                //xuwei end 
+				//xuwei end 
+				//xuwei add 2021-09-12 部门
+				this._lineEntity.WORKSHOP = Convert.ToInt32(txtWorkShop.Text);
+				//xuwei end 
 
-                //this._lineEntity.USERID = this.dkUser.UserID;
-                this._lineEntity.MOULDTYPEID = this.scbGMouldType.SearchedPKMember;
+				//this._lineEntity.USERID = this.dkUser.UserID;
+				this._lineEntity.MOULDTYPEID = this.scbGMouldType.SearchedPKMember;
                 if (this.scbUser1.SearchedItem != null)
                 {
                     this._lineEntity.MonitorID = Convert.ToInt32(this.scbUser1.SearchedValue);
@@ -1130,7 +1133,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 
                     //xuwei add 2019-11-13 高压注浆
                     this.HighPressureFlag.Checked = this._lineEntity.HIGHPRESSUREFLAG == 1 ? true : false;
-                    //xuwei end
+					//xuwei end
+					//xuwei add 2021-09-12 部门
+					this.txtWorkShop.Text = this._lineEntity.WORKSHOP.ToString();
+					//xuwei end
 
                     if (this._lineEntity.ValueFlag2 == "1")
 					{
@@ -1187,8 +1193,18 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 {
                     this._lineEntity.HIGHPRESSUREFLAG = Convert.ToInt32(drGrouting["HIGHPRESSUREFLAG"]);
                 }
-                //xuwei end
-                this._lineEntity.MOULDQUANTITY = Convert.ToDecimal(drGrouting["MOULDQUANTITY"]);
+				//xuwei end
+				//xuwei add 2021-09-12
+				if (drGrouting["WORKSHOP"] == DBNull.Value)
+				{
+					this._lineEntity.WORKSHOP = 0;
+				}
+				else
+				{
+					this._lineEntity.WORKSHOP = Convert.ToInt32(drGrouting["WORKSHOP"]);
+				}
+				//xuwei end
+				this._lineEntity.MOULDQUANTITY = Convert.ToDecimal(drGrouting["MOULDQUANTITY"]);
 				this._lineEntity.MOULDTYPEID = Convert.ToInt32(drGrouting["GMOULDTYPEID"]);
                 if (drGrouting["USERID"] != null && drGrouting["USERID"] != DBNull.Value)
                 {

Datei-Diff unterdrückt, da er zu groß ist
+ 198 - 362
DK.Client/PCModule/F_PC_0104_1.Designer.cs


+ 6 - 3
DK.Client/PCModule/F_PC_0104_1.resx

@@ -124,7 +124,7 @@
   <data name="tsbtnDisable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -139,7 +139,7 @@
   <data name="tsbtnStart.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -154,7 +154,7 @@
   <data name="tsbtnManager.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -166,6 +166,9 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="workshop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ValueFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 17 - 0
DK.Service/PCModuleLogic/PCModuleLogicDALPartial.cs

@@ -6328,6 +6328,9 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 //xuwei add 2019-11-13 高压注浆
                 sbSql.Append("HighPressureFlag,");
                 //xuwei end 
+                //xuwei add 2021-09-12 部门
+                sbSql.Append("WorkShop,");
+                //xuwei end 
                 sbSql.Append("GroutingLineName,MouldQuantity,GMouldTypeID,UserID,MonitorID,");
                 sbSql.Append("BeginUsedDate,GMouldStatus,Remarks,AccountID,");
                 sbSql.Append("CreateUserID,UpdateUserID,UserCount)");
@@ -6335,6 +6338,9 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 //xuwei add 2019-11-13 高压注浆
                 sbSql.Append(":HighPressureFlag,");
                 //xuwei end 
+                //xuwei add 2021-09-12 部门
+                sbSql.Append(":WorkShop,");
+                //xuwei end 
                 sbSql.Append(":GroutingLineName,:MouldQuantity,:GMouldTypeID,:UserID,:MonitorID,");
                 sbSql.Append(":BeginUsedDate,:GMouldStatus,:Remarks,:AccountID,");
                 sbSql.Append(":CreateUserID,:UpdateUserID,:UserCount)");
@@ -6353,6 +6359,10 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         new OracleParameter(":HighPressureFlag",OracleDbType.Char,
                             groutingLineEntity.HIGHPRESSUREFLAG,ParameterDirection.Input),
                         //xuwei end
+                        //xuwei add 2021-09-12 部门
+                        new OracleParameter(":WorkShop",OracleDbType.Int32,
+                            groutingLineEntity.WORKSHOP,ParameterDirection.Input),
+                        //xuwei end
                         new OracleParameter(":GroutingLineName",OracleDbType.NVarchar2,
                             groutingLineEntity.GROUTINGLINENAME,ParameterDirection.Input),
                         new OracleParameter(":MouldQuantity",OracleDbType.Decimal,
@@ -6645,6 +6655,9 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 //xuwei add 2019-11-13 高压注浆
                 sbSql.Append("HighPressureFlag=:HighPressureFlag,");
                 //xuwei end
+                //xuwei add 2021-09-12 部门
+                sbSql.Append("WorkShop=:WorkShop,");
+                //xuwei end
                 sbSql.Append("Remarks=:Remarks,");
                 sbSql.Append("AccountID=:AccountID,");
                 sbSql.Append("ValueFlag=:ValueFlag2,");
@@ -6725,6 +6738,10 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         new OracleParameter(":HighPressureFlag",OracleDbType.Char,
                             groutingLineEntity.HIGHPRESSUREFLAG,ParameterDirection.Input),
                         //xuwei end 
+                        //xuwei add 2021-09-12 部门
+                        new OracleParameter(":WorkShop",OracleDbType.Int32,
+                            groutingLineEntity.WORKSHOP,ParameterDirection.Input),
+                        //xuwei end 
                         new OracleParameter(":UpdateTime",OracleDbType.Date,
                             DateTime.Now,ParameterDirection.Input),
                         new OracleParameter(":UpdateUserID",OracleDbType.Int32,

+ 15 - 0
WCF.Service/WCF.DataModels/PCModule/GroutingLineEntity.cs

@@ -23,6 +23,9 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         //xuwei add 2019-11-13 高压注浆
         private int? _highpressureflag;
         //xuwei end
+        //xuwei add 2021-09-12 车间号
+        private int? _workshop;
+        //xuwei end
         private int? _mouldstatus;
         private int? _userid;
         private string _usercode;
@@ -146,6 +149,18 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         }
         //xuwei end
 
+        //xuwei add 2021-09-12 车间号
+        /// <summary>
+        /// 车间号 (1,2,3)
+        /// </summary>
+        [DataMember]
+        public int? WORKSHOP
+        {
+            set { _workshop = value; }
+            get { return _workshop; }
+        }
+        //xuwei end
+
         /// <summary>
         /// 工号ID (关联工号表)
         /// </summary>

+ 2 - 2
WCF.Service/WCF.Hosting/Config.ini

@@ -27,8 +27,8 @@ ServerName=Debug
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6
-AndroidVersion=1.2.20.1130
-ClientVersion=1.2.20.1130
+AndroidVersion=1.2.21.0824
+ClientVersion=1.2.21.0824
 
 [PathSetting]
 ;客户端升级,下载文件路径

+ 2 - 2
WCF.Service/WCF.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.20.1130")]
-[assembly: AssemblyFileVersion("1.2.20.1130")]
+[assembly: AssemblyVersion("1.2.21.0824")]
+[assembly: AssemblyFileVersion("1.2.21.0824")]

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.