Browse Source

SPI接口提交

callm 1 month ago
parent
commit
c7a2984efb

+ 8 - 0
src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -80,6 +80,14 @@ public class MESHelperController {
         return map;
     }
 
+    //追溯信息接口
+    @RequestMapping(value="/SPITestInfo")
+    public Map<Object,Object> SPITestInfo(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.SPITestInfo(json);
+        return map;
+    }
+
 
     //
     //天马电子秤对接接口

+ 2 - 0
src/main/java/com/uas/eis/service/MESHelperService.java

@@ -18,6 +18,8 @@ public interface MESHelperService {
 	Map<Object, Object> TraceabilityDataInterface(String data);
 	Map<Object, Object> XrayTestDataSave(String data);
 
+	Map<Object, Object> SPITestInfo(String data);
+
 	Map<Object, Object> SendPlaceData(String data);
 
 	Map<Object, Object> StateEventDetail(String data);

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

@@ -652,6 +652,67 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	public Map<Object,Object> SPITestInfo(String data){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		JSONObject object = JSONObject.fromObject(data);
+		String MachineID=object.get("MachineID").toString();
+		String MachineName=object.get("MachineName").toString();
+		String Operator=object.get("Operator").toString();
+		String Side=object.get("Side").toString();
+		String JobName=object.get("JobName").toString();
+		String LineName=object.get("LineName").toString();
+		String WorkStation=object.get("WorkStation").toString();
+		String WorkNo=object.get("WorkNo").toString();
+		String BoardBarCode=object.get("BoardBarCode").toString();
+		String BoardStatus=object.get("BoardStatus").toString();
+		String DateTime=object.get("DateTime").toString();
+		JSONArray Array = object.getJSONArray("Array");
+		int ID=baseDao.getSeqId("machine_seq");
+		baseDao.execute("insert into machine(MACHINEID, MACHINENAME, OPERATOR, SIDE, JOBNAME, LINENAME, WORKSTATION, WORKNO, BOARDBARCODE, BOARDSTATUS, DATETIME)" +
+				"values('"+ID+"','"+MachineName+"','"+Operator+"','"+Side+"','"+JobName+"','"+LineName+"','"+WorkStation+"','"+WorkNo+"','"+BoardBarCode+"','"+BoardStatus+"',to_date('"+DateTime+"','yyyy-mm-dd hh24:mi:ss'))");
+		if(Array!=null){
+			for (int i=0;i<Array.size();i++){
+				JSONObject map1=Array.getJSONObject(i);
+				String ArrayBarCode=map1.getString("ArrayBarCode");
+				String ArrayStatus=map1.getString("ArrayStatus");
+				int ARRAYID=baseDao.getSeqId("ARRAY_seq");
+				JSONArray Pads = map1.getJSONArray("Pads");
+				baseDao.execute("insert into array(ARRAYID, ARRAYSTATUS, ARRAYBARCODE, MACHINEID)" +
+								"values('"+ARRAYID+"','"+ArrayStatus+"','"+ArrayBarCode+"','"+ID+"')"
+					);
+				for (int j=0;j<Pads.size();j++){
+					JSONObject map2=Pads.getJSONObject(j);
+					String ComponentID=map2.get("ComponentID").toString();
+					String Type=map2.get("Type").toString();
+					String PerArea=map2.get("PerArea").toString();
+					String Height=map2.get("Height").toString();
+					String PerVolume=map2.get("PerVolume").toString();
+					String XOffset=map2.get("XOffset").toString();
+					String YOffset=map2.get("YOffset").toString();
+					String PadSizeX=map2.get("PadSizeX").toString();
+					String PadSizeY=map2.get("PadSizeY").toString();
+					String Area=map2.get("Area").toString();
+					String PerHeight=map2.get("PerHeight").toString();
+					String Volume=map2.get("Volume").toString();
+					String Result=map2.get("Result").toString();
+					String Errcode=map2.get("Errcode").toString();
+					String PinNum=map2.get("PinNum").toString();
+					String Barcode=map2.get("Barcode").toString();
+					String Date=map2.get("Date").toString();
+					String Time=map2.get("Time").toString();
+					int PADID=baseDao.getSeqId("pad_seq");
+					baseDao.execute("insert into pad(PADID, COMPONENTID, TYPE, PERAREA, HEIGHT, PERVOLUME, XOFFSET, YOFFSET, PADSIZEX, PADSIZEY, AREA, PERHEIGHT, VOLUME, RESULT, ERRCODE, PINNUM, BARCODE, DATE1, TIME, ARRAYID)" +
+							"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",PADID, ComponentID, Type, PerArea, Height, PerVolume,
+							XOffset, YOffset, PadSizeX, PadSizeY, Area, PerHeight, Volume, Result, Errcode, PinNum, Barcode, Date, Time, ARRAYID);
+				}
+			}
+			rmap.put("EventCode","0");
+			rmap.put("result","OK");
+			rmap.put("ServerMessage","数据录入成功");
+		}
+		return rmap;
+	}
+
 	public String Time(String time){
 		return time.replaceAll("T"," ").substring(0,19);
 	}