|
|
@@ -1529,7 +1529,7 @@ public class MakeBaseServiceImpl implements MakeBaseService {
|
|
|
+" 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);
|
|
|
needField1 = "'','','','',''";
|
|
|
- baseDao.execute("update sninfo set si_mac='',si_bt='',si_othcode1='',si_othcode2='',si_othcode3='' where exists(select 1 from makeserial join reworkdetail on rd_sncode = ms_sncode and rd_prodcode = ms_prodcode where" +
|
|
|
+ baseDao.execute("update sninfo set si_mac='',si_bt='',si_othcode1='',si_othcode2='',si_othcode3='' where exists(select 1 from makeserial join reworkdetail on rd_sncode = ms_sncode and rd_prodcode = ms_prodcode where " +
|
|
|
" rd_reid= "+re_id+" and (ms_sncode = si_sn or ms_code = si_sn))");
|
|
|
}
|
|
|
if(rs.getInt("ma_saveimei")!= 0){
|
|
|
@@ -1540,8 +1540,8 @@ public class MakeBaseServiceImpl implements MakeBaseService {
|
|
|
+" 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_imei1,' ')<>' 'or nvl(ms_netcode,' ')<>' ')",ma_code,SystemSession.getUser().getEm_name(),re_code);
|
|
|
needField2 = "'','','','','','',''";
|
|
|
- baseDao.execute("update sninfo set si_imei1='',si_imei2='',si_imei3='',si_othid1='',si_othid2='',si_othid3='',si_netcode='' where exists(select 1 from makeserial join reworkdetail on rd_sncode = ms_sncode and rd_prodcode = ms_prodcode where" +
|
|
|
- "rd_reid= "+re_id+" and (ms_sncode = si_sn or ms_code = si_sn))");
|
|
|
+ baseDao.execute("update sninfo set si_imei1='',si_imei2='',si_imei3='',si_othid1='',si_othid2='',si_othid3='',si_netcode='' where exists(select 1 from makeserial join reworkdetail on rd_sncode = ms_sncode and rd_prodcode = ms_prodcode where " +
|
|
|
+ " rd_reid= "+re_id+" and (ms_sncode = si_sn or ms_code = si_sn))");
|
|
|
}
|
|
|
|
|
|
//插入数据值makesnlist,根据返工需求单字段是否SN防呆
|
