gkg上线治具核对是否检测

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -730,6 +730,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 					code = 222;
 					returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"未领用出库,校验失败.\n";
 				}
+				
+				if(baseDao.checkIf("configs","code = 'GkgCheck' AND data = 1")){
+					SqlRowList fRs1 = baseDao.queryForRowSet("select * from steptestdetail where std_subclass1 =(SELECT su_id FROM (SELECT su_id FROM stenciluse " +
+							"WHERE su_stcode = '"+FrontSqueegeeSN+"' AND su_status = '领用' ORDER BY su_usedate DESC) WHERE ROWNUM = 1) and std_indate > trunc(sysdate)");
+					if(fRs1.size() == 0){
+						code = 222;
+						returnmessage = returnmessage + "刮刀:"+FrontSqueegeeSN+"未使用测试仪检测,校验失败.\n";
+					}
+				}
 			}
 			if(!RearSqueegeeSN.isEmpty())
 			{
@@ -747,6 +756,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 					code = 222;
 					returnmessage = returnmessage + "刮刀:"+RearSqueegeeSN+"未领用出库,校验失败.\n";
 				}
+
+				if(baseDao.checkIf("configs","code = 'GkgCheck' AND data = 1")){
+					SqlRowList fRs1 = baseDao.queryForRowSet("select * from steptestdetail where std_subclass1 =(SELECT su_id FROM (SELECT su_id FROM stenciluse " +
+							"WHERE su_stcode = '"+RearSqueegeeSN+"' AND su_status = '领用' ORDER BY su_usedate DESC) WHERE ROWNUM = 1) and std_indate > trunc(sysdate)");
+					if(fRs1.size() == 0){
+						code = 222;
+						returnmessage = returnmessage + "刮刀:"+RearSqueegeeSN+"未使用测试仪检测,校验失败.\n";
+					}
+				}
 			}
 			if(!StencilSN.isEmpty() )
 			{
@@ -764,6 +782,15 @@ public class MESHelperServiceImpl implements MESHelperService {
 					code = 222;
 					returnmessage = returnmessage + "钢网:"+StencilSN+"未清洗出库,校验失败.\n";
 				}
+
+				if(baseDao.checkIf("configs","code = 'GkgCheck' AND data = 1")){
+					SqlRowList fRs1 = baseDao.queryForRowSet("select * from steptestdetail where std_subclass1 =(SELECT su_id FROM (SELECT su_id FROM stenciluse " +
+							"WHERE su_stcode = '"+StencilSN+"' AND su_status = '领用' ORDER BY su_usedate DESC) WHERE ROWNUM = 1) and std_indate > trunc(sysdate)");
+					if(fRs1.size() == 0){
+						code = 222;
+						returnmessage = returnmessage + "钢网:"+StencilSN+"未使用测试仪检测,校验失败.\n";
+					}
+				}
 			}
 			/*if(!baseDao.checkIf("SPMBARCODE","nvl(SPB_STATUS,'') = '已开封' and SPB_BARCODE = '"+PasteSN+"'"))
 			{