新增获取料号信息方法

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

@@ -8,6 +8,7 @@ public enum HelperType {
     CheckRoutePassed("CheckRoutePassed","检测岗位资源是否正确") , //检测岗位资源是否正确
     CheckUserAndResourcePassed("CheckUserAndResourcePassed","验证序列号执行工序") , //验证序列号执行工序
     GetAddressRangeByMO("GetAddressRangeByMO","分配MAC和BT信息") ,//分配MAC和BT信息
+    GetMaterialInfo("GetMaterialInfo","获取上料信息") ,//分配MAC和BT信息
     GetMEIOrNetCodeRange("GetMEIOrNetCodeRange","分配IMEI和NetCode信息") ,//分配IMEI和NetCode信息
     GetRcardMOInfo("GetRcardMOInfo","获取序列号对应工单信息") ,//获取序列号对应工单信息
     GetMobileAllInfo("GetMobileAllInfo","查询已分配的信息") ,//查询已分配的信息

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

@@ -91,6 +91,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case SetTestDetail:
 				remap = SetTestDetail(json);
 				break;
+			case GetMaterialInfo:
+				remap = GetMaterialInfo(json);
+				break;
 			case SetPcbaData:
 				remap = SetPcbaData(json);
 				break;
@@ -369,6 +372,48 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> GetMaterialInfo(JSONObject map){
+		Map<Object, Object> rmap = new HashMap<>();
+		String iSN="123";
+		String oErrMessage = null;
+		String Code1 = "";
+		String Code2 = "";
+		String Code3 = "";
+		String Code4 = "";
+		String Code5 = "";
+		String Code6 = "";
+		String Code7 = "";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iSN=map.get("iSN").toString();
+		String ms_id =baseDao.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "' or ms_firstsn='" + iSN + "'").toString();
+		List<String> list = new ArrayList<String>();
+		list = baseDao.callProcedureWithOut("GetMaterialInfo", new Object[]{
+				String.valueOf(ms_id),
+		}, new Integer[]{1}, new Integer[]{2,3,4,5,6,7,8,9,10,11,12,13,14,15,16});
+		Code1 = list.get(0);
+		Code2 = list.get(1);
+		Code3 = list.get(2);
+		Code4 = list.get(3);
+		Code5 = list.get(4);
+		Code6 = list.get(5);
+		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
+			rmap.put("BT",Code1);
+			rmap.put("MAC1",Code2);
+			rmap.put("RFID",Code3);
+			rmap.put("空白贴纸",Code4);
+			rmap.put("NFC",Code5);
+			rmap.put("主板",Code6);
+		}
+		else
+			rmap.put("oErrMessage",oErrMessage);
+		return rmap;
+	}
+
+
 	private Map<Object,Object> GetMEIOrNetCodeRange(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();