上料时间修改

src/main/java/com/uas/eis/controller/MESHelperController.java

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

src/main/java/com/uas/eis/service/MESHelperService.java

@@ -14,6 +14,7 @@ public interface MESHelperService {
 	Map<Object, Object> SetupResultDataInterface(String data);
 
 	Map<Object, Object> TraceabilityDataInterface(String data);
+	Map<Object, Object> XrayTestDataSave(String data);
 
 	Map<Object, Object> SendPlaceData(String data);
 

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

@@ -292,6 +292,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		JSONObject SetupResultDetail=obj.getJSONObject("SetupResultDetail");
 		if(SetupResultDetail!=null){
 			String ActionType=SetupResultDetail.get("ActionType").toString();
+			String MessageSendTime=Time(SetupResultDetail.getString("MessageSendTime"));
 			String LineName=SetupResultDetail.get("LineName").toString();
 			String MachineName=SetupResultDetail.get("MachineName").toString();
 			String OrderNumber=SetupResultDetail.get("OrderNumber").toString();
@@ -326,9 +327,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}
 				int sr_id=baseDao.getSeqId("SETUPRESULTDETAIL_seq");
 				baseDao.execute("insert into SETUPRESULTDETAIL(sr_id,ACTIONTYPE,LINENAME,ORDERNUMBER,MACHINENAME," +
-						"TABLEID,DOCKINGSTATIONID,OPERATOR,TableLocation,FeederTypeName,FeederID)values('"+sr_id+"'," +
+						"TABLEID,DOCKINGSTATIONID,OPERATOR,TableLocation,FeederTypeName,FeederID,MessageSendTime)values('"+sr_id+"'," +
 						"'"+ActionType+"','"+LineName+"','"+OrderNumber+"','"+MachineName+"','"+TableId+"','"+DockingStationID+"'," +
-						"'"+Operator+"','"+TableLocation+"','"+FeederTypeName+"','"+FeederID+"')");
+						"'"+Operator+"','"+TableLocation+"','"+FeederTypeName+"','"+FeederID+"',to_date('"+MessageSendTime+"','yyyy-mm-dd hh24:mi:ss'))");
 				int pu_id=baseDao.getSeqId("PACKAGINGUNIT_seq");
 				baseDao.execute("insert into PACKAGINGUNIT(PU_ID,PU_SRID,ComponentBarcode,OriginalQuantity,Quantity,CreateDate," +
 						"DateCode,BatchId,MsdLevel)values('"+pu_id+"','"+sr_id+"','"+ComponentBarcode+"','"+OriginalQuantity+"','"+Quantity+"',to_date('"+CreateDate+"','yyyy-mm-dd hh24:mi:ss')," +
@@ -556,6 +557,34 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	public Map<Object,Object> XrayTestDataSave(String data){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		Map<String, Object> map=null;
+		JSONObject object = JSONObject.fromObject(data);
+		JSONArray object1=object.getJSONArray("NonconformData");
+		Object Barcode=object.get("Barcode");
+		Object EquipmentEncode=object.get("EquipmentEncode");
+		Object ModelType=object.get("ModelType");
+		Object CheckNumber=object.get("CheckNumber");
+		Object NcmNumber=object.get("NcmNumber");
+		Object NonconformNumber=object.get("NonconformNumber");
+		Object CheckDate=object.get("CheckDate");
+		Object ShiftName=object.get("ShiftName");
+		Object LineBody=object.get("LineBody");
+		Object Inspector=object.get("Inspector");
+
+
+		for (int i=0;i<object1.size();i++){
+			JSONObject map1=object1.getJSONObject(i);
+			System.out.println(map1.getString("NonconformANo"));
+			System.out.println(map1.getString("NonconformDescription"));
+		}
+//		for (Map.Entry<Object, Object> entry : object1) {
+//			System.out.println(entry.getKey());
+//		}
+		return rmap;
+	}
+
 	public String Time(String time){
 		return time.replaceAll("T"," ").substring(0,19);
 	}