Browse Source

添加写入DPK接口

callm 17 hours ago
parent
commit
7ecb3dd5b0

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

@@ -34,6 +34,7 @@ public enum HelperType {
     GetProdInfo("GetProdInfo","根据物料获取相关信息"),
     GetProdInfo("GetProdInfo","根据物料获取相关信息"),
     WriteMakeInfo("WriteMakeInfo","写入工单相关参数"),
     WriteMakeInfo("WriteMakeInfo","写入工单相关参数"),
     SetHashValue("SetHashValue","写入SN对应的HashValue"),
     SetHashValue("SetHashValue","写入SN对应的HashValue"),
+    SetCRBValue("SetCRBValue","写入SN对应的HashValue"),
     GetHashValue("GetHashValue","获取SN对应的HashValue"),
     GetHashValue("GetHashValue","获取SN对应的HashValue"),
     Weigh("Weigh","添加称重接口"),
     Weigh("Weigh","添加称重接口"),
     GetEDISN("GetEDISN","获取EDI的SN进行召回重置"),
     GetEDISN("GetEDISN","获取EDI的SN进行召回重置"),

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

@@ -157,6 +157,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case SetHashValue:
 			case SetHashValue:
 				remap = SetHashValue(json,AE_MASTER);
 				remap = SetHashValue(json,AE_MASTER);
 				break;
 				break;
+			case SetCRBValue:
+				remap = SetCRBValue(json,AE_MASTER);
+				break;
 			case GetHashValue:
 			case GetHashValue:
 				remap = GetHashValue(json,AE_MASTER);
 				remap = GetHashValue(json,AE_MASTER);
 				break;
 				break;
@@ -331,6 +334,37 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 		return rmap;
 	}
 	}
 
 
+	private Map<Object,Object> SetCRBValue(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("MECHREVO_CBR","mc_makecode='"+makecode+"' and mc_sncode='"+iSN+"'")){
+			baseDao.execute("delete from MECHREVO_CBR where mc_makecode='"+makecode+"' and mc_sncode='"+iSN+"'");
+		}
+
+		baseDao.execute("insert into MECHREVO_CBR(MC_ID, MC_MAKECODE, MC_SNCODE, MC_HASHVALUE, MC_INDATE)" +
+				"values(MECHREVO_CBR_seq.nextval,'"+makecode+"','"+iSN+"','"+iHashValue+"',sysdate)");
+		rmap.put("oErrMessage",null);
+		return rmap;
+	}
+
 	private Map<Object,Object> GetMakeInfo(JSONObject map,String Master){
 	private Map<Object,Object> GetMakeInfo(JSONObject map,String Master){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN=null;
 		String iSN=null;