|
|
@@ -1299,7 +1299,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
|
|
|
baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"校验",meg+",料号:"+prodcode,linecode,location,i,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"):"");
|
|
|
if(success)
|
|
|
{
|
|
|
- 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_table = '"+map.get("DL_TABLE")+"'");
|
|
|
+ baseDao.execute("update smtmessagelog set sml_confirm = -1 where sml_linecode = '"+linecode+"' and sml_type = '接料原物料号校验' and sml_location = '"+location+"' and sml_date > sysdate-1/2 and sml_table = '"+map.get("DL_TABLE")+"'");
|
|
|
}
|
|
|
//ps_id,table,linecode,ma_code,table
|
|
|
Map<String,Object> mapR = new HashMap <String, Object>();
|
|
|
@@ -1473,7 +1473,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_table = '"+rs.getString("dl_table")+"'");
|
|
|
+ baseDao.execute("update smtmessagelog set sml_confirm = -1 where sml_type = '接料原物料号校验' and sml_linecode = '"+linecode+"' and sml_date > sysdate-1/2 and sml_table = '"+rs.getString("dl_table")+"'");
|
|
|
}
|
|
|
return unLoading(linecode);
|
|
|
}
|