chenxy 6 лет назад
Родитель
Сommit
5063dd139a

+ 24 - 23
DK.Client/PMModule/F_PM_0202.Designer.cs

@@ -87,12 +87,12 @@
             this.colGMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DMCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DMCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.IsPublicBody = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.WorkUserCodes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvBarCode)).BeginInit();
@@ -653,12 +653,12 @@
             this.colGMouldStatus,
             this.GroutingCount,
             this.GMouldTypeName,
-            this.Remarks,
+            this.DMCreateTime,
             this.ProcedureName,
             this.ProcedureTime,
-            this.DMCreateTime,
             this.IsPublicBody,
-            this.WorkUserCodes});
+            this.WorkUserCodes,
+            this.Remarks});
             this.dgvBarCode.ColumnTreeView = null;
             this.dgvBarCode.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)));
             dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -800,12 +800,15 @@
             this.GMouldTypeName.Name = "GMouldTypeName";
             this.GMouldTypeName.ReadOnly = true;
             // 
-            // Remarks
+            // DMCreateTime
             // 
-            this.Remarks.DataPropertyName = "Remarks";
-            this.Remarks.HeaderText = "备注";
-            this.Remarks.Name = "Remarks";
-            this.Remarks.ReadOnly = true;
+            this.DMCreateTime.DataPropertyName = "DMCreateTime";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
+            this.DMCreateTime.DefaultCellStyle = dataGridViewCellStyle5;
+            this.DMCreateTime.HeaderText = "交坯时间";
+            this.DMCreateTime.Name = "DMCreateTime";
+            this.DMCreateTime.ReadOnly = true;
             // 
             // ProcedureName
             // 
@@ -817,21 +820,12 @@
             // ProcedureTime
             // 
             this.ProcedureTime.DataPropertyName = "ProcedureTime";
-            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
-            this.ProcedureTime.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle6.Format = "yyyy-MM-dd HH:mm:ss";
+            this.ProcedureTime.DefaultCellStyle = dataGridViewCellStyle6;
             this.ProcedureTime.HeaderText = "当前工序完成时间";
             this.ProcedureTime.Name = "ProcedureTime";
             this.ProcedureTime.ReadOnly = true;
             // 
-            // DMCreateTime
-            // 
-            this.DMCreateTime.DataPropertyName = "DMCreateTime";
-            dataGridViewCellStyle6.Format = "yyyy-MM-dd HH:mm:ss";
-            this.DMCreateTime.DefaultCellStyle = dataGridViewCellStyle6;
-            this.DMCreateTime.HeaderText = "交坯时间";
-            this.DMCreateTime.Name = "DMCreateTime";
-            this.DMCreateTime.ReadOnly = true;
-            // 
             // IsPublicBody
             // 
             this.IsPublicBody.DataPropertyName = "IsPublicBody";
@@ -850,6 +844,13 @@
             this.WorkUserCodes.Name = "WorkUserCodes";
             this.WorkUserCodes.ReadOnly = true;
             // 
+            // Remarks
+            // 
+            this.Remarks.DataPropertyName = "Remarks";
+            this.Remarks.HeaderText = "备注";
+            this.Remarks.Name = "Remarks";
+            this.Remarks.ReadOnly = true;
+            // 
             // F_PM_0202
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -930,11 +931,11 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn colGMouldStatus;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DMCreateTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureName;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureTime;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DMCreateTime;
         private System.Windows.Forms.DataGridViewCheckBoxColumn IsPublicBody;
         private System.Windows.Forms.DataGridViewTextBoxColumn WorkUserCodes;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
     }
 }

+ 4 - 4
DK.Client/PMModule/F_PM_0202.resx

@@ -233,7 +233,7 @@
   <metadata name="GMouldTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Remarks.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="DMCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="ProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -242,15 +242,15 @@
   <metadata name="ProcedureTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="DMCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="IsPublicBody.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="WorkUserCodes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Remarks.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>36</value>
   </metadata>

+ 1 - 1
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.133
+ClientVersion=1.0.20.0330
 
 [PathSetting]
 ;客户端升级,下载文件路径