合并后测试调整

DK.Client/PCModule/F_PC_0203.cs

@@ -232,6 +232,8 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 procedureEntity.IsSemireWork = Convert.ToInt32(dr1[0]["isSemireWork"].ToString());
                 //xuwei add 2019-11-20
                 procedureEntity.PrintType = Convert.ToInt32(dr1[0]["printType"].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.Designer.cs

@@ -95,6 +95,7 @@
             this.PieceType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.IsSpecialRework = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.IsSemireWork = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.IsGlazeChange = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.RemarksDetail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.nodeno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.procedurelineid = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -263,7 +264,7 @@
             this.c_GroupBox1.Margin = new System.Windows.Forms.Padding(0);
             this.c_GroupBox1.Name = "c_GroupBox1";
             this.c_GroupBox1.OriginalHeight = -1;
-            this.c_GroupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.c_GroupBox1.Padding = new System.Windows.Forms.Padding(4);
             this.c_GroupBox1.Size = new System.Drawing.Size(1357, 90);
             this.c_GroupBox1.TabIndex = 1;
             this.c_GroupBox1.TabStop = false;
@@ -277,7 +278,7 @@
             this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSearch.ForeColor = System.Drawing.Color.White;
             this.btnSearch.Location = new System.Drawing.Point(1115, 45);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(113, 38);
             this.btnSearch.TabIndex = 7;
@@ -293,7 +294,7 @@
             this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClearCondition.ForeColor = System.Drawing.Color.White;
             this.btnClearCondition.Location = new System.Drawing.Point(1236, 45);
-            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4);
             this.btnClearCondition.Name = "btnClearCondition";
             this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
             this.btnClearCondition.TabIndex = 8;
@@ -328,7 +329,7 @@
             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(101, 59);
-            this.txtRemarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtRemarks.Margin = new System.Windows.Forms.Padding(4);
             this.txtRemarks.MaxLength = 500;
             this.txtRemarks.Name = "txtRemarks";
             this.txtRemarks.Size = new System.Drawing.Size(368, 25);
@@ -354,7 +355,7 @@
             this.txtLineName.ErrorMessage = "";
             this.txtLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtLineName.Location = new System.Drawing.Point(337, 25);
-            this.txtLineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtLineName.Margin = new System.Windows.Forms.Padding(4);
             this.txtLineName.MaxLength = 50;
             this.txtLineName.Name = "txtLineName";
             this.txtLineName.Size = new System.Drawing.Size(132, 25);
@@ -382,7 +383,7 @@
             this.txtLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtLineCode.ImeMode = System.Windows.Forms.ImeMode.Off;
             this.txtLineCode.Location = new System.Drawing.Point(101, 25);
-            this.txtLineCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtLineCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtLineCode.MaxLength = 20;
             this.txtLineCode.Name = "txtLineCode";
             this.txtLineCode.Size = new System.Drawing.Size(132, 25);
@@ -407,7 +408,7 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.splitContainer1.Location = new System.Drawing.Point(0, 145);
-            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
             this.splitContainer1.Name = "splitContainer1";
             this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -483,7 +484,7 @@
             this.dgvLine.IsSubTotalFlag = false;
             this.dgvLine.IsTopDeep = false;
             this.dgvLine.Location = new System.Drawing.Point(0, 0);
-            this.dgvLine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvLine.Margin = new System.Windows.Forms.Padding(4);
             this.dgvLine.MergeColumnNames = null;
             this.dgvLine.MergeDetailColumnNames = null;
             this.dgvLine.MergeDetailOnlyColumn = null;
@@ -652,6 +653,7 @@
             this.PieceType,
             this.IsSpecialRework,
             this.IsSemireWork,
+            this.IsGlazeChange,
             this.RemarksDetail,
             this.nodeno,
             this.procedurelineid,
@@ -680,7 +682,7 @@
             this.dgvProcedure.IsSubTotalFlag = false;
             this.dgvProcedure.IsTopDeep = false;
             this.dgvProcedure.Location = new System.Drawing.Point(0, 0);
-            this.dgvProcedure.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvProcedure.Margin = new System.Windows.Forms.Padding(4);
             this.dgvProcedure.MergeColumnNames = null;
             this.dgvProcedure.MergeDetailColumnNames = null;
             this.dgvProcedure.MergeDetailOnlyColumn = null;
@@ -912,6 +914,20 @@
             this.IsSemireWork.TrueValue = "1";
             this.IsSemireWork.Width = 125;
             // 
+            // IsGlazeChange
+            // 
+            this.IsGlazeChange.DataPropertyName = "IsGlazeChange";
+            this.IsGlazeChange.FalseValue = "0";
+            this.IsGlazeChange.HeaderText = "变更商标釉料";
+            this.IsGlazeChange.IndeterminateValue = "0";
+            this.IsGlazeChange.MinimumWidth = 6;
+            this.IsGlazeChange.Name = "IsGlazeChange";
+            this.IsGlazeChange.ReadOnly = true;
+            this.IsGlazeChange.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.IsGlazeChange.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.IsGlazeChange.TrueValue = "1";
+            this.IsGlazeChange.Width = 125;
+            // 
             // RemarksDetail
             // 
             this.RemarksDetail.DataPropertyName = "Remarks";
@@ -973,7 +989,7 @@
             | Dongke.IBOSS.PRD.Basics.DockPanel.DockAreas.DockBottom) 
             | Dongke.IBOSS.PRD.Basics.DockPanel.DockAreas.Document)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "F_PC_0205";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "生产线管理";
@@ -1048,6 +1064,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn PieceType;
         private System.Windows.Forms.DataGridViewCheckBoxColumn IsSpecialRework;
         private System.Windows.Forms.DataGridViewCheckBoxColumn IsSemireWork;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn IsGlazeChange;
         private System.Windows.Forms.DataGridViewTextBoxColumn RemarksDetail;
         private System.Windows.Forms.DataGridViewTextBoxColumn nodeno;
         private System.Windows.Forms.DataGridViewTextBoxColumn procedurelineid;

DK.Client/PCModule/F_PC_0205.resx

@@ -338,6 +338,9 @@
   <metadata name="IsSemireWork.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="IsGlazeChange.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="RemarksDetail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

WCF.Service/WCF.Hosting/Config.ini

@@ -17,7 +17,7 @@ ServerName=Debug
 [VersionSetting]
 PublicClientVersion=1.0.0.6
 AndroidVersion=1.0.1.128
-ClientVersion=1.0.1.130
+ClientVersion=1.0.1.131
 
 [PathSetting]
 ;客户端升级，下载文件路径

WCF.Service/WCF.Services/Properties/AssemblyInfo.cs

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

WCF.Service/WCF.WebHosting/Config.ini

@@ -17,7 +17,7 @@ ServerName=Debug
 [VersionSetting]
 PublicClientVersion=1.0.0.6
 AndroidVersion=1.0.0.125
-ClientVersion=1.0.0.127
+ClientVersion=1.0.0.131
 
 [PathSetting]
 ;客户端升级，下载文件路径