获取电池条码

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

@@ -23,6 +23,7 @@ public enum HelperType {
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
     GetPCBABySN("GetPCBABySN","根据上料信息获取到SN相关信息"),
     GetLCDBySN("GetLCDBySN","根据上料信息获取到SN相关信息"),
+    GetBatteryBySN("GetBatteryBySN","根据上料信息获取到SN相关信息"),
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息"),
     GetMakeInfoByProd("GetMakeInfoByProd","根据物料获取相关信息"),
     GetPSN("GetPSN","获取转号后的SN"),

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

@@ -112,6 +112,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case GetLCDBySN:
 				remap = GetLCDBySN(json,AE_MASTER);
 				break;
+			case GetBatteryBySN:
+				remap = GetBatteryBySN(json,AE_MASTER);
+				break;
 			case GoMo:
 				remap = GoMo(json,AE_MASTER);
 				break;
@@ -521,7 +524,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		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_detail like '%PCBA%' or pr_detail like '%主板%')");
+					"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"));
 			}
@@ -529,6 +532,8 @@ 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="";
@@ -550,6 +555,26 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> GetBatteryBySN(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){
 		Map<Object, Object> rmap = new HashMap<Object, Object>();