|
|
@@ -1,33 +1,27 @@
|
|
|
package com.uas.mes.pm.service.impl;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-
|
|
|
-import com.uas.mes.core.exception.SystemException;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Propagation;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
import com.uas.mes.common.dao.MakeDao;
|
|
|
import com.uas.mes.common.data.BaseDao;
|
|
|
+import com.uas.mes.common.data.SqlUtil;
|
|
|
import com.uas.mes.common.entity.MessageLog;
|
|
|
import com.uas.mes.common.support.HandlerService;
|
|
|
import com.uas.mes.common.support.SystemSession;
|
|
|
+import com.uas.mes.common.util.BaseUtil;
|
|
|
import com.uas.mes.core.bind.Constant;
|
|
|
import com.uas.mes.core.bind.Status;
|
|
|
import com.uas.mes.core.data.Assert;
|
|
|
import com.uas.mes.core.data.SqlRowList;
|
|
|
+import com.uas.mes.core.exception.SystemException;
|
|
|
import com.uas.mes.core.support.StateAssert;
|
|
|
-import com.uas.mes.common.util.BaseUtil;
|
|
|
import com.uas.mes.core.util.DateUtil;
|
|
|
import com.uas.mes.core.util.StringUtil;
|
|
|
-import com.uas.mes.common.data.SqlUtil;
|
|
|
import com.uas.mes.pm.service.MakeBaseService;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Propagation;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service("makeBaseService")
|
|
|
public class MakeBaseServiceImpl implements MakeBaseService {
|
|
|
@@ -1535,7 +1529,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_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)");
|
|
|
+ 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){
|
|
|
needField2 = "ms_imei1,ms_imei2,ms_imei3,MS_NETCODE,ms_othid1,ms_othid2,ms_othid3";
|
|
|
@@ -1545,7 +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 reworkdetail where rd_reid= "+re_id+" and rd_sncode = 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防呆
|
