|
|
@@ -862,10 +862,11 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
SqlRowList rs=baseDao.queryForRowSet("SELECT spb_id,nvl(spb_use_count,1) spb_use_count FROM spmbarcode WHERE spb_barcode = ?",SolderCode);
|
|
|
if(rs.next()){
|
|
|
String curCount = rs.getString("spb_use_count");
|
|
|
- if(Node.contains("回温")){
|
|
|
- baseDao.updateByCondition("spmbarcode", "spb_status = '"+Node+"',spb_update_time = to_date('"+ScanTime+"','yyyy-mm-dd hh24:mi:ss'),spb_use_count = '"+ Integer.parseInt(curCount) + 1 +"'", "spb_barcode='" + SolderCode + "'");
|
|
|
+ if(Node.contains("回温开始")){
|
|
|
+ int spb_use_count = Integer.parseInt(curCount) + 1;
|
|
|
+ baseDao.updateByCondition("spmbarcode", "spb_status = '"+Node+"',spb_update_time = to_date('"+ScanTime+"','yyyy-mm-dd hh24:mi:ss'),spb_use_count = '"+ spb_use_count +"'", "spb_barcode='" + SolderCode + "'");
|
|
|
|
|
|
- baseDao.execute("INSERT INTO spmlog ( spl_id, spl_date, spl_operation, spl_operator, spl_barcode, spl_user_count, spl_equipment,spl_sysname) VALUES ( spmlog_seq.NEXTVAL, TO_DATE(?, 'yyyy-mm-dd hh24:mi:ss'), ?, ?, ?, ?, ?,?)",ScanTime,Node,UserName,SolderCode,Integer.parseInt(curCount) + 1,Station,SysName);
|
|
|
+ baseDao.execute("INSERT INTO spmlog ( spl_id, spl_date, spl_operation, spl_operator, spl_barcode, spl_user_count, spl_equipment,spl_sysname) VALUES ( spmlog_seq.NEXTVAL, TO_DATE(?, 'yyyy-mm-dd hh24:mi:ss'), ?, ?, ?, ?, ?,?)",ScanTime,Node,UserName,SolderCode,spb_use_count,Station,SysName);
|
|
|
rmap.put("Result","OK");
|
|
|
rmap.put("Meassage", Node +": 记录成功");
|
|
|
}else{
|
|
|
@@ -990,8 +991,8 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
- rmap.put("Result", "NG");
|
|
|
- rmap.put("Meassage", "系统异常 ");
|
|
|
+ rmap.put("Result", "OK");
|
|
|
+ rmap.put("Meassage", "成功");
|
|
|
|
|
|
return rmap;
|
|
|
}
|