|
|
@@ -94,6 +94,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case SetTestDetail:
|
|
|
remap = SetTestDetail(json,AE_MASTER);
|
|
|
break;
|
|
|
+ case SetHashValue:
|
|
|
+ remap = SetHashValue(json,AE_MASTER);
|
|
|
+ break;
|
|
|
case SetPcbaData:
|
|
|
remap = SetPcbaData(json,AE_MASTER);
|
|
|
break;
|
|
|
@@ -950,6 +953,55 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
|
|
|
+ private Map<Object,Object> SetHashValue(JSONObject map,String Master){
|
|
|
+ //实际业务数据
|
|
|
+ Map<Object, Object> rmap = new HashMap<>();
|
|
|
+ String oErrMessage=null;
|
|
|
+ if(map.get("iSN")==null){
|
|
|
+ oErrMessage = "SN不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ String iSN=map.get("iSN").toString();
|
|
|
+ String iTestResult= "";
|
|
|
+ String iResCode= "";
|
|
|
+ String iClassName="";
|
|
|
+ String iTestDetail= "";
|
|
|
+ String iMaxValue= "";
|
|
|
+ String iMinValue= "";
|
|
|
+ if(map.get("iTestResult")!=null){
|
|
|
+ iTestResult=map.get("iTestResult").toString();
|
|
|
+ }
|
|
|
+ if(map.get("iClassName")!=null){
|
|
|
+ iClassName=map.get("iClassName").toString();
|
|
|
+ }
|
|
|
+ if(map.get("iResCode")!=null){
|
|
|
+ iResCode=map.get("iResCode").toString();
|
|
|
+ }
|
|
|
+ if(map.get("iTestDetail")!=null){
|
|
|
+ iTestDetail=map.get("iTestDetail").toString();
|
|
|
+ }
|
|
|
+ JSONObject map3=new JSONObject();
|
|
|
+ map3.put("iSN",iSN);
|
|
|
+ Map<Object, Object> map2=GetRcardMOInfo(map3,Master);
|
|
|
+ String omakeCode = "";
|
|
|
+ StringBuffer sql=new StringBuffer();
|
|
|
+ String[] name=iClassName.split("\\|");
|
|
|
+ String[] value=iTestDetail.split("\\|");
|
|
|
+ if(name.length!=value.length){
|
|
|
+ rmap.put("oErrMessage","测试项目名称和值的项次不一致");
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ for (int i=0;i<name.length;i++){
|
|
|
+ sql.setLength(0);
|
|
|
+ sql.append("Insert into "+Master+".HARDWARESOFTWARE (HS_SNCODE,HS_MAKECODE, HS_IITEM, HS_IITEMVALUES, HS_INDATE)");
|
|
|
+ sql.append("values('" + iSN + "','" + map2.get("oMoCode") + "',?,?,sysdate)");
|
|
|
+ baseDao.execute(sql.toString(),name[i],value[i]);
|
|
|
+ }
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+
|
|
|
private Map<Object,Object> SetTestDetail(JSONObject map,String Master){
|
|
|
//实际业务数据
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|