【万利达MES】【接料原物料号校验复核】【功能优化】【接料原物料号校验自动复核】

src/com/uas/mes/pda/service/impl/PdaSMTServiceImpl.java

@@ -1317,14 +1317,15 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 			mapR.put("NotCheckCount",0);
 		}
 		if(success){
-		Integer psl_id = baseDao.getJdbcTemplate().queryForObject("select max(psl_id) from productsmtlocation where psl_psid=? and psl_table=? and (psl_location,psl_prodcode) "
-				+" not in(select dsl_location,dsl_fprodcode from devsmtlocation where dsl_linecode=? "
-				+" and dsl_makecode=? and dsl_status=0 and dsl_ifcheck=-1)",Integer.class,ps_id,table,linecode,ma_code);
-		if(psl_id == null || psl_id == 0){
-			baseDao.execute("update deviceline set dl_checkcount=nvl(dl_checkcount,0)+1 where dl_id=?",dl_id);
-			baseDao.execute("update devsmtlocation set dsl_ifcheck = 0 where dsl_linecode=? and dsl_makecode=? and dsl_table=? and dsl_status=0",linecode,ma_code,table);
-			baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"校验","完成一次校验",linecode,"",0,map.get("DL_PRODCODE"),"",map.get("DL_TABLE"),Integer.valueOf(returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("hasmake").toString()) == -1 ? returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("macode"):"");
-		}
+			Integer psl_id = baseDao.getJdbcTemplate().queryForObject("select max(psl_id) from productsmtlocation where psl_psid=? and psl_table=? and (psl_location,psl_prodcode) "
+					+" not in(select dsl_location,dsl_fprodcode from devsmtlocation where dsl_linecode=? "
+					+" and dsl_makecode=? and dsl_status=0 and dsl_ifcheck=-1)",Integer.class,ps_id,table,linecode,ma_code);
+			if(psl_id == null || psl_id == 0){
+				baseDao.execute("update deviceline set dl_checkcount=nvl(dl_checkcount,0)+1 where dl_id=?",dl_id);
+				baseDao.execute("update devsmtlocation set dsl_ifcheck = 0 where dsl_linecode=? and dsl_makecode=? and dsl_table=? and dsl_status=0",linecode,ma_code,table);
+				baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"校验","完成一次校验",linecode,"",0,map.get("DL_PRODCODE"),"",map.get("DL_TABLE"),Integer.valueOf(returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("hasmake").toString()) == -1 ? returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("macode"):"");
+				baseDao.execute("update smtmessagelog  set sml_confirm = -1 where sml_linecode  = '"+linecode+"' and sml_type = '接料原物料号校验' and sml_location = '"+location+"' and sml_date > sysdate-1/3 and sml_talbe = '"+map.get("DL_TABLE")+"'");
+			}
 		}
 		 return mapR;
 	}
@@ -1468,6 +1469,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 				SqlRowList rs = baseDao.queryForRowSet("select dl_prodcode,dl_table from deviceline where dl_linecode = ?",linecode);
 				if(rs.next()){
 					baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"校验","重新校验",linecode,"",0,rs.getString("dl_prodcode"),"",rs.getString("dl_table"),Integer.valueOf(returnMake(linecode,rs.getString("dl_prodcode"),rs.getString("dl_table")).get("hasmake").toString()) == -1 ? returnMake(linecode,rs.getString("dl_prodcode"),rs.getString("dl_table")).get("macode"):"");
+					baseDao.execute("update smtmessagelog  set sml_confirm = -1 where  sml_type = '接料原物料号校验' and sml_linecode  = '"+linecode+"' and sml_date > sysdate-1/3 and sml_talbe = '"+rs.getString("dl_table")+"'");
 				}
 			 return unLoading(linecode);
 		}