|
|
@@ -66,13 +66,31 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
|
|
|
@Override
|
|
|
public Map<Object,Object> VerifySN(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,"VerifySN");
|
|
|
}
|
|
|
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ JSONObject object = JSONObject.fromObject(data);
|
|
|
+
|
|
|
+ String Equipment_ID = object.get("Equipment_ID").toString();
|
|
|
+ String Program_Name = object.get("Program_Name").toString();
|
|
|
+ String SN = object.get("SN").toString();
|
|
|
+ String SHIFT = object.get("SHIFT").toString();
|
|
|
+ String Line_Name = object.get("Line_Name").toString();
|
|
|
+ String Test_Station = object.get("Test_Station").toString();
|
|
|
+ String Fixture_ID = object.get("Fixture_ID").toString();
|
|
|
+
|
|
|
+ Object msMakecode = Objects.toString(baseDao.getFieldDataByCondition("makeserial","ms_makecode","ms_sncode ='"+SN+"'"), "");
|
|
|
+ baseDao.execute("INSERT INTO steptestdetail( std_id, std_makecode, std_sn,std_class," +
|
|
|
+ "std_actualvalue, std_value1, std_value2, std_value3," +
|
|
|
+ "std_value4, std_value5) VALUES " +
|
|
|
+ "(steptestdetail_seq.NEXTVAL, '"+msMakecode+"', '"+SN+"', '插件机'," +
|
|
|
+ "'"+Program_Name+"', '"+Equipment_ID+"', '"+SHIFT+"', '"+Line_Name+"'," +
|
|
|
+ "'"+Test_Station+"', '"+Fixture_ID+"')");
|
|
|
+
|
|
|
rmap.put("code",0);
|
|
|
rmap.put("message","OK,上传MES系统成功");
|
|
|
return rmap;
|
