[行之成EIS]增加自动线屏加工作业判断SN是否存在更换屏幕不良

src/main/java/com/uas/eis/entity/HelperType.java

@@ -20,7 +20,9 @@ public enum HelperType {
     GoMo("GoMo","检测XXX") ,//序列号归属工单
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息"),
-    SetBpMaterial("SetBpMaterial","自动线摆盘物料上到SN");
+    SetBpMaterial("SetBpMaterial","自动线摆盘物料上到SN"),
+
+    GetSnRepm("GetSnRepm","判断SN是否存在更换屏幕记录");
 
     private String code;
     private String name;

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

@@ -967,6 +967,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case SetBpMaterial:
 				remap = SetBpMaterial(json);
 				break;
+			case GetSnRepm:
+				remap = GetSnRepm(json);
+				break;
 			default:
 				err = -1;
 				break;
@@ -2087,6 +2090,39 @@ public class MESHelperServiceImpl implements MESHelperService {
 	}
 
 
+	private Map<Object,Object> GetSnRepm(JSONObject map)
+	{
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String iSN=null;
+		String oErrMessage=null;
+		String mbr_solutionname=null;
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iSN=map.get("iSN").toString();
+		SqlRowList rs = baseDao.queryForRowSet("select mbr_solutionname from makebad left join MAKEBADREASON on mb_id = mbr_mbid where mb_sncode = ? order by mb_id desc",iSN);
+		if (rs.next())
+		{
+			mbr_solutionname = rs.getString("mbr_solutionname");
+			if ("更换屏幕".equals(mbr_solutionname)) {
+				oErrMessage = "需要更换屏幕";
+			}else
+			{
+				oErrMessage = "不需要更换屏幕";
+			}
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}else
+		{
+			oErrMessage = "SN"+iSN+"没有不良记录";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+	}
+
+
 	private Map<Object,Object> SetBpMaterial(JSONObject map)
 	{
 		Map<Object, Object> rmap = new HashMap<Object, Object>();