新增插件机抛料数据

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

@@ -52,12 +52,47 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 	@Override
 	public Map<Object,Object> UpLoadPCBInfo(String data){
-		Map<Object, Object> rmap = new HashMap<Object, Object>();
-
 		if(data != null && !data.isEmpty()){
 			baseDao.execute("insert into EISDATA(ed_id,ed_data,ed_indate,ED_TYPE)" +
 					"values(EISDATA_seq.nextval,?,sysdate,?)", data,"UpLoadPCBInfo");
 		}
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		JSONObject object = JSONObject.fromObject(data);
+
+		String equipmentId = Objects.toString(object.get("Equipment_ID"), "");
+		String programName = Objects.toString(object.get("Program_Name"), "");
+		String sn = Objects.toString(object.get("SN"), "");
+		String insertFinishStatus = Objects.toString(object.get("Insert_Filish_Status"), "");
+		String shift = Objects.toString(object.get("SHIFT"), "");
+		String lineName = Objects.toString(object.get("Line_Name"), "");
+		String testStation = Objects.toString(object.get("Test_Station"), "");
+		String fixtureId = Objects.toString(object.get("Fixture_ID"), "");
+
+		try{
+			baseDao.updateByCondition("steptestdetail", "std_subclass1 = '"+insertFinishStatus+"'", "std_class = '插件机' and std_sn = '" + sn + "'");
+
+			Object stdId = baseDao.getFieldDataByCondition("steptestdetail", "std_id", "std_class = '插件机' and std_sn = '" + sn + "'");
+
+			JSONArray rowArray = object.optJSONArray("row");
+			if (rowArray != null && !rowArray.isEmpty()) {
+				for (int i = 0; i < rowArray.size(); i++) {
+					JSONObject rowObj = rowArray.getJSONObject(i);
+					String feederStation = Objects.toString(rowObj.get("Feeder_Station"), "");
+					String materialCode  = Objects.toString(rowObj.get("Material_Code"), "");
+					String insertMaterialCount = Objects.toString(rowObj.get("Insert_Material_Count"), "");
+					String dropMaterialCount = Objects.toString(rowObj.get("Drop_Material_Count"), "");
+
+					baseDao.execute("INSERT INTO DIP_MATERIAL_LOG (DML_ID, DML_STDID, DML_SN," +
+							"DML_STATION, DML_MATERIAL_NO, DML_USED_QTY, DML_THROW_QTY, DML_INDATE) " +
+							"VALUES ( DIP_MATERIAL_LOG_SEQ.nextval, '"+stdId+"', '"+sn+"', " +
+							"'"+feederStation+"', '"+materialCode+"', '"+insertMaterialCount+"', '"+dropMaterialCount+"', SYSDATE )");
+				}
+			}
+		}catch(Exception ex){
+			rmap.put("code",1);
+			rmap.put("message","NG,上传MES系统失败," + ex.getMessage());
+			return rmap;
+		}
 
 		rmap.put("code",0);
 		rmap.put("message","OK,上传MES系统成功");
@@ -66,7 +101,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 	@Override
 	public Map<Object,Object> VerifySN(String data){
-
 		if(data != null && !data.isEmpty()){
 			baseDao.execute("insert into EISDATA(ed_id,ed_data,ed_indate,ED_TYPE)" +
 					"values(EISDATA_seq.nextval,?,sysdate,?)", data,"VerifySN");