潮州报表

DK.Client/ReportModule/R08/F_RPT_080109.Designer.cs

@@ -113,6 +113,7 @@
             this.barcodeRemarks3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bsqx = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.半检缺陷 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.位置编码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.半检位置 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.半检工号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
@@ -726,6 +727,7 @@
             this.barcodeRemarks3,
             this.bsqx,
             this.半检缺陷,
+            this.位置编码,
             this.半检位置,
             this.半检工号});
             this.dgvDefectDetail.ColumnTreeView = null;
@@ -1032,6 +1034,13 @@
             this.半检缺陷.Name = "半检缺陷";
             this.半检缺陷.ReadOnly = true;
             // 
+            // 位置编码
+            // 
+            this.位置编码.DataPropertyName = "位置编码";
+            this.位置编码.HeaderText = "位置编码";
+            this.位置编码.Name = "位置编码";
+            this.位置编码.ReadOnly = true;
+            // 
             // 半检位置
             // 
             this.半检位置.DataPropertyName = "半检位置";
@@ -1145,6 +1154,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn barcodeRemarks3;
         private System.Windows.Forms.DataGridViewTextBoxColumn bsqx;
         private System.Windows.Forms.DataGridViewTextBoxColumn 半检缺陷;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 位置编码;
         private System.Windows.Forms.DataGridViewTextBoxColumn 半检位置;
         private System.Windows.Forms.DataGridViewTextBoxColumn 半检工号;
     }

DK.Client/ReportModule/R08/F_RPT_080109.resx

@@ -299,6 +299,9 @@
   <metadata name="半检缺陷.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="位置编码.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="半检位置.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportDetailedLogic.cs

@@ -158,6 +158,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "           0\n" +
                 "        END AS undoflag\n" +
                 "        ,semid.DEFECTNAME AS 半检缺陷\n" +
+                //"        ,'[' || semid.DEFECTPOSITIONCODE || ']' ||semid.DEFECTPOSITIONNAME AS 半检位置\n" +
+                "        ,semid.DEFECTPOSITIONCODE AS 位置编码\n" +
                 "        ,semid.DEFECTPOSITIONNAME AS 半检位置\n" +
                 "        ,semi.SEMIREWORKUSERCODE AS 半检工号\n" +
                 "  FROM tp_pm_defect pmd\n" +

IBOSS.PRD/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.Hosting/ConfigMain.cs

@@ -308,8 +308,8 @@ namespace Dongke.IBOSS.PRD.WCF.Hosting
                                                 this.txtUser.Text.Trim(),
                                                 this.txtPassword.Text.Trim()
                                                 );
-                DataAccess.DefaultConnectionString = DataManager.ConnectionString;
                 DataAccess.DefaultDataBaseType = Curtain.DataAccess.DataBaseType.Oracle;
+                DataAccess.DefaultConnectionString = DataManager.ConnectionString;
 
                 MessageBox.Show("数据库配置保存成功。", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
@@ -782,8 +782,8 @@ namespace Dongke.IBOSS.PRD.WCF.Hosting
                                             this.txtUser.Text.Trim(),
                                             this.txtPassword.Text.Trim()
                                             );
-            DataAccess.DefaultConnectionString = DataManager.ConnectionString;
             DataAccess.DefaultDataBaseType = Curtain.DataAccess.DataBaseType.Oracle;
+            DataAccess.DefaultConnectionString = DataManager.ConnectionString;
         }
 
         /// <summary>

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")]