修改获取流程码接口

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

@@ -997,8 +997,24 @@ public class MESHelperServiceImpl implements MESHelperService {
 			System.out.printf(e.getMessage()) ;
 			return rmap;
 		}
-
 		String iSN=map.get("iSN").toString();
+		String oErrMessage="";
+		String iResCode=map.get("iResCode").toString();
+		String iGetTsn=baseDao.getFieldDataByCondition("source left join step on SC_STEPCODE=st_code", "nvl(st_getsn,'0')", "sc_code='" + iResCode + "'").toString();
+		if (!iGetTsn.equals("0"))
+		{
+			SqlRowList dt =baseDao.queryForRowSet("select ms_firstsn,ms_sncode from CRAFTMATERIAL left join make on cm_makecode=ma_code " +
+					"left join makeserial on ms_firstsn=cm_firstsn and cm_makecode=ms_makecode  where cm_barcode='" + iSN + "' and nvl(cm_status,0)<>-1 order by cm_id desc");
+			if (dt.next())
+			{
+				iSN = dt.getString("ms_sncode");
+			}
+			else
+			{
+				oErrMessage = "主板SN未查询到关联信息";
+			}
+		}
+
 		SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from  makeserial where ms_imei1='"+iSN+"' or ms_imei2='"+iSN+"' or ms_imei3='"+iSN+"'");
 		if(rs.next()){
 			iSN=rs.getString("ms_sncode");
@@ -1008,8 +1024,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 				iSN=rs.getString("mil_sncode");
 			}
 		}
-		String iResCode=map.get("iResCode").toString();
-		String oErrMessage="";
 		Integer code=0;
 		if (iSN ==null)
 		{
@@ -1685,7 +1699,25 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
+		String iResCode = null;
+		String iOperator = null;
+		String iResult = null;
+		String iErrCode = null;
 		String iSN=map.get("iSN").toString();
+		String iGetTsn=baseDao.getFieldDataByCondition("source left join step on SC_STEPCODE=st_code", "nvl(st_getsn,'0')", "sc_code='" + iResCode + "'").toString();
+		if (!iGetTsn.equals("0"))
+		{
+			SqlRowList dt =baseDao.queryForRowSet("select ms_firstsn,ms_sncode from CRAFTMATERIAL left join make on cm_makecode=ma_code " +
+					"left join makeserial on ms_firstsn=cm_firstsn and cm_makecode=ms_makecode  where cm_barcode='" + iSN + "' and nvl(cm_status,0)<>-1 order by cm_id desc");
+			if (dt.next())
+			{
+				iSN = dt.getString("ms_sncode");
+			}
+			else
+			{
+				oErrMessage = "主板SN未查询到关联信息";
+			}
+		}
 		SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from  makeserial where ms_imei1='"+iSN+"' or ms_imei2='"+iSN+"' or ms_imei3='"+iSN+"'");
 		if(rs.next()){
 			iSN=rs.getString("ms_sncode");
@@ -1695,10 +1727,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				iSN=rs.getString("mil_sncode");
 			}
 		}
-		String iResCode = null;
-		String iOperator = null;
-		String iResult = null;
-		String iErrCode = null;
+
 		if(map.get("iResCode")!=null){
 			iResCode=map.get("iResCode").toString();
 		}