|
|
@@ -1523,10 +1523,10 @@ public class MakeBaseServiceImpl implements MakeBaseService {
|
|
|
if(rs.getInt("ma_savemacbt")!= 0){
|
|
|
needField1 = "ms_mac,ms_bt,ms_othcode3,ms_othcode2, ms_othcode1";
|
|
|
}else{
|
|
|
- baseDao.execute("insert into makeaddresslist (mal_id,mal_makecode,mal_mac,mal_bt,mal_othcode1,mal_othcode2,mal_othcode3,mal_status, mal_indate,mal_inman) "
|
|
|
+ /*baseDao.execute("insert into makeaddresslist (mal_id,mal_makecode,mal_mac,mal_bt,mal_othcode1,mal_othcode2,mal_othcode3,mal_status, mal_indate,mal_inman) "
|
|
|
+" select makeaddresslist_seq.nextval,?,ms_mac,ms_bt,ms_othcode1, ms_othcode2, ms_othcode3,0,sysdate,?"
|
|
|
+" from rework left join reworkdetail on rd_reid=re_id left join makeserial on ms_sncode=rd_sncode "
|
|
|
- +" and ms_makecode=rd_scmacode where re_code=? and (nvl(ms_mac,' ')<>' ' or nvl(ms_bt,' ')<>' ')",ma_code,SystemSession.getUser().getEm_name(),re_code);
|
|
|
+ +" and ms_makecode=rd_scmacode where re_code=? and (nvl(ms_mac,' ')<>' ' or nvl(ms_bt,' ')<>' ')",ma_code,SystemSession.getUser().getEm_name(),re_code);*/
|
|
|
needField1 = "'','','','',''";
|
|
|
baseDao.execute("update sninfo set si_mac='',si_bt='',si_othcode1='',si_othcode2='',si_othcode3='' where exists(select 1 from reworkdetail where rd_reid= "+re_id+" and rd_sncode = si_sn)");
|
|
|
}
|
