工序上增加是否变更商标釉料属性

DK.Client/PCModule/F_PC_0203.cs

@@ -232,6 +232,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 procedureEntity.PrintType = Convert.ToInt32(dr1[0]["printType"].ToString());
                 //xuwei add 2019-12-11
                 procedureEntity.SemiGoodsLevel = dr1[0]["SemiGoodsLevel"].ToString();
+                //xuwei add 2020-01-02
+                procedureEntity.IsGlazeChange = Convert.ToInt32(dr1[0]["IsGlazeChange"].ToString());
 
                 procedureEntity.OrganizationID = Convert.ToInt32(dr1[0]["OrganizationID"].ToString());
                 procedureEntity.Remarks = dr1[0]["Remarks"].ToString();

DK.Client/PCModule/F_PC_0205.cs

@@ -894,6 +894,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             //xuwei add 2019-12-12
             if(dr1[0]["SemiGoodsLevel"]!=null)
                 procedureEntity.SemiGoodsLevel = dr1[0]["SemiGoodsLevel"].ToString();
+            //xuwei add 2020-01-02
+            procedureEntity.IsGlazeChange = Convert.ToInt32(dr1[0]["isGlazeChange"].ToString());
 
             procedureEntity.OrganizationID = Convert.ToInt32(dr1[0]["OrganizationID"].ToString());
             procedureEntity.Remarks = dr1[0]["Remarks"].ToString();

DK.Client/PCModule/F_PC_0207.Designer.cs

@@ -62,5 +62,8 @@
         private WinForm.Controls.ChkCheckBox rbtnSpecialSemireProcess;
         private Basics.BaseControls.C_ComboBox ddlPrintType;
         private Basics.BaseControls.C_Label c_Label6;
+        private System.Windows.Forms.GroupBox groupBox8;
+        public System.Windows.Forms.RadioButton rbtnGlazeNoChange;
+        public System.Windows.Forms.RadioButton rbtnGlazeChange;
     }
 }

DK.Client/PCModule/F_PC_0207.cs

@@ -258,6 +258,9 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.groupBox8 = new System.Windows.Forms.GroupBox();
+            this.rbtnGlazeNoChange = new System.Windows.Forms.RadioButton();
+            this.rbtnGlazeChange = new System.Windows.Forms.RadioButton();
             this.ddlPrintType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
             this.c_Label6 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
@@ -292,6 +295,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.tabPage4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvKiln)).BeginInit();
             this.groupBox1.SuspendLayout();
+            this.groupBox8.SuspendLayout();
             this.groupBox7.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox6.SuspendLayout();
@@ -305,10 +309,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtProcedureName.HasError = true;
             this.txtProcedureName.IsMustInput = true;
-            this.txtProcedureName.Location = new System.Drawing.Point(238, 20);
+            this.txtProcedureName.Location = new System.Drawing.Point(317, 25);
+            this.txtProcedureName.Margin = new System.Windows.Forms.Padding(4);
             this.txtProcedureName.MaxLength = 50;
             this.txtProcedureName.Name = "txtProcedureName";
-            this.txtProcedureName.Size = new System.Drawing.Size(108, 21);
+            this.txtProcedureName.Size = new System.Drawing.Size(143, 25);
             this.txtProcedureName.TabIndex = 3;
             // 
             // txtProcedureCode
@@ -319,11 +324,12 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtProcedureCode.HasError = true;
             this.txtProcedureCode.IsMustInput = true;
-            this.txtProcedureCode.Location = new System.Drawing.Point(65, 20);
+            this.txtProcedureCode.Location = new System.Drawing.Point(87, 25);
+            this.txtProcedureCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtProcedureCode.MaxLength = 20;
             this.txtProcedureCode.Name = "txtProcedureCode";
             this.txtProcedureCode.RejectCharsPattern = "[^a-zA-Z0-9]";
-            this.txtProcedureCode.Size = new System.Drawing.Size(108, 21);
+            this.txtProcedureCode.Size = new System.Drawing.Size(143, 25);
             this.txtProcedureCode.TabIndex = 1;
             // 
             // c_Label3
@@ -333,9 +339,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             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.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.c_Label3.IsMustInput = true;
-            this.c_Label3.Location = new System.Drawing.Point(352, 23);
+            this.c_Label3.Location = new System.Drawing.Point(469, 29);
+            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(53, 12);
+            this.c_Label3.Size = new System.Drawing.Size(67, 15);
             this.c_Label3.TabIndex = 4;
             this.c_Label3.Text = "工序类型";
             // 
@@ -346,9 +353,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             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.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.c_Label2.IsMustInput = true;
-            this.c_Label2.Location = new System.Drawing.Point(179, 23);
+            this.c_Label2.Location = new System.Drawing.Point(239, 29);
+            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 = 2;
             this.c_Label2.Text = "工序名称";
             // 
@@ -359,9 +367,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             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.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.c_Label1.IsMustInput = true;
-            this.c_Label1.Location = new System.Drawing.Point(6, 23);
+            this.c_Label1.Location = new System.Drawing.Point(8, 29);
+            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 = 0;
             this.c_Label1.Text = "工序编码";
             // 
@@ -370,9 +379,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.GetDataOgrp.BackColor = System.Drawing.Color.Transparent;
             this.GetDataOgrp.Controls.Add(this.rbtnMore);
             this.GetDataOgrp.Controls.Add(this.rbtnOne);
-            this.GetDataOgrp.Location = new System.Drawing.Point(6, 46);
+            this.GetDataOgrp.Location = new System.Drawing.Point(8, 58);
+            this.GetDataOgrp.Margin = new System.Windows.Forms.Padding(4);
             this.GetDataOgrp.Name = "GetDataOgrp";
-            this.GetDataOgrp.Size = new System.Drawing.Size(167, 54);
+            this.GetDataOgrp.Padding = new System.Windows.Forms.Padding(4);
+            this.GetDataOgrp.Size = new System.Drawing.Size(198, 68);
             this.GetDataOgrp.TabIndex = 9;
             this.GetDataOgrp.TabStop = false;
             this.GetDataOgrp.Text = "采集方式";
@@ -380,21 +391,24 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // rbtnMore
             // 
             this.rbtnMore.AutoSize = true;
-            this.rbtnMore.Location = new System.Drawing.Point(85, 24);
+            this.rbtnMore.Location = new System.Drawing.Point(104, 30);
+            this.rbtnMore.Margin = new System.Windows.Forms.Padding(4);
             this.rbtnMore.Name = "rbtnMore";
-            this.rbtnMore.Size = new System.Drawing.Size(71, 16);
+            this.rbtnMore.Size = new System.Drawing.Size(88, 19);
             this.rbtnMore.TabIndex = 1;
             this.rbtnMore.TabStop = true;
             this.rbtnMore.Text = "集中采集";
             this.rbtnMore.UseVisualStyleBackColor = true;
+            this.rbtnMore.CheckedChanged += new System.EventHandler(this.rbtnMore_CheckedChanged);
             // 
             // rbtnOne
             // 
             this.rbtnOne.AutoSize = true;
             this.rbtnOne.Checked = true;
-            this.rbtnOne.Location = new System.Drawing.Point(6, 24);
+            this.rbtnOne.Location = new System.Drawing.Point(8, 30);
+            this.rbtnOne.Margin = new System.Windows.Forms.Padding(4);
             this.rbtnOne.Name = "rbtnOne";
-            this.rbtnOne.Size = new System.Drawing.Size(71, 16);
+            this.rbtnOne.Size = new System.Drawing.Size(88, 19);
             this.rbtnOne.TabIndex = 0;
             this.rbtnOne.TabStop = true;
             this.rbtnOne.Text = "单点采集";
@@ -405,9 +419,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox5.BackColor = System.Drawing.Color.Transparent;
             this.groupBox5.Controls.Add(this.rbtnSpecialSemireProcess);
             this.groupBox5.Controls.Add(this.rbtnSpecialReworkProcess);
-            this.groupBox5.Location = new System.Drawing.Point(354, 46);
+            this.groupBox5.Location = new System.Drawing.Point(569, 58);
+            this.groupBox5.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(165, 54);
+            this.groupBox5.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox5.Size = new System.Drawing.Size(218, 68);
             this.groupBox5.TabIndex = 11;
             this.groupBox5.TabStop = false;
             this.groupBox5.Tag = "";
@@ -415,10 +431,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // 
             // rbtnSpecialSemireProcess
             // 
-            this.rbtnSpecialSemireProcess.Location = new System.Drawing.Point(93, 25);
-            this.rbtnSpecialSemireProcess.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rbtnSpecialSemireProcess.Location = new System.Drawing.Point(124, 31);
+            this.rbtnSpecialSemireProcess.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.rbtnSpecialSemireProcess.Name = "rbtnSpecialSemireProcess";
-            this.rbtnSpecialSemireProcess.Size = new System.Drawing.Size(72, 16);
+            this.rbtnSpecialSemireProcess.Size = new System.Drawing.Size(89, 19);
             this.rbtnSpecialSemireProcess.TabIndex = 1;
             this.rbtnSpecialSemireProcess.Text = "半检返修";
             this.rbtnSpecialSemireProcess.UseVisualStyleBackColor = false;
@@ -426,10 +442,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // 
             // rbtnSpecialReworkProcess
             // 
-            this.rbtnSpecialReworkProcess.Location = new System.Drawing.Point(14, 24);
-            this.rbtnSpecialReworkProcess.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.rbtnSpecialReworkProcess.Location = new System.Drawing.Point(19, 30);
+            this.rbtnSpecialReworkProcess.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.rbtnSpecialReworkProcess.Name = "rbtnSpecialReworkProcess";
-            this.rbtnSpecialReworkProcess.Size = new System.Drawing.Size(72, 16);
+            this.rbtnSpecialReworkProcess.Size = new System.Drawing.Size(89, 19);
             this.rbtnSpecialReworkProcess.TabIndex = 0;
             this.rbtnSpecialReworkProcess.Text = "重烧返工";
             this.rbtnSpecialReworkProcess.UseVisualStyleBackColor = false;
@@ -440,9 +456,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox2.BackColor = System.Drawing.Color.Transparent;
             this.groupBox2.Controls.Add(this.rBtnNoNeed);
             this.groupBox2.Controls.Add(this.rBtnNeed);
-            this.groupBox2.Location = new System.Drawing.Point(179, 46);
+            this.groupBox2.Location = new System.Drawing.Point(214, 58);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(165, 54);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox2.Size = new System.Drawing.Size(154, 68);
             this.groupBox2.TabIndex = 10;
             this.groupBox2.TabStop = false;
             this.groupBox2.Tag = "";
@@ -451,9 +469,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // rBtnNoNeed
             // 
             this.rBtnNoNeed.AutoSize = true;
-            this.rBtnNoNeed.Location = new System.Drawing.Point(91, 24);
+            this.rBtnNoNeed.Location = new System.Drawing.Point(74, 30);
+            this.rBtnNoNeed.Margin = new System.Windows.Forms.Padding(4);
             this.rBtnNoNeed.Name = "rBtnNoNeed";
-            this.rBtnNoNeed.Size = new System.Drawing.Size(59, 16);
+            this.rBtnNoNeed.Size = new System.Drawing.Size(73, 19);
             this.rBtnNoNeed.TabIndex = 1;
             this.rBtnNoNeed.Text = "非必须";
             this.rBtnNoNeed.UseVisualStyleBackColor = true;
@@ -462,9 +481,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // 
             this.rBtnNeed.AutoSize = true;
             this.rBtnNeed.Checked = true;
-            this.rBtnNeed.Location = new System.Drawing.Point(19, 24);
+            this.rBtnNeed.Location = new System.Drawing.Point(8, 30);
+            this.rBtnNeed.Margin = new System.Windows.Forms.Padding(4);
             this.rBtnNeed.Name = "rBtnNeed";
-            this.rBtnNeed.Size = new System.Drawing.Size(47, 16);
+            this.rBtnNeed.Size = new System.Drawing.Size(58, 19);
             this.rBtnNeed.TabIndex = 0;
             this.rBtnNeed.TabStop = true;
             this.rBtnNeed.Text = "必须";
@@ -473,9 +493,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(40, 161);
+            this.label1.Location = new System.Drawing.Point(53, 201);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(29, 12);
+            this.label1.Size = new System.Drawing.Size(37, 15);
             this.label1.TabIndex = 7;
             this.label1.Text = "备注";
             // 
@@ -483,10 +504,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // 
             this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
             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(75, 160);
+            this.txtRemarks.Location = new System.Drawing.Point(100, 200);
+            this.txtRemarks.Margin = new System.Windows.Forms.Padding(4);
             this.txtRemarks.MaxLength = 500;
             this.txtRemarks.Name = "txtRemarks";
-            this.txtRemarks.Size = new System.Drawing.Size(666, 21);
+            this.txtRemarks.Size = new System.Drawing.Size(897, 25);
             this.txtRemarks.TabIndex = 8;
             // 
             // groupBox3
@@ -496,9 +518,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox3.BackColor = System.Drawing.Color.Transparent;
             this.groupBox3.Controls.Add(this.tabControl);
-            this.groupBox3.Location = new System.Drawing.Point(12, 203);
+            this.groupBox3.Location = new System.Drawing.Point(16, 254);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(754, 254);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox3.Size = new System.Drawing.Size(1005, 318);
             this.groupBox3.TabIndex = 1;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "控制属性";
@@ -510,19 +534,20 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.tabControl.Controls.Add(this.tabPage3);
             this.tabControl.Controls.Add(this.tabPage4);
             this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl.Location = new System.Drawing.Point(3, 17);
+            this.tabControl.Location = new System.Drawing.Point(4, 22);
+            this.tabControl.Margin = new System.Windows.Forms.Padding(4);
             this.tabControl.Name = "tabControl";
             this.tabControl.SelectedIndex = 0;
-            this.tabControl.Size = new System.Drawing.Size(748, 234);
+            this.tabControl.Size = new System.Drawing.Size(997, 292);
             this.tabControl.TabIndex = 0;
             // 
             // tabPage1
             // 
             this.tabPage1.Controls.Add(this.dgvGoods);
-            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(0);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(740, 208);
+            this.tabPage1.Size = new System.Drawing.Size(989, 263);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "生产产品";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -578,6 +603,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvGoods.IsSubTotalFlag = false;
             this.dgvGoods.IsTopDeep = false;
             this.dgvGoods.Location = new System.Drawing.Point(0, 0);
+            this.dgvGoods.Margin = new System.Windows.Forms.Padding(4);
             this.dgvGoods.MergeColumnNames = null;
             this.dgvGoods.MergeDetailColumnNames = null;
             this.dgvGoods.MergeDetailOnlyColumn = null;
@@ -589,7 +615,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvGoods.RowsDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvGoods.RowTemplate.Height = 21;
-            this.dgvGoods.Size = new System.Drawing.Size(740, 208);
+            this.dgvGoods.Size = new System.Drawing.Size(989, 263);
             this.dgvGoods.SortOrderColumnName = null;
             this.dgvGoods.TabIndex = 0;
             this.dgvGoods.Tag = true;
@@ -646,9 +672,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // tabPage2
             // 
             this.tabPage2.Controls.Add(this.dgvUser);
-            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);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(740, 211);
+            this.tabPage2.Size = new System.Drawing.Size(989, 263);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "生产工号";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -695,6 +722,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvUser.IsSubTotalFlag = false;
             this.dgvUser.IsTopDeep = false;
             this.dgvUser.Location = new System.Drawing.Point(0, 0);
+            this.dgvUser.Margin = new System.Windows.Forms.Padding(4);
             this.dgvUser.MergeColumnNames = null;
             this.dgvUser.MergeDetailColumnNames = null;
             this.dgvUser.MergeDetailOnlyColumn = null;
@@ -706,7 +734,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvUser.RowTemplate.Height = 21;
-            this.dgvUser.Size = new System.Drawing.Size(740, 211);
+            this.dgvUser.Size = new System.Drawing.Size(989, 263);
             this.dgvUser.SortOrderColumnName = null;
             this.dgvUser.TabIndex = 54;
             this.dgvUser.Tag = true;
@@ -757,10 +785,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // tabPage3
             // 
             this.tabPage3.Controls.Add(this.dgvDefect);
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Location = new System.Drawing.Point(4, 25);
             this.tabPage3.Margin = new System.Windows.Forms.Padding(0);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(740, 211);
+            this.tabPage3.Size = new System.Drawing.Size(989, 263);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "存在缺陷";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -811,6 +839,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvDefect.IsSubTotalFlag = false;
             this.dgvDefect.IsTopDeep = false;
             this.dgvDefect.Location = new System.Drawing.Point(0, 0);
+            this.dgvDefect.Margin = new System.Windows.Forms.Padding(4);
             this.dgvDefect.MergeColumnNames = null;
             this.dgvDefect.MergeDetailColumnNames = null;
             this.dgvDefect.MergeDetailOnlyColumn = null;
@@ -822,7 +851,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvDefect.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvDefect.RowTemplate.Height = 21;
-            this.dgvDefect.Size = new System.Drawing.Size(740, 211);
+            this.dgvDefect.Size = new System.Drawing.Size(989, 263);
             this.dgvDefect.SortOrderColumnName = null;
             this.dgvDefect.TabIndex = 54;
             this.dgvDefect.Tag = true;
@@ -909,9 +938,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // tabPage4
             // 
             this.tabPage4.Controls.Add(this.dgvKiln);
-            this.tabPage4.Location = new System.Drawing.Point(4, 22);
+            this.tabPage4.Location = new System.Drawing.Point(4, 25);
+            this.tabPage4.Margin = new System.Windows.Forms.Padding(4);
             this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(740, 211);
+            this.tabPage4.Size = new System.Drawing.Size(989, 263);
             this.tabPage4.TabIndex = 3;
             this.tabPage4.Text = "可用窑炉";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -957,6 +987,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.dgvKiln.IsSubTotalFlag = false;
             this.dgvKiln.IsTopDeep = false;
             this.dgvKiln.Location = new System.Drawing.Point(0, 0);
+            this.dgvKiln.Margin = new System.Windows.Forms.Padding(4);
             this.dgvKiln.MergeColumnNames = null;
             this.dgvKiln.MergeDetailColumnNames = null;
             this.dgvKiln.MergeDetailOnlyColumn = null;
@@ -968,7 +999,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvKiln.RowsDefaultCellStyle = dataGridViewCellStyle13;
             this.dgvKiln.RowTemplate.Height = 21;
-            this.dgvKiln.Size = new System.Drawing.Size(740, 211);
+            this.dgvKiln.Size = new System.Drawing.Size(989, 263);
             this.dgvKiln.SortOrderColumnName = null;
             this.dgvKiln.TabIndex = 55;
             this.dgvKiln.Tag = true;
@@ -1060,9 +1091,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             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(590, 463);
+            this.btnSave.Location = new System.Drawing.Point(787, 579);
+            this.btnSave.Margin = new System.Windows.Forms.Padding(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 = 2;
             this.btnSave.Text = "保存";
             this.btnSave.UseVisualStyleBackColor = false;
@@ -1076,9 +1108,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             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(681, 463);
+            this.btnCancel.Location = new System.Drawing.Point(908, 579);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(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 = 3;
             this.btnCancel.Text = "取消";
             this.btnCancel.UseVisualStyleBackColor = false;
@@ -1089,6 +1122,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+            this.groupBox1.Controls.Add(this.groupBox8);
             this.groupBox1.Controls.Add(this.ddlPrintType);
             this.groupBox1.Controls.Add(this.c_Label6);
             this.groupBox1.Controls.Add(this.groupBox7);
@@ -1113,13 +1147,54 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Controls.Add(this.txtRemarks);
             this.groupBox1.Controls.Add(this.sbOrganizationID);
-            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Location = new System.Drawing.Point(16, 15);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(754, 185);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Size = new System.Drawing.Size(1005, 231);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "基本属性";
             // 
+            // groupBox8
+            // 
+            this.groupBox8.BackColor = System.Drawing.Color.Transparent;
+            this.groupBox8.Controls.Add(this.rbtnGlazeNoChange);
+            this.groupBox8.Controls.Add(this.rbtnGlazeChange);
+            this.groupBox8.Location = new System.Drawing.Point(376, 58);
+            this.groupBox8.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox8.Name = "groupBox8";
+            this.groupBox8.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox8.Size = new System.Drawing.Size(185, 68);
+            this.groupBox8.TabIndex = 26;
+            this.groupBox8.TabStop = false;
+            this.groupBox8.Tag = "";
+            this.groupBox8.Text = "商标釉料";
+            // 
+            // rbtnGlazeNoChange
+            // 
+            this.rbtnGlazeNoChange.AutoSize = true;
+            this.rbtnGlazeNoChange.Location = new System.Drawing.Point(89, 29);
+            this.rbtnGlazeNoChange.Margin = new System.Windows.Forms.Padding(4);
+            this.rbtnGlazeNoChange.Name = "rbtnGlazeNoChange";
+            this.rbtnGlazeNoChange.Size = new System.Drawing.Size(88, 19);
+            this.rbtnGlazeNoChange.TabIndex = 1;
+            this.rbtnGlazeNoChange.Text = "不可变更";
+            this.rbtnGlazeNoChange.UseVisualStyleBackColor = true;
+            // 
+            // rbtnGlazeChange
+            // 
+            this.rbtnGlazeChange.AutoSize = true;
+            this.rbtnGlazeChange.Checked = true;
+            this.rbtnGlazeChange.Location = new System.Drawing.Point(8, 30);
+            this.rbtnGlazeChange.Margin = new System.Windows.Forms.Padding(4);
+            this.rbtnGlazeChange.Name = "rbtnGlazeChange";
+            this.rbtnGlazeChange.Size = new System.Drawing.Size(73, 19);
+            this.rbtnGlazeChange.TabIndex = 0;
+            this.rbtnGlazeChange.TabStop = true;
+            this.rbtnGlazeChange.Text = "可变更";
+            this.rbtnGlazeChange.UseVisualStyleBackColor = true;
+            // 
             // ddlPrintType
             // 
             this.ddlPrintType.BackColor = System.Drawing.SystemColors.Window;
@@ -1127,10 +1202,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.ddlPrintType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.ddlPrintType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ddlPrintType.FormattingEnabled = true;
-            this.ddlPrintType.Location = new System.Drawing.Point(268, 133);
-            this.ddlPrintType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ddlPrintType.Location = new System.Drawing.Point(419, 167);
+            this.ddlPrintType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ddlPrintType.Name = "ddlPrintType";
-            this.ddlPrintType.Size = new System.Drawing.Size(78, 20);
+            this.ddlPrintType.Size = new System.Drawing.Size(134, 23);
             this.ddlPrintType.TabIndex = 25;
             this.ddlPrintType.SelectedIndexChanged += new System.EventHandler(this.ddlPrintType_SelectedIndexChanged);
             // 
@@ -1139,9 +1214,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.c_Label6.AutoSize = true;
             this.c_Label6.BackColor = System.Drawing.Color.Transparent;
             this.c_Label6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label6.Location = new System.Drawing.Point(236, 137);
+            this.c_Label6.Location = new System.Drawing.Point(377, 172);
+            this.c_Label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label6.Name = "c_Label6";
-            this.c_Label6.Size = new System.Drawing.Size(29, 12);
+            this.c_Label6.Size = new System.Drawing.Size(37, 15);
             this.c_Label6.TabIndex = 24;
             this.c_Label6.Text = "类型";
             // 
@@ -1150,9 +1226,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox7.BackColor = System.Drawing.Color.Transparent;
             this.groupBox7.Controls.Add(this.rbtnOutBarCode);
             this.groupBox7.Controls.Add(this.rbtnGBarcode);
-            this.groupBox7.Location = new System.Drawing.Point(525, 103);
+            this.groupBox7.Location = new System.Drawing.Point(795, 129);
+            this.groupBox7.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Size = new System.Drawing.Size(216, 54);
+            this.groupBox7.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox7.Size = new System.Drawing.Size(202, 68);
             this.groupBox7.TabIndex = 13;
             this.groupBox7.TabStop = false;
             this.groupBox7.Tag = "";
@@ -1161,9 +1239,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // rbtnOutBarCode
             // 
             this.rbtnOutBarCode.AutoSize = true;
-            this.rbtnOutBarCode.Location = new System.Drawing.Point(106, 24);
+            this.rbtnOutBarCode.Location = new System.Drawing.Point(104, 30);
+            this.rbtnOutBarCode.Margin = new System.Windows.Forms.Padding(4);
             this.rbtnOutBarCode.Name = "rbtnOutBarCode";
-            this.rbtnOutBarCode.Size = new System.Drawing.Size(71, 16);
+            this.rbtnOutBarCode.Size = new System.Drawing.Size(88, 19);
             this.rbtnOutBarCode.TabIndex = 1;
             this.rbtnOutBarCode.Text = "包装条码";
             this.rbtnOutBarCode.UseVisualStyleBackColor = true;
@@ -1172,9 +1251,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // 
             this.rbtnGBarcode.AutoSize = true;
             this.rbtnGBarcode.Checked = true;
-            this.rbtnGBarcode.Location = new System.Drawing.Point(27, 24);
+            this.rbtnGBarcode.Location = new System.Drawing.Point(8, 30);
+            this.rbtnGBarcode.Margin = new System.Windows.Forms.Padding(4);
             this.rbtnGBarcode.Name = "rbtnGBarcode";
-            this.rbtnGBarcode.Size = new System.Drawing.Size(71, 16);
+            this.rbtnGBarcode.Size = new System.Drawing.Size(88, 19);
             this.rbtnGBarcode.TabIndex = 0;
             this.rbtnGBarcode.TabStop = true;
             this.rbtnGBarcode.Text = "注浆条码";
@@ -1189,7 +1269,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtBarCodePrintCopies.ErrorMessage = "";
             this.txtBarCodePrintCopies.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBarCodePrintCopies.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtBarCodePrintCopies.Location = new System.Drawing.Point(203, 133);
+            this.txtBarCodePrintCopies.Location = new System.Drawing.Point(271, 166);
+            this.txtBarCodePrintCopies.Margin = new System.Windows.Forms.Padding(4);
             this.txtBarCodePrintCopies.MaxLength = 2;
             this.txtBarCodePrintCopies.MaxValue = new decimal(new int[] {
             10,
@@ -1202,7 +1283,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             0,
             0});
             this.txtBarCodePrintCopies.Name = "txtBarCodePrintCopies";
-            this.txtBarCodePrintCopies.Size = new System.Drawing.Size(27, 21);
+            this.txtBarCodePrintCopies.Size = new System.Drawing.Size(90, 25);
             this.txtBarCodePrintCopies.TabIndex = 16;
             this.txtBarCodePrintCopies.TextValue = "";
             this.txtBarCodePrintCopies.TextChanged += new System.EventHandler(this.txtBarCodePrintCopies_TextChanged);
@@ -1212,9 +1293,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             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.Location = new System.Drawing.Point(147, 137);
+            this.c_Label5.Location = new System.Drawing.Point(196, 171);
+            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(53, 12);
+            this.c_Label5.Size = new System.Drawing.Size(67, 15);
             this.c_Label5.TabIndex = 15;
             this.c_Label5.Text = "打印份数";
             // 
@@ -1227,7 +1309,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtDisplayNo.ErrorMessage = "";
             this.txtDisplayNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtDisplayNo.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtDisplayNo.Location = new System.Drawing.Point(75, 133);
+            this.txtDisplayNo.Location = new System.Drawing.Point(100, 166);
+            this.txtDisplayNo.Margin = new System.Windows.Forms.Padding(4);
             this.txtDisplayNo.MaxLength = 2;
             this.txtDisplayNo.MaxValue = new decimal(new int[] {
             99,
@@ -1240,7 +1323,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             0,
             0});
             this.txtDisplayNo.Name = "txtDisplayNo";
-            this.txtDisplayNo.Size = new System.Drawing.Size(66, 21);
+            this.txtDisplayNo.Size = new System.Drawing.Size(87, 25);
             this.txtDisplayNo.TabIndex = 14;
             this.txtDisplayNo.TextValue = "";
             // 
@@ -1253,7 +1336,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtmisspriority.ErrorMessage = "";
             this.txtmisspriority.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtmisspriority.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtmisspriority.Location = new System.Drawing.Point(75, 106);
+            this.txtmisspriority.Location = new System.Drawing.Point(100, 132);
+            this.txtmisspriority.Margin = new System.Windows.Forms.Padding(4);
             this.txtmisspriority.MaxLength = 1;
             this.txtmisspriority.MaxValue = new decimal(new int[] {
             9,
@@ -1266,7 +1350,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             0,
             0});
             this.txtmisspriority.Name = "txtmisspriority";
-            this.txtmisspriority.Size = new System.Drawing.Size(66, 21);
+            this.txtmisspriority.Size = new System.Drawing.Size(87, 25);
             this.txtmisspriority.TabIndex = 14;
             this.txtmisspriority.TextValue = "";
             // 
@@ -1275,9 +1359,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.lblDisplayNo.AutoSize = true;
             this.lblDisplayNo.BackColor = System.Drawing.Color.Transparent;
             this.lblDisplayNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblDisplayNo.Location = new System.Drawing.Point(16, 136);
+            this.lblDisplayNo.Location = new System.Drawing.Point(21, 170);
+            this.lblDisplayNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblDisplayNo.Name = "lblDisplayNo";
-            this.lblDisplayNo.Size = new System.Drawing.Size(53, 12);
+            this.lblDisplayNo.Size = new System.Drawing.Size(67, 15);
             this.lblDisplayNo.TabIndex = 13;
             this.lblDisplayNo.Text = "显示顺序";
             // 
@@ -1287,9 +1372,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             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.Color.Blue;
-            this.c_Label4.Location = new System.Drawing.Point(144, 110);
+            this.c_Label4.Location = new System.Drawing.Point(192, 138);
+            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(185, 12);
+            this.c_Label4.Size = new System.Drawing.Size(232, 15);
             this.c_Label4.TabIndex = 13;
             this.c_Label4.Text = "（同级别排序大的优先记录漏扫）";
             // 
@@ -1298,9 +1384,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.lblmisspriority.AutoSize = true;
             this.lblmisspriority.BackColor = System.Drawing.Color.Transparent;
             this.lblmisspriority.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblmisspriority.Location = new System.Drawing.Point(4, 110);
+            this.lblmisspriority.Location = new System.Drawing.Point(5, 138);
+            this.lblmisspriority.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblmisspriority.Name = "lblmisspriority";
-            this.lblmisspriority.Size = new System.Drawing.Size(65, 12);
+            this.lblmisspriority.Size = new System.Drawing.Size(82, 15);
             this.lblmisspriority.TabIndex = 13;
             this.lblmisspriority.Text = "漏扫排序号";
             // 
@@ -1310,9 +1397,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox4.Controls.Add(this.radioJobsPrice);
             this.groupBox4.Controls.Add(this.radioNotPrice);
             this.groupBox4.Enabled = false;
-            this.groupBox4.Location = new System.Drawing.Point(525, 46);
+            this.groupBox4.Location = new System.Drawing.Point(795, 58);
+            this.groupBox4.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(216, 54);
+            this.groupBox4.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox4.Size = new System.Drawing.Size(202, 68);
             this.groupBox4.TabIndex = 12;
             this.groupBox4.TabStop = false;
             this.groupBox4.Tag = "";
@@ -1323,9 +1412,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // 
             this.radioJobsPrice.AutoSize = true;
             this.radioJobsPrice.Checked = true;
-            this.radioJobsPrice.Location = new System.Drawing.Point(106, 24);
+            this.radioJobsPrice.Location = new System.Drawing.Point(89, 31);
+            this.radioJobsPrice.Margin = new System.Windows.Forms.Padding(4);
             this.radioJobsPrice.Name = "radioJobsPrice";
-            this.radioJobsPrice.Size = new System.Drawing.Size(71, 16);
+            this.radioJobsPrice.Size = new System.Drawing.Size(88, 19);
             this.radioJobsPrice.TabIndex = 1;
             this.radioJobsPrice.TabStop = true;
             this.radioJobsPrice.Text = "不能撤销";
@@ -1334,9 +1424,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // radioNotPrice
             // 
             this.radioNotPrice.AutoSize = true;
-            this.radioNotPrice.Location = new System.Drawing.Point(27, 24);
+            this.radioNotPrice.Location = new System.Drawing.Point(8, 31);
+            this.radioNotPrice.Margin = new System.Windows.Forms.Padding(4);
             this.radioNotPrice.Name = "radioNotPrice";
-            this.radioNotPrice.Size = new System.Drawing.Size(59, 16);
+            this.radioNotPrice.Size = new System.Drawing.Size(73, 19);
             this.radioNotPrice.TabIndex = 0;
             this.radioNotPrice.Text = "能撤销";
             this.radioNotPrice.UseVisualStyleBackColor = true;
@@ -1356,12 +1447,13 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.ddlProcessModelType.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ddlProcessModelType.ListBox.Location = new System.Drawing.Point(0, 0);
             this.ddlProcessModelType.ListBox.Name = "";
-            this.ddlProcessModelType.ListBox.Size = new System.Drawing.Size(106, 136);
+            this.ddlProcessModelType.ListBox.Size = new System.Drawing.Size(141, 136);
             this.ddlProcessModelType.ListBox.TabIndex = 0;
             this.ddlProcessModelType.ListBox.SelectedIndexChanged += new System.EventHandler(this.cobProcessModelType_SelectedIndexChanged);
-            this.ddlProcessModelType.Location = new System.Drawing.Point(411, 20);
+            this.ddlProcessModelType.Location = new System.Drawing.Point(548, 25);
+            this.ddlProcessModelType.Margin = new System.Windows.Forms.Padding(4);
             this.ddlProcessModelType.Name = "ddlProcessModelType";
-            this.ddlProcessModelType.Size = new System.Drawing.Size(108, 20);
+            this.ddlProcessModelType.Size = new System.Drawing.Size(143, 23);
             this.ddlProcessModelType.TabIndex = 5;
             this.ddlProcessModelType.SelectedIndexChanged += new System.EventHandler(this.ddlProcessModelType_SelectedIndexChanged);
             // 
@@ -1370,9 +1462,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.groupBox6.BackColor = System.Drawing.Color.Transparent;
             this.groupBox6.Controls.Add(this.rbtnAuto);
             this.groupBox6.Controls.Add(this.rbtnHand);
-            this.groupBox6.Location = new System.Drawing.Point(354, 103);
+            this.groupBox6.Location = new System.Drawing.Point(569, 129);
+            this.groupBox6.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(165, 54);
+            this.groupBox6.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox6.Size = new System.Drawing.Size(218, 68);
             this.groupBox6.TabIndex = 11;
             this.groupBox6.TabStop = false;
             this.groupBox6.Tag = "";
@@ -1382,9 +1476,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // 
             this.rbtnAuto.AutoSize = true;
             this.rbtnAuto.Checked = true;
-            this.rbtnAuto.Location = new System.Drawing.Point(106, 24);
+            this.rbtnAuto.Location = new System.Drawing.Point(141, 30);
+            this.rbtnAuto.Margin = new System.Windows.Forms.Padding(4);
             this.rbtnAuto.Name = "rbtnAuto";
-            this.rbtnAuto.Size = new System.Drawing.Size(47, 16);
+            this.rbtnAuto.Size = new System.Drawing.Size(58, 19);
             this.rbtnAuto.TabIndex = 1;
             this.rbtnAuto.TabStop = true;
             this.rbtnAuto.Text = "自动";
@@ -1393,9 +1488,10 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             // rbtnHand
             // 
             this.rbtnHand.AutoSize = true;
-            this.rbtnHand.Location = new System.Drawing.Point(27, 24);
+            this.rbtnHand.Location = new System.Drawing.Point(36, 30);
+            this.rbtnHand.Margin = new System.Windows.Forms.Padding(4);
             this.rbtnHand.Name = "rbtnHand";
-            this.rbtnHand.Size = new System.Drawing.Size(47, 16);
+            this.rbtnHand.Size = new System.Drawing.Size(58, 19);
             this.rbtnHand.TabIndex = 0;
             this.rbtnHand.Text = "手动";
             this.rbtnHand.UseVisualStyleBackColor = true;
@@ -1409,30 +1505,30 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.sbOrganizationID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.sbOrganizationID.IsMustInput = true;
             this.sbOrganizationID.IsOnlyDisplayEnd = false;
-            this.sbOrganizationID.Location = new System.Drawing.Point(525, 20);
-            this.sbOrganizationID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sbOrganizationID.Location = new System.Drawing.Point(700, 25);
+            this.sbOrganizationID.Margin = new System.Windows.Forms.Padding(5);
             this.sbOrganizationID.Name = "sbOrganizationID";
             this.sbOrganizationID.OrganizationCode = "";
             this.sbOrganizationID.OrganizationIDS = null;
             this.sbOrganizationID.OrganizationName = "";
             this.sbOrganizationID.PurviewType = ((byte)(0));
-            this.sbOrganizationID.Size = new System.Drawing.Size(216, 21);
+            this.sbOrganizationID.Size = new System.Drawing.Size(288, 26);
             this.sbOrganizationID.TabIndex = 6;
             this.sbOrganizationID.TxtOrganizationBackColor = System.Drawing.SystemColors.Control;
             // 
             // F_PC_0207
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.BackColor = System.Drawing.SystemColors.Control;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(778, 518);
+            this.ClientSize = new System.Drawing.Size(1037, 648);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.btnSave);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             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.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "F_PC_0207";
@@ -1463,6 +1559,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             ((System.ComponentModel.ISupportInitialize)(this.dgvKiln)).EndInit();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
+            this.groupBox8.ResumeLayout(false);
+            this.groupBox8.PerformLayout();
             this.groupBox7.ResumeLayout(false);
             this.groupBox7.PerformLayout();
             this.groupBox4.ResumeLayout(false);
@@ -1587,6 +1685,21 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 this.rbtnSpecialSemireProcess.Checked = (this._procedureEntity.IsSemireWork == Constant.SpecialReworkFlag.Yes.GetHashCode());
                 //xuwei add 2019-11-20
                 this.ddlPrintType.SelectedValue = this._procedureEntity.PrintType;
+                //xuwei add 2020-01-02
+                this.rbtnGlazeChange.Checked = (this._procedureEntity.IsGlazeChange == 1);
+                this.rbtnGlazeNoChange.Checked = (this._procedureEntity.IsGlazeChange == 0);
+                if (this._procedureEntity.ModelType == Convert.ToInt32(Constant.ProcedureModelType.Normal)
+                    &&
+                    rbtnMore.Checked
+                    )
+                {
+                    groupBox8.Visible = true;
+                }
+                else
+                {
+                    groupBox8.Visible = false;
+                }
+
 
                 //this.radioJobsPrice.Checked = (this._procedureEntity.PieceType == Constant.ProcedurePieceType.JobsPiece.GetHashCode());
                 //this.radioNotPrice.Checked = (this._procedureEntity.PieceType == Constant.ProcedurePieceType.NoPiece.GetHashCode());
@@ -1681,6 +1794,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this._procedureEntity.IsSemireWork = this.rbtnSpecialSemireProcess.Checked ? 1 : 0;
             //xuwei add 2019-11-20
             this._procedureEntity.PrintType = Convert.ToInt32(this.ddlPrintType.SelectedValue);
+            //xuwei add 2020-01-02
+            this._procedureEntity.IsGlazeChange = Convert.ToInt32(this.rbtnGlazeChange.Checked ? 1 : 0);
 
             this.Close();
         }
@@ -1736,11 +1851,17 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             if (Convert.ToInt32(ddlProcessModelType.SelectedValue) == Convert.ToInt32(Dongke.IBOSS.PRD.Basics.BaseResources.Constant.ProcedureModelType.Normal))
             {
                 this.groupBox7.Visible = true;
+
+                //xuwei add 2020-01-02
+                groupBox8.Visible = rbtnMore.Checked;
             }
             else
             {
                 this.groupBox7.Visible = false;
                 rbtnGBarcode.Checked = true;
+
+                //xuwei add 2020-01-02
+                groupBox8.Visible = false;
             }
 
             //干补
@@ -1804,8 +1925,6 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 }
             }
 
-
-
             //// 标准计件、交坯
             //if ((int)ddlProcessModelType.SelectedValue == (int)ProcedureModelType.Normal
             //    || (int)ddlProcessModelType.SelectedValue == (int)ProcedureModelType.DeliverAdobe)
@@ -2227,6 +2346,9 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 //打印类型 xuwei add 2019-11-20
                 this._procedureEntity.PrintType = Convert.ToInt32(this.ddlPrintType.SelectedValue.ToString());
 
+                //xuwei add 2020-01-02
+                //商标釉料
+                this._procedureEntity.IsGlazeChange = rbtnGlazeChange.Checked ? 1 : 0;
 
                 this._procedureEntity.Remarks = this.txtRemarks.Text.Trim();
 
@@ -2522,6 +2644,16 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 groupBox4.Enabled = false;
                 radioJobsPrice.Checked = true;
             }
+
+            //xuwei add 2020-01-02
+            if (Convert.ToInt32(this.ddlProcessModelType.SelectedValue) == Convert.ToInt32(Constant.ProcedureModelType.Normal))
+            {
+                groupBox8.Visible = rbtnMore.Checked;
+            }
+            else
+            {
+                groupBox8.Visible = false;
+            }
         }
 
         /// <summary>
@@ -2588,5 +2720,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 if (ddlPrintType.SelectedIndex > 0) ddlPrintType.SelectedIndex = 0;
             }
         }
+
+        private void rbtnMore_CheckedChanged(object sender, EventArgs e)
+        {
+            //xuwei add 2020-01-02
+            groupBox8.Visible = rbtnMore.Checked;
+        }
     }
 }

DK.Service/PCModuleLogic/PCModuleLogicDAL.cs

@@ -1161,6 +1161,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                                                                 + " IsSpecialRework=:isSpecialRework,"
                                                                                 + " IsSemireWork=:isSemireWork,"  
                                                                                 + " PrintType=:printType," //xuwei add 2019-11-20
+                                                                                + " IsGlazeChange=:IsGlazeChange," //xuwei add 2020-01-02
                                                                                 + " NodeNo=:nodeNo,"
                                                                                 + " Remarks=:remarks,"
                                                                                 + " updateUserID=:updateUserID,"
@@ -1188,6 +1189,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                 new OracleParameter(":isSpecialRework",procedure.IsSpecialRework),
                                 new OracleParameter(":isSemireWork",procedure.IsSemireWork),
                                 new OracleParameter(":printType",procedure.PrintType),//xuwei add 2019-11-20
+                                new OracleParameter(":IsGlazeChange",procedure.IsGlazeChange),//xuwei add 2020-01-02
                                 new OracleParameter(":nodeNo",procedure.NodeNo),
                                 new OracleParameter(":remarks",procedure.Remarks),
                                 new OracleParameter(":updateUserID",sUserInfo.UserID),
@@ -1560,6 +1562,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                     + " IsSpecialRework=:isSpecialRework,"
                     + " IsSemireWork=:isSemireWork," //xuwei add 2019-10-14
                     + " PrintType=:printType," //xuwei add 2019-11-20
+                    + " IsGlazeChange=:IsGlazeChange," //xuwei add 2019-11-20
                     + " NodeNo=:nodeNo,"
                     + " Remarks=:remarks,"
                     + " updateUserID=:updateUserID,"
@@ -1586,6 +1589,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                                 new OracleParameter(":isSpecialRework",procedure.IsSpecialRework),
                                 new OracleParameter(":isSemireWork",procedure.IsSemireWork),//xuwei add 2019-10-14
                                 new OracleParameter(":printType",procedure.PrintType),//xuwei add 2019-11-20
+                                new OracleParameter(":IsGlazeChange",procedure.IsGlazeChange),//xuwei add 2020-01-02
                                 new OracleParameter(":nodeNo",procedure.NodeNo),
                                 new OracleParameter(":remarks",procedure.Remarks),
                                 new OracleParameter(":updateUserID",sUserInfo.UserID),

WCF.Service/WCF.DataModels/PCModule/ProcedureEntity.cs

@@ -79,6 +79,9 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         //xuwei add 2019-12-5
         private string semiGoodsLevel;
 
+        //xuwei add 2020-01-02
+        private int isGlazeChange = 0;
+
         /// <summary>
         /// 所属部门
         /// </summary>
@@ -356,6 +359,17 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             set { semiGoodsLevel = value; }
         }
 
+        //xuwei add 2020-01-02
+        /// <summary>
+        /// 变更商标釉料
+        /// </summary>
+        [DataMember]
+        public int IsGlazeChange
+        {
+            get { return isGlazeChange; }
+            set { isGlazeChange = value; }
+        }
+
         /// <summary>
         /// 所属部门
         /// </summary>