接口调整

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

@@ -285,7 +285,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 	@Override
 	public Map<Object,Object> SetupResultDataInterface(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
+
 		JSONObject object = JSONObject.fromObject(data);
+		Object object1 = object.get("data");
+		JSONObject obj = JSONObject.fromObject(object1);
+		JSONObject SetupResultDetail=obj.getJSONObject("SetupResultDetail");
 		JSONObject SetupResultDetail=object.getJSONObject("SetupResultDetail");
 		if(SetupResultDetail!=null){
 			String ActionType=SetupResultDetail.get("ActionType").toString();
@@ -373,6 +377,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 	public Map<Object,Object> StateEventDetail(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		JSONObject object = JSONObject.fromObject(data);
+		Object object1 = object.get("data");
+		JSONObject obj = JSONObject.fromObject(object1);
+		JSONObject StateEventDetail=obj.getJSONObject("StateEventDetail");
 		JSONObject StateEventDetail=object.getJSONObject("StateEventDetail");
 		if(StateEventDetail!=null){
 			int st_id=baseDao.getSeqId("StateEventDetail_seq");
@@ -428,6 +435,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 	public Map<Object,Object> SendPlaceData(String data) {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		JSONObject object = JSONObject.fromObject(data);
+		Object object1 = object.get("data");
+		JSONObject obj = JSONObject.fromObject(object1);
+		JSONObject PlacedDataDetail=obj.getJSONObject("PlacedDataDetail");
 		JSONObject PlacedDataDetail=object.getJSONObject("PlacedDataDetail");
 		if(PlacedDataDetail!=null){
 			int pd_id=baseDao.getSeqId("PlacedDataDetail_seq");
@@ -521,6 +531,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Integer td_id=baseDao.getSeqId("TRACEDATA_seq");
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		JSONObject object = JSONObject.fromObject(data);
+		Object object1 = object.get("data");
+		JSONObject obj = JSONObject.fromObject(object1);
+		JSONObject TraceabilityDataDetail=obj.getJSONObject("TraceabilityDataDetail");
 		JSONObject TraceabilityDataDetail=object.getJSONObject("TraceabilityDataDetail");
 		if(TraceabilityDataDetail!=null){
 			String DateBegin=Time(TraceabilityDataDetail.get("DateBegin").toString());
@@ -687,7 +700,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(rs.next()){
 			lotSN=rs.getString("ms_sncode");
 		}else{
-			 rs=baseDao.queryForRowSet("select mil_sncode from  makeimeilist where mil_imei1='"+lotSN+"' or mil_imei2='"+lotSN+"' or mil_imei3='"+lotSN+"'");
+			rs=baseDao.queryForRowSet("select mil_sncode from  makeimeilist where mil_imei1='"+lotSN+"' or mil_imei2='"+lotSN+"' or mil_imei3='"+lotSN+"'");
 			if(rs.next()){
 				lotSN=rs.getString("mil_sncode");
 			}
@@ -2029,3 +2042,4 @@ public class MESHelperServiceImpl implements MESHelperService {
 	}
 
 }
+