成检缺陷汇总表增加实验单单号

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

@@ -341,6 +341,9 @@
   <metadata name="SEMIUSER3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TestFormName.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>
@@ -455,6 +458,9 @@
   <metadata name="dxj.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TestFormName2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="protime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -9903,6 +9903,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"     ,(SELECT * FROM (SELECT USERCODE FROM TP_PM_PRODUCTIONDATA WHERE BARCODE = PMD.BARCODE AND ROWNUM = 1 AND PROCEDUREID IN (76,58 ) AND VALUEFLAG = 1 ORDER BY CREATETIME DESC)) AS SEMIUSER2" +      //取1#二检工序最后操作的人，与谢经理确认。不然会出现多条值
 				"     ,(SELECT * FROM (SELECT USERCODE FROM TP_PM_PRODUCTIONDATA WHERE BARCODE = PMD.BARCODE AND ROWNUM = 1 AND PROCEDUREID IN(4,35) AND VALUEFLAG = 1 ORDER BY CREATETIME DESC)) AS WATERUSER2" +    //取1#上水工序最后操作的人，与谢经理确认。不然会出现多条值
 				"	  ,(SELECT USERCODE FROM TP_PM_PRODUCTIONDATA WHERE BARCODE = PMD.BARCODE   AND VALUEFLAG = 1 AND PROCEDUREID = 56) AS SEMIUSER3" +
+				"     , CONCAT( TESTFORM2.ID, TESTFORM2.NAME ) AS TESTFORMNAME " +
 				"  FROM tp_pm_defect pmd\n" +
 				"  LEFT JOIN TP_MST_Goods g\n" +
 				"    ON pmd.Goodsid = g.Goodsid\n" +
@@ -9939,7 +9940,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"  LEFT JOIN TP_MST_DefectFine mstdf\n" +
 				"    ON pmd.DefectFine = mstdf.DefectFineID\n" +
 				"  LEFT JOIN tp_mst_logo logo\n" +
-				"    ON pd.logoid = logo.logoid\n";
+				"    ON pd.logoid = logo.logoid\n" +
+				"  LEFT JOIN TP_PM_TESTFORM2_GOODS TESTFORM2G\n" +
+				"    ON TESTFORM2G.BARCODE = pmd.barcode\n" +
+				"  LEFT JOIN TP_PM_TESTFORM2 TESTFORM2\n" +
+				"    ON TESTFORM2G.TESTFORMGUID = TESTFORM2.ID\n"; 
+				;
 				//"  LEFT JOIN (SELECT def.barcode, wmsys.wm_concat( to_char(def.defectcode)) alldefectcode\n" +
 				//"               FROM tp_pm_defect def\n" +
 				//"              WHERE def.valueflag = '1'\n" +
@@ -10275,6 +10281,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"           0\n" +
 				"        END AS undoflag\n" +
 				"        ,TMDD.DICTIONARYVALUE AS KILNCARPOSITION\n" +
+				"     , CONCAT( TESTFORM2.ID, TESTFORM2.NAME ) AS TESTFORMNAME " +
 				"  FROM tp_pm_defect pmd\n" +
 				"  LEFT JOIN TP_PC_Procedure p\n" +
 				"    ON p.procedureid = pmd.procedureid\n" +
@@ -10331,7 +10338,11 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"  LEFT JOIN TP_MST_DataDictionary TMDD ON pd.KILNCARPOSITION = TMDD.DICTIONARYID\n" +
 				"  AND TMDD.DICTIONARYTYPE = 'TPC003'\n" +
 				"  LEFT JOIN TP_PM_GROUTINGDAILYDETAIL TEST ON TEST.barcode = pd.barcode\n" +
-				" WHERE pmd.valueflag = '1' \n" +
+				"  LEFT JOIN TP_PM_TESTFORM2_GOODS TESTFORM2G\n" +
+				"    ON TESTFORM2G.BARCODE = pmd.barcode\n" +
+				"  LEFT JOIN TP_PM_TESTFORM2 TESTFORM2\n" +
+				"    ON TESTFORM2G.TESTFORMGUID = TESTFORM2.ID\n"+
+			" WHERE pmd.valueflag = '1' \n" +
 				"   AND pd.ModelType = -1\n" +
 				"   AND pmd.AccountID = :AccountID\n";