Browse Source

添加Key获取接口

callm 2 weeks ago
parent
commit
d01e22a43c

+ 1 - 0
src/main/java/com/uas/eis/entity/HelperType.java

@@ -42,6 +42,7 @@ public enum HelperType {
     WeighCarton("WeighCarton","添加卡通箱称重接口"),
     GetEDISN("GetEDISN","获取EDI的SN进行召回重置"),
     GetMechRevoKey("GetMechRevoKey","获取Key信息"),
+    GetReleaseKey("GetReleaseKey","获取Key信息"),
     GetTestRevoKey("GetTestRevoKey","获取Key信息"),
     SetTestValue("SetTestValue","写入SN对应的HashValue"),
     GetTestValue("GetTestValue","写入SN对应的HashValue"),

+ 40 - 0
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -82,6 +82,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case GetMechRevoKey:
 				remap = GetMechRevoKey(json,AE_MASTER);
 				break;
+			case GetReleaseKey:
+				remap = GetReleaseKey(json,AE_MASTER);
+				break;
 			case GetRcardMOInfo:
 				remap = GetRcardMOInfo(json,AE_MASTER);
 				break;
@@ -1185,6 +1188,43 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> GetReleaseKey(JSONObject map,String Master){
+		Map<Object, Object> rmap = new HashMap<>();
+		String iSN="";
+		String iCustCode="";
+		String MK_DPK="";
+		String MK_DPKID="";
+		String oErrMessage="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("iCustCode")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		List<String> list = new ArrayList<String>();
+		iSN=map.get("iSN").toString();
+		iCustCode=map.get("iCustCode").toString();
+		list = baseDao.callProcedureWithOut(Master+".CS_GETRELEASE_KEY", new Object[]{
+				String.valueOf(iSN),
+				String.valueOf(""),
+				String.valueOf(iCustCode),
+		}, new Integer[]{1,2,3}, new Integer[]{4,5,6});
+		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> GetMechRevoKey(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<>();
 		String iSN="";