综合报表=>成检缺陷汇总表=>成检缺陷明细=>新增一列 实验单 TP_PM_GROUTINGDAILYDETAIL 注浆明细表 字段 TESTFORMFLAG null为null 1为实验单 2为研发实验单

DK.Client/ReportModule/R03/M01/F_RPT_030106.resx

@@ -509,6 +509,9 @@
   <metadata name="TestMouldFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TESTFORMFLAG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -10834,7 +10834,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             }
 
             selSql +=
-            "     ,tmdd.DICTIONARYVALUE AS KilnLocation\n" +
+            "     ,tmdd.DICTIONARYVALUE AS KilnLocation,\n" +
+            " CASE "+
+            " WHEN gdd.TESTFORMFLAG IS NULL THEN NULL "+
+            " WHEN gdd.TESTFORMFLAG = 1 THEN '实验单' "+
+            " ELSE '研发实验单' "+
+            " END AS TESTFORMFLAG "+
             "  FROM tp_pm_defect pmd\n" +
             " INNER JOIN TP_PM_PRODUCTIONDATA PD\n" +
             "    ON PMD.PRODUCTIONDATAID = PD.PRODUCTIONDATAID\n" +