添加获取PSN接口

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

@@ -877,17 +877,29 @@ public class MESHelperServiceImpl implements MESHelperService {
 	private Map<Object,Object> GetPSN(JSONObject map){
 		String oErrMessage="";
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
-		if(map.get("iMakeCode")==null){
-			oErrMessage = "工单号不能为空";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		String iSN=map.get("iSN").toString();
+		Object iMakecode=baseDao.getFieldDataByCondition("makeserial","ms_makecode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
+		if(iMakecode==null){
+			oErrMessage = iSN+"无关联工单";
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
-		String iMakecode=map.get("iMakeCode").toString();
-		SqlRowList rs=baseDao.queryForRowSet("select msl_sncode,msl_id from makesnlist where msl_makecode='"+iMakecode+"' and msl_type='after' and nvl(msl_status,0)=0 order by msl_sncode");
+		//之前有获取过的
+		SqlRowList rs=baseDao.queryForRowSet("select msl_sncode from makesnlist where msl_beforesn='"+iSN+"'");
+		if(rs.next()){
+			rmap.put("msl_sncode",rs.getString("msl_sncode"));
+			return rmap;
+		}
+		rs=baseDao.queryForRowSet("select msl_sncode,msl_id from makesnlist where msl_makecode='"+iMakecode+"' and msl_type='after' and nvl(msl_status,0)=0 order by msl_sncode");
 		if(rs.next()){
 			String msl_id=rs.getString("msl_id");
 			String msl_sncode=rs.getString("msl_sncode");
-			baseDao.execute("update makesnlist set msl_status=-1 where msl_id="+msl_id+" and nvl(msl_status,0)=0");
+			baseDao.execute("update makesnlist set msl_status=-1,msl_beforesn='"+iSN+"' where msl_id="+msl_id+" and nvl(msl_status,0)=0");
 			rmap.put("msl_sncode",msl_sncode);
 			return rmap;
 		}else{