Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs

@@ -210,6 +210,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                                                 ""泄露性试验"",
                                                 ""设计压力"",
                                                 ""设计温度"",
+                                                ""压力试验压力"",
                                                 ""耐压试验"",
                                                  ""外径"",
                                                  ""壁厚"",
@@ -348,10 +349,10 @@ namespace FineUIPro.Web.HJGL.DataIn
                                 case "设计温度":
                                     isoInfo.ISO_DesignTemperature = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
                                     break;
-                                case "耐压试验":
+                                case "压力试验压力":
                                     if (isoInfo.ISO_DesignPress.HasValue)
                                     {
-                                        isoInfo.ISO_TestPress = isoInfo.ISO_DesignPress.Value * 1.5m;
+                                        isoInfo.ISO_TestPress = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
                                     }
                                     break;
                                 case "外径":