浏览代码

Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/HEGII.ss.mes.web

qinqi 1 年之前
父节点
当前提交
575bd0bcff
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      wwwroot/mes/pm/radtestformgoods/testformgoods.ashx

+ 2 - 1
wwwroot/mes/pm/radtestformgoods/testformgoods.ashx

@@ -258,7 +258,8 @@ public class testformgoods : IHttpHandler, IReadOnlySessionState
 	            FROM
 		            GOODS G
 		            --3#质量登记 105
-		            INNER JOIN PRODUCTIONDATA P ON G.BARCODE = P.BARCODE AND P.PROCEDUREID = 105
+		            INNER JOIN PRODUCTIONDATA P ON G.BARCODE = P.BARCODE AND  P.MODELTYPE IN (-1, -4, -5)
+                                           AND P.CHECKBATCHNO = 1
 		            LEFT JOIN TP_SYS_GOODSLEVELTYPE GLT ON P.GOODSLEVELTYPEID = GLT.GOODSLEVELTYPEID 
 		            LEFT JOIN TP_PM_DEFECT D ON P.PRODUCTIONDATAID = D.PRODUCTIONDATAID
 	            WHERE