添加三个接口

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

@@ -40,6 +40,9 @@ public enum HelperType {
     Weigh("Weigh","添加称重接口"),
     GetEDISN("GetEDISN","获取EDI的SN进行召回重置"),
     GetMechRevoKey("GetMechRevoKey","获取Key信息"),
+    GetTestRevoKey("GetTestRevoKey","获取Key信息"),
+    SetTestValue("SetTestValue","写入SN对应的HashValue"),
+    GetTestValue("SetCRBValue","写入SN对应的HashValue"),
     GetMakeInfo("GetMakeInfo","获取工单相关参数");
     ;
 

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

@@ -166,6 +166,18 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case GetCRBValue:
 				remap = GetCRBValue(json,AE_MASTER);
 				break;
+			case GetTestValue:
+				remap = GetTestValue(json,AE_MASTER);
+				break;
+			case SetTestValue:
+				remap = SetTestValue(json,AE_MASTER);
+				break;
+			case GetMechRevoKey:
+				remap = GetMechRevoKey(json,AE_MASTER);
+				break;
+			case GetTestRevoKey:
+				remap = GetTestRevoKey(json,AE_MASTER);
+				break;
 			case Weigh:
 				remap = Weigh(json,AE_MASTER);
 				break;
@@ -324,6 +336,25 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> GetTestValue(JSONObject map,String Master){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String oErrMessage="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		String iSN=map.get("iSN").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select MC_HASHVALUE from test_CBR where MC_SNCODE='"+iSN+"'");
+		if(rs.next()){
+			rmap.put("oCRBValue",rs.getString("MC_HASHVALUE"));
+		}else{
+			rmap.put("oCRBValue","");
+		}
+		return rmap;
+	}
+
+
 	private Map<Object,Object> SetHashValue(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String oErrMessage="";
@@ -386,6 +417,37 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> SetTestValue(JSONObject map,String Master){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String oErrMessage="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("iCRBValue")==null){
+			oErrMessage = "HashValue不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		String iSN=map.get("iSN").toString();
+		String iHashValue=map.get("iCRBValue").toString();
+		Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
+		if(makecode==null){
+			oErrMessage = "SN:"+iSN+"不存在";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(baseDao.checkIf("test_CBR","mc_makecode='"+makecode+"' and mc_sncode='"+iSN+"'")){
+			baseDao.execute("delete from test_CBR where mc_makecode='"+makecode+"' and mc_sncode='"+iSN+"'");
+		}
+
+		baseDao.execute("insert into test_CBR(MC_ID, MC_MAKECODE, MC_SNCODE, MC_HASHVALUE, MC_INDATE)" +
+				"values(test_CBR.nextval,'"+makecode+"','"+iSN+"','"+iHashValue+"',sysdate)");
+		rmap.put("oErrMessage",null);
+		return rmap;
+	}
+
 	private Map<Object,Object> GetMakeInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
@@ -937,6 +999,35 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> GetTestRevoKey(JSONObject map,String Master){
+		Map<Object, Object> rmap = new HashMap<>();
+		String iSN="";
+		String MK_DPK="";
+		String MK_DPKID="";
+		String oErrMessage="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		List<String> list = new ArrayList<String>();
+		iSN=map.get("iSN").toString();
+		list = baseDao.callProcedureWithOut(Master+".CS_GETTESTREVOKYE", new Object[]{
+				String.valueOf(iSN),
+				String.valueOf(""),
+		}, new Integer[]{1,2}, new Integer[]{3,4,5});
+		MK_DPK = list.get(0);
+		MK_DPKID =  list.get(1);
+		oErrMessage= list.get(2);
+		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
+			rmap.put("oDPK",MK_DPK);
+			rmap.put("oDPKID",MK_DPKID);
+		}
+		else
+			rmap.put("oErrMessage",oErrMessage);
+		return rmap;
+	}
+
 	private Map<Object,Object> GetMEIOrNetCodeRangeByPo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();