优化spi cpk aoi轨道、测试仪刮刀信息

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

@@ -148,7 +148,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 				rmap.put("message", "NG,参数缺少必要节点: SPIRecord");
 				return rmap;
 			}
-
 			JSONObject record = JSONObject.fromObject(object.get("SPIRecord"));
 			String Username   = record.optString("Username", "");
 			String Shiftname  = record.optString("Shiftname", "");
@@ -164,6 +163,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 			String TestQTY    = record.optString("TestQTY", "");
 			String Time       = record.optString("Time", "");
 
+			String AreaCPK		= record.optString("AreaCPK", "");
+			String HeightCPK	= record.optString("HeightCPK", "");
+			String VolumeCPK	= record.optString("VolumeCPK", "");
+			String Track = "";
+			int lastIndex = MachineNO.lastIndexOf("-");
+			if (lastIndex > -1) {
+				Track = MachineNO.substring(lastIndex + 1);
+				MachineNO = MachineNO.substring(0, lastIndex);
+			}
+
 			if (Time.contains("T")) {
 				Time = Time.substring(0, 19).replaceAll("T", " ");
 			}
@@ -198,6 +207,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 				paramsMap.put("DTI_SOURCECONTENT","");
 				paramsMap.put("dti_elementQTY",elementQTY);
 				paramsMap.put("dti_side",Side);
+
+				paramsMap.put("DTI_AREACPK",AreaCPK);
+				paramsMap.put("DTI_HEIGHTCPK",HeightCPK);
+				paramsMap.put("DTI_VOLUMECPK",VolumeCPK);
+				paramsMap.put("DTI_TRACK",Track);
 				baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"devicetestinfo"));
 			}
 			String oErrMessage=null;
@@ -263,6 +277,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 			String TestQTY    = record.optString("TestQTY", "");
 			String Type       = record.optString("Type", "AOI");
 			String Time       = record.optString("Time", "");
+			String Track = "";
+			int lastIndex = MachineNO.lastIndexOf("-");
+			if (lastIndex > -1) {
+				Track = MachineNO.substring(lastIndex + 1);
+				MachineNO = MachineNO.substring(0, lastIndex);
+			}
 
 			if (Time.contains("T")) {
 				Time = Time.substring(0, 19).replaceAll("T", " ");
@@ -298,6 +318,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				paramsMap.put("DTI_SOURCECONTENT", "");
 				paramsMap.put("dti_elementQTY", elementQTY);
 				paramsMap.put("dti_side", Side);
+				paramsMap.put("DTI_TRACK",Track);
 				baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap, "devicetestinfo"));
 			}
 
@@ -1262,53 +1283,85 @@ public class MESHelperServiceImpl implements MESHelperService {
 	@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){
+		JSONObject jsonObj = JSONObject.fromObject(data);
+		String DeviceCode   = jsonObj.optString("DeviceCode", "");
+		String MeshCode   = jsonObj.optString("MeshCode", "");
+		String InspectTime   = jsonObj.optString("InspectTime", "");
+		String InspectMode   = jsonObj.optString("Inspector", "");
+		String WorkOrderNo   = jsonObj.optString("WorkOrderNo", "");
+
+		if(MeshCode ==null){
 			rmap.put("Result","NG");
-			rmap.put("Meassage","钢网编码不能为空");
+			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,st_usestatus FROM stencil WHERE st_kind = '钢网' AND st_code = ?",MeshCode);
+			SqlRowList rs=baseDao.queryForRowSet("SELECT st_id,st_line,st_usestatus,st_kind,nvl(st_cleannums, 0) st_cleannums FROM stencil WHERE st_code = ?",MeshCode);
 			if(rs.next()){
 				String cleannums = rs.getString("st_cleannums");
 				String usestatus = rs.getString("st_usestatus");
-
+				String stKind = rs.getString("st_kind");
 				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_stcode",MeshCode);
 					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());
+					paramsMap.put("su_usemacode",WorkOrderNo);
+					paramsMap.put("su_usedate",InspectTime);
 					if(usestatus == "在库"){
 						paramsMap.put("su_status","领用");
+						baseDao.updateByCondition("stencil", "st_usestatus = '出库'", "st_code='" + MeshCode + "'");
 					}else if(usestatus == "出库"){
 						paramsMap.put("su_status","归还");
+						baseDao.updateByCondition("stencil", "st_usestatus = '在库'", "st_code='" + MeshCode + "'");
 					}
 
+					paramsMap1.put("std_class",InspectMode);
+					paramsMap1.put("STD_SUBCLASS1",rs1.getString("seq"));
+					paramsMap1.put("STD_SUBCLASS2",stKind);
+					paramsMap1.put("STD_DATE",InspectTime);
+					paramsMap1.put("STD_VALUE1",DeviceCode);
+					paramsMap1.put("STD_VALUE2",jsonObj.optString("action", ""));
+					paramsMap1.put("STD_VALUE3",jsonObj.optString("Inspector", ""));
+
+					if(stKind == "钢网"){
+						paramsMap.put("su_ensiona",jsonObj.optString("Tension1", ""));
+						paramsMap.put("su_ensionb",jsonObj.optString("Tension2", ""));
+						paramsMap.put("su_ensionc",jsonObj.optString("Tension3", ""));
+						paramsMap.put("su_ensiond",jsonObj.optString("Tension4", ""));
+						paramsMap.put("su_ensione",jsonObj.optString("Tension5", ""));
+
+						paramsMap1.put("STD_VALUE4",jsonObj.optString("HoleResult", ""));
+						paramsMap1.put("STD_VALUE5",jsonObj.optString("TensionResult", ""));
+						paramsMap1.put("STD_VALUE6",jsonObj.optString("InspectResult", ""));
+						paramsMap1.put("STD_VALUE7",jsonObj.optString("InspectState", ""));
+						paramsMap1.put("STD_VALUE8",jsonObj.optString("SizeErrNum", ""));
+
+						paramsMap1.put("STD_VALUE9",jsonObj.optString("LocationErrNum", ""));
+						paramsMap1.put("STD_VALUE10",jsonObj.optString("SurplusNum", ""));
+						paramsMap1.put("STD_VALUE11",jsonObj.optString("InsufficientNum", ""));
+						paramsMap1.put("STD_VALUE12",jsonObj.optString("AreaErrNum", ""));
+						paramsMap1.put("STD_VALUE13",jsonObj.optString("ForeignMatterNum", ""));
+
+						paramsMap1.put("STD_VALUE14",jsonObj.optString("PlugHoleNum", ""));
+						paramsMap1.put("STD_VALUE15",jsonObj.optString("OtherErrNum", ""));
+						paramsMap1.put("STD_VALUE16",jsonObj.optString("ErrCount", ""));
+						paramsMap1.put("STD_VALUE17",jsonObj.optString("HoleCount", ""));
+					}else if(stKind == "刮刀"){
+						paramsMap1.put("STD_VALUE4",jsonObj.optString("TestResult", ""));
+						paramsMap1.put("STD_VALUE5",jsonObj.optString("ScrapSegma", ""));
+						paramsMap1.put("STD_VALUE6",jsonObj.optString("NlightWay", ""));
+						paramsMap1.put("STD_VALUE7",jsonObj.optString("Startpt", ""));
+						paramsMap1.put("STD_VALUE8",jsonObj.optString("Stoppt", ""));
+
+						paramsMap1.put("STD_VALUE9",jsonObj.optString("Gaprange", ""));
+						paramsMap1.put("STD_VALUE10",jsonObj.optString("MaxGap", ""));
+						paramsMap1.put("STD_VALUE11",jsonObj.optString("MinGap", ""));
+						paramsMap1.put("STD_VALUE12",jsonObj.optString("ChkSide", ""));
+					}
 					if(InspectMode.contains("清洗")){
 						paramsMap.put("su_cleannums",Integer.parseInt(cleannums) + 1);
 						baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"stenciluse"));
@@ -1316,52 +1369,12 @@ public class MESHelperServiceImpl implements MESHelperService {
 						paramsMap.put("su_cleannums",cleannums);
 						baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"stenciluse"));
 					}
-
-					if(usestatus == "在库"){
-						baseDao.updateByCondition("stencil", "st_usestatus = '出库'", "st_code='" + MeshCode + "'");
-					}else{
-						baseDao.updateByCondition("stencil", "st_usestatus = '在库'", "st_code='" + MeshCode + "'");
-					}
-
-//					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){
+		}catch (Exception e){
 			rmap.put("Result", "NG");
 			rmap.put("Meassage", "系统异常: " + e.getMessage());
 		}