update 钢网清洗仪和锡膏柜接口

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

@@ -47,6 +47,22 @@ public class MESHelperController {
         return map;
     }
 
+    // 锡膏柜接口
+    @RequestMapping(value="/SendSolderExecuteNode")
+    public Map<Object,Object> SendSolderExecuteNode(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.SendSolderExecuteNode(json);
+        return map;
+    }
+
+    // 钢网清洗测试仪
+    @RequestMapping(value="/StencilInspect")
+    public Map<Object,Object> StencilInspect(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.StencilInspect(json);
+        return map;
+    }
+
     //抛料数据接口
     @RequestMapping(value="/StateEventDetail")
     public Map<Object,Object> StateEventDetail(HttpServletRequest request,  @RequestBody String json){

src/main/java/com/uas/eis/dao/BaseDao.java

@@ -120,6 +120,7 @@ public class BaseDao{
 			jdbcTemplate.update(sql, objs);
 			return true;
 		} catch (Exception e) {
+			e.printStackTrace();
 			return false;
 		}
 	}

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

@@ -13,6 +13,10 @@ public interface MESHelperService {
 
 	Map<Object, Object> UploadReelInfo(String data);
 
+	Map<Object, Object> SendSolderExecuteNode(String data);
+
+	Map<Object, Object> StencilInspect(String data);
+
 	Map<Object, Object> SetupResultDataInterface(String data);
 
 	Map<Object, Object> TraceabilityDataInterface(String data);

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

@@ -813,6 +813,169 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	@Override
+	public Map<Object,Object> SendSolderExecuteNode(String data) {
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String SolderCode="",ScanTime ="",Station ="",Node ="";
+		String SysName = "",UserName ="";
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			System.out.printf(e.getMessage()) ;
+		}
+		if(map.get("SolderCode")==null){
+			rmap.put("Result","NG");
+			rmap.put("Meassage","锡膏条码不能为空");
+			return rmap;
+		}
+		if(map.get("ScanTime")==null){
+			rmap.put("Result","NG");
+			rmap.put("Meassage","扫描时间不能为空");
+			return rmap;
+		}
+		if(map.get("Station")==null){
+			rmap.put("Result","NG");
+			rmap.put("Meassage","设备编码不能为空");
+			return rmap;
+		}
+		if(map.get("Node")==null){
+			rmap.put("Result","NG");
+			rmap.put("Meassage","当前节点状态不能为空");
+			return rmap;
+		}
+
+		SolderCode=map.get("SolderCode").toString();
+		ScanTime=map.get("ScanTime").toString();
+		Station=map.get("Station").toString();
+		Node=map.get("Node").toString();
+
+		UserName=map.get("UserName").toString();
+		SysName=map.get("SysName").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=?",SolderCode);
+		SqlRowList rs=baseDao.queryForRowSet("SELECT spb_id,nvl(spb_use_count,1) spb_use_count FROM spmbarcode WHERE spb_barcode = ?",SolderCode);
+		if(rs.next()){
+			String curCount = rs.getString("spb_use_count");
+			if(Node.contains("回温")){
+				baseDao.updateByCondition("spmbarcode", "spb_status = '"+Node+"',spb_update_time = to_date('"+ScanTime+"','yyyy-mm-dd hh24:mi:ss'),spb_use_count = '"+ Integer.parseInt(curCount) + 1 +"'", "spb_barcode='" + SolderCode + "'");
+
+				baseDao.execute("INSERT INTO spmlog ( spl_id, spl_date, spl_operation, spl_operator, spl_barcode, spl_user_count, spl_equipment,spl_sysname) VALUES ( spmlog_seq.NEXTVAL, TO_DATE(?, 'yyyy-mm-dd hh24:mi:ss'), ?, ?, ?, ?, ?,?)",ScanTime,Node,UserName,SolderCode,Integer.parseInt(curCount) + 1,Station,SysName);
+				rmap.put("Result","OK");
+				rmap.put("Meassage", Node +": 记录成功");
+			}else{
+				baseDao.updateByCondition("spmbarcode", "spb_status = '"+Node+"',spb_update_time = to_date('"+ScanTime+"','yyyy-mm-dd hh24:mi:ss'),spb_use_count = '"+ curCount +"'", "spb_barcode='" + SolderCode + "'");
+
+				baseDao.execute("INSERT INTO spmlog ( spl_id, spl_date, spl_operation, spl_operator, spl_barcode, spl_user_count, spl_equipment,spl_sysname) VALUES ( spmlog_seq.NEXTVAL, TO_DATE(?, 'yyyy-mm-dd hh24:mi:ss'), ?, ?, ?, ?, ?,?)",ScanTime,Node,UserName,SolderCode,curCount,Station,SysName);
+				rmap.put("Result","OK");
+				rmap.put("Meassage",Node +": 记录成功");
+			}
+
+		}else {
+			rmap.put("Result","NG");
+			rmap.put("Meassage","锡膏条码不存在,请先录入锡膏");
+			return rmap;
+		}
+		return rmap;
+	}
+
+
+	@Override
+	public Map<Object,Object> StencilInspect(String data){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String MeshCode ="",InspectMode ="";
+
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			System.out.printf(e.getMessage()) ;
+		}
+
+		if(map.get("MeshCode")==null){
+			rmap.put("Result","NG");
+			rmap.put("Meassage","钢网编码不能为空");
+			return rmap;
+		}
+		InspectMode=map.get("InspectMode").toString();
+		MeshCode = map.get("MeshCode").toString();
+
+		Map<Object, Object> paramsMap = new HashMap<Object, Object>();
+		Map<Object, Object> paramsMap1 = new HashMap<Object, Object>();
+		try{
+			SqlRowList rs=baseDao.queryForRowSet("SELECT st_id,st_line,nvl(st_cleannums, 0) st_cleannums FROM stencil WHERE st_kind = '钢网' AND st_code = ?",MeshCode);
+			if(rs.next()){
+				String cleannums = rs.getString("st_cleannums");
+
+				SqlRowList rs1=baseDao.queryForRowSet("SELECT stenciluse_seq.NEXTVAL seq FROM dual");
+				if(rs1.next()){
+					paramsMap.put("su_id",rs1.getString("seq"));
+					paramsMap.put("su_useman",map.get("Inspector").toString());
+					paramsMap.put("su_stcode",MeshCode);
+
+					paramsMap.put("su_stid",rs.getString("st_id"));
+					paramsMap.put("su_status",InspectMode);
+					paramsMap.put("su_linecode",rs.getString("st_line"));
+
+					paramsMap.put("su_usedate",map.get("InspectTime").toString());
+					paramsMap.put("su_ensiona",map.get("Tension1").toString());
+					paramsMap.put("su_ensionb",map.get("Tension2").toString());
+					paramsMap.put("su_ensionc",map.get("Tension3").toString());
+					paramsMap.put("su_ensiond",map.get("Tension4").toString());
+					paramsMap.put("su_ensione",map.get("Tension5").toString());
+					if(InspectMode.contains("清洗")){
+						paramsMap.put("su_cleannums",Integer.parseInt(cleannums) + 1);
+						baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"stenciluse"));
+					}else{
+						paramsMap.put("su_cleannums",cleannums);
+						baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"stenciluse"));
+					}
+
+//					paramsMap1.put("std_id","steptestdetail_seq.NEXTVAL");
+					paramsMap1.put("std_class",InspectMode);
+					paramsMap1.put("STD_SUBCLASS1",rs1.getString("seq"));
+					paramsMap1.put("STD_DATE",map.get("InspectTime").toString());
+
+					paramsMap1.put("STD_VALUE1",map.get("DeviceCode").toString());
+					paramsMap1.put("STD_VALUE2",map.get("action").toString());
+					paramsMap1.put("STD_VALUE3",map.get("Inspector").toString());
+					paramsMap1.put("STD_VALUE4",map.get("HoleResult").toString());
+					paramsMap1.put("STD_VALUE5",map.get("TensionResult").toString());
+
+					paramsMap1.put("STD_VALUE6",map.get("InspectResult").toString());
+					paramsMap1.put("STD_VALUE7",map.get("InspectState").toString());
+					paramsMap1.put("STD_VALUE8",map.get("SizeErrNum").toString());
+					paramsMap1.put("STD_VALUE9",map.get("LocationErrNum").toString());
+					paramsMap1.put("STD_VALUE10",map.get("SurplusNum").toString());
+
+					paramsMap1.put("STD_VALUE11",map.get("InsufficientNum").toString());
+					paramsMap1.put("STD_VALUE12",map.get("AreaErrNum").toString());
+					paramsMap1.put("STD_VALUE13",map.get("ForeignMatterNum").toString());
+					paramsMap1.put("STD_VALUE14",map.get("PlugHoleNum").toString());
+					paramsMap1.put("STD_VALUE15",map.get("OtherErrNum").toString());
+					paramsMap1.put("STD_VALUE16",map.get("ErrCount").toString());
+					paramsMap1.put("STD_VALUE17",map.get("HoleCount").toString());
+
+					baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap1,"steptestdetail"));
+
+					rmap.put("Result","OK");
+					rmap.put("Meassage",InspectMode +": 记录成功");
+				}else{
+					rmap.put("Result","NG");
+					rmap.put("Meassage","获取序列失败");
+				}
+			}else {
+				rmap.put("Result","NG");
+				rmap.put("Meassage","钢网条码不存在,请先录入钢网");
+				return rmap;
+			}
+		}catch(Exception e){
+			rmap.put("Result", "NG");
+			rmap.put("Meassage", "系统异常: " + e.getMessage());
+		}
+		return rmap;
+	}
+
 	@Override
 	public Map<Object,Object> DLLMain(String accessKey, String requestId, String data) {
 		String AE_MASTER = "N_MES";