Explorar el Código

添加通过物料信息获取工单关联信息

callm hace 3 años
padre
commit
feb8069542

+ 2 - 1
src/main/java/com/uas/eis/entity/HelperType.java

@@ -17,7 +17,8 @@ public enum HelperType {
     SetIMEIInfo("SetIMEIInfo","设置IMEI信息") ,//设置IMEI信息
     SetTestDetail("SetTestDetail","设置测试结果") ,//设置测试结果
     SetPcbaData("SetPcbaData","检测XXX") ,//设置测试结果
-    GoMo("GoMo","检测XXX") ;//序列号归属工单
+    GoMo("GoMo","检测XXX") ,//序列号归属工单
+    GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息");
 
     private String code;
     private String name;

+ 27 - 0
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -91,6 +91,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case SetPcbaData:
 				remap = SetPcbaData(json);
 				break;
+			case GetInfoByMaterial:
+				remap = GetInfoByMaterial(json);
+				break;
 			default:
 				err = -1;
 				break;
@@ -101,6 +104,30 @@ public class MESHelperServiceImpl implements MESHelperService {
 		SpObserver.putSp(username);
 		return remap;
 	}
+	private Map<Object,Object> GetInfoByMaterial(JSONObject map){
+		Map<Object, Object> rmap = new HashMap<Object, Object>();
+		String iPCBA=null;
+		String oErrMessage=null;
+		if(map.get("iPCBA")==null){
+			oErrMessage = "主板SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		iPCBA=map.get("iPCBA").toString();
+		SqlRowList rs=baseDao.queryForRowSet("select ms_firstsn,ms_sncode,ma_bios,ma_ec,ma_hardware from CRAFTMATERIAL left join make on cm_makecode=ma_code " +
+				"left join makeserial on ms_firstsn=cm_firstsn and cm_makecode=ms_makecode  where cm_barcode='"+iPCBA+"'");
+		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"));
+		}else{
+			oErrMessage = "主板SN未查询到关联信息";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		return rmap;
+	}
 
 	private Map<Object,Object> CheckRoutePassed(JSONObject map){
 		//实际业务数据