IMEI接口调整

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -800,12 +800,24 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		SqlRowList rs=baseDao.queryForRowSet("select ms_makecode from makeserial where ms_sncode='"+iSN+"' order by ms_id desc");
 		if(rs.next()){
-			String makecode=rs.getString("ms_makecode");
-			rs=baseDao.queryForRowSet("select mil_imei1 from makeimeilist where mil_makecode='"+makecode+"' and mil_imei1='"+iIMEI1+"'");
-			if(!rs.next()){
-				rmap.put("oErrMessage","IMEI:"+iIMEI1+"不在工单"+makecode+"导入清单中,不允许回传");
-				return rmap;
+			if(iIMEI1!=null){
+				String makecode=rs.getString("ms_makecode");
+				rs=baseDao.queryForRowSet("select mil_imei1 from makeimeilist where mil_makecode='"+makecode+"' and mil_imei1='"+iIMEI1+"'");
+				if(!rs.next()){
+					rmap.put("oErrMessage","IMEI1:"+iIMEI1+"不在工单"+makecode+"导入清单中,不允许回传");
+					return rmap;
+				}
 			}
+			if(iIMEI2!=null){
+				String makecode=rs.getString("ms_makecode");
+				rs=baseDao.queryForRowSet("select mil_imei2 from makeimeilist where mil_makecode='"+makecode+"' and mil_imei2='"+iIMEI2+"'");
+				if(!rs.next()){
+					rmap.put("oErrMessage","IMEI2:"+iIMEI2+"不在工单"+makecode+"导入清单中,不允许回传");
+					return rmap;
+				}
+			}
+
+
 		}
 		List<String> list = new ArrayList<String>();
 		list = baseDao.callProcedureWithOut("CS_SETIMEIINFO", new Object[]{