Ver código fonte

更新点料机

yhluo 1 semana atrás
pai
commit
f778b15b4f

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

@@ -63,6 +63,14 @@ public class MESHelperController {
         return map;
     }
 
+    // 首件检测仪
+    @RequestMapping(value="/FirstInspect")
+    public Map<Object,Object> FirstInspect(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.FirstInspect(json);
+        return map;
+    }
+
     //抛料数据接口
     @RequestMapping(value="/StateEventDetail")
     public Map<Object,Object> StateEventDetail(HttpServletRequest request,  @RequestBody String json){

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

@@ -17,6 +17,8 @@ public interface MESHelperService {
 
 	Map<Object, Object> StencilInspect(String data);
 
+	Map<Object, Object> FirstInspect(String data);
+
 	Map<Object, Object> SetupResultDataInterface(String data);
 
 	Map<Object, Object> TraceabilityDataInterface(String data);

+ 17 - 2
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -792,7 +792,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}
 		ReelId=map.get("ReelId").toString();
 		Quantity=map.get("Quantity").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select bar_id,bar_prodcode,bar_remain,pr_spec,to_char(nvl(bar_madedate,sysdate),'yyyy-mm-dd')bar_madedate from barcode@ERP_JMDZ_HF left join product on bar_prodcode = pr_code where bar_code=?",ReelId);
+		SqlRowList rs=baseDao.queryForRowSet("select bar_id,bar_prodcode,bar_remain,pr_spec,to_char(nvl(bar_madedate,sysdate),'yyyy-mm-dd')bar_madedate from barcode left join product on bar_prodcode = pr_code where bar_code=?",ReelId);
 		if(rs.next()){
 			baseDao.execute("update barcode@ERP_JMDZ_HF set bar_remain=?,bar_status = 2 where bar_id=?",Quantity,rs.getString("bar_id"));
 			baseDao.execute("insert into barcodechange@ERP_JMDZ_HF(BC_ID,BC_INDATE, BC_REASON, BC_QTY, BC_BARCODE,  BC_PRODCODE, BC_NEWQTY)" +
@@ -879,7 +879,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
-
 	@Override
 	public Map<Object,Object> StencilInspect(String data){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
@@ -976,6 +975,22 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	@Override
+	public Map<Object,Object> FirstInspect(String data){
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			System.out.printf(e.getMessage()) ;
+		}
+
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		rmap.put("Result", "NG");
+		rmap.put("Meassage", "系统异常 ");
+
+		return rmap;
+	}
+
 	@Override
 	public Map<Object,Object> DLLMain(String accessKey, String requestId, String data) {
 		String AE_MASTER = "N_MES";