添加获取屏幕条码接口

src/main/java/com/uas/eis/entity/HelperType.java

@@ -20,6 +20,7 @@ public enum HelperType {
     GoMo("GoMo","检测XXX") ,//序列号归属工单
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
     GetPCBABySN("GetPCBABySN","根据上料信息获取到SN相关信息"),
+    GetLCDBySN("GetPCBABySN","根据上料信息获取到SN相关信息"),
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息"),
     GetMakeInfoByProd("GetMakeInfoByProd","根据物料获取相关信息"),
     GetPSN("GetPSN","获取转号后的SN"),

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

@@ -103,6 +103,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case GetPCBABySN:
 				remap = GetPCBABySN(json,AE_MASTER);
 				break;
+			case GetLCDBySN:
+				remap = GetLCDBySN(json,AE_MASTER);
+				break;
 			case GoMo:
 				remap = GoMo(json,AE_MASTER);
 				break;
@@ -363,7 +366,6 @@ public class MESHelperServiceImpl implements MESHelperService {
 	}
 
 	private Map<Object,Object> GetPCBABySN(JSONObject map,String Master){
-		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iSN="";
 		String oErrMessage="";
@@ -373,9 +375,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		iSN=map.get("iSN").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select ms_firstsn from  "+AE_MASTER+".makeserial  where ms_sncode='"+iSN+"' order by ms_id desc");
+		SqlRowList rs=baseDao.queryForRowSet("select ms_firstsn from  "+Master+".makeserial  where ms_sncode='"+iSN+"' order by ms_id desc");
 		if(rs.next()){
-			rs=baseDao.queryForRowSet("select cm_barcode from "+AE_MASTER+".craftmaterial left join product on cm_fsoncode=pr_code " +
+			rs=baseDao.queryForRowSet("select cm_barcode from "+Master+".craftmaterial left join "+Master+".product on cm_fsoncode=pr_code " +
 					"where cm_firstsn='"+rs.getString("ms_firstsn")+"' and cm_status=0 and (pr_detail like '%PCBA%' or pr_detail like '%主板%')");
 			if(rs.next()){
 				rmap.put("oPCBA",rs.getString("cm_barcode"));
@@ -384,8 +386,29 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> GetLCDBySN(JSONObject map,String Master){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String iSN="";
+		String oErrMessage="";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iSN=map.get("iSN").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select ms_firstsn from  "+Master+".makeserial  where ms_sncode='"+iSN+"' order by ms_id desc");
+		if(rs.next()){
+			rs=baseDao.queryForRowSet("select cm_barcode from "+Master+".craftmaterial left join "+Master+".product on cm_fsoncode=pr_code " +
+					"where cm_firstsn='"+rs.getString("ms_firstsn")+"' and cm_status=0 and (pr_kind2='屏')");
+			if(rs.next()){
+				rmap.put("oPCBA",rs.getString("cm_barcode"));
+			}
+		}
+		return rmap;
+	}
+
+
 	private Map<Object,Object> GetInfoByMaterial(JSONObject map,String Master){
-		Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		String iPCBA=null;
 		String oErrMessage=null;
@@ -395,16 +418,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		iPCBA=map.get("iPCBA").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select nvl(max(ms_id),0)ms_id from "+AE_MASTER+".CRAFTMATERIAL left join "+AE_MASTER+".makeserial on ms_firstsn=cm_firstsn  where cm_barcode='"+iPCBA+"' and nvl(cm_status,0)<>-1 order by cm_id desc");
+		SqlRowList rs=baseDao.queryForRowSet("select nvl(max(ms_id),0)ms_id from "+Master+".CRAFTMATERIAL left join "+Master+".makeserial on ms_firstsn=cm_firstsn  where cm_barcode='"+iPCBA+"' and nvl(cm_status,0)<>-1 order by cm_id desc");
 		if(rs.next()){
 			if(!rs.getString("ms_id").equals("0")){
-				rs=baseDao.queryForRowSet("select ma_bios,ma_ec,ms_sncode,ma_hardware from "+AE_MASTER+".makeserial left join "+AE_MASTER+".make on ms_makecode=ma_code where ms_id='"+rs.getString("ms_id")+"'");
+				rs=baseDao.queryForRowSet("select ma_bios,ma_ec,ms_sncode,ma_hardware from "+Master+".makeserial left join "+Master+".make on ms_makecode=ma_code where ms_id='"+rs.getString("ms_id")+"'");
 				if (rs.next()){
 					rmap.put("oSN",rs.getString("ms_sncode"));
 					rmap.put("oBIOS",rs.getString("ma_bios"));
 					rmap.put("oEC",rs.getString("ma_ec"));
 					rmap.put("oHardWare",rs.getString("ma_hardware"));
-					rmap.put("oMaster",AE_MASTER);
+					rmap.put("oMaster",Master);
 				}
 			}else{
 				oErrMessage = "主板SN未查询到关联信息";