镭雕完后过站

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

@@ -97,30 +97,33 @@ public class MESHelperServiceImpl implements MESHelperService {
 				baseDao.execute("update makesnlist set msl_Radium=-1 where msl_sncode='"+value.toString().toUpperCase()+"' and " +
 						"msl_makecode='"+MO+"'");
 			}
-		/*	oErrMessage+=GoMo(value.toString().toUpperCase(),MO, specificationName);
-			if(oErrMessage.equals("null")){
-				oErrMessage="";
-			}else{
-				rmap.put("code",-1);
-				rmap.put("message",oErrMessage);
-				return rmap;
-			}
-			oErrMessage+=CheckRoutePassed(value.toString().toUpperCase(),specificationName);
-			if(oErrMessage.equals("null")){
-				oErrMessage="";
-			}else{
-				rmap.put("code",-1);
-				rmap.put("message",oErrMessage);
-				return rmap;
+			//启用过站
+			if(baseDao.getFieldDataByCondition("configs","data","caller='MESSetting' and code='Radium'").toString().equals("1")){
+				oErrMessage+=GoMo(value.toString().toUpperCase(),MO, specificationName);
+				if(oErrMessage.equals("null")){
+					oErrMessage="";
+				}else{
+					rmap.put("code",-1);
+					rmap.put("message",oErrMessage);
+					return rmap;
+				}
+				oErrMessage+=CheckRoutePassed(value.toString().toUpperCase(),specificationName);
+				if(oErrMessage.equals("null")){
+					oErrMessage="";
+				}else{
+					rmap.put("code",-1);
+					rmap.put("message",oErrMessage);
+					return rmap;
+				}
+				oErrMessage+=SetPcbaData(value.toString().toUpperCase(),specificationName,UserName,"OK");
+				if(oErrMessage.equals("null")){
+					oErrMessage="";
+				}else{
+					rmap.put("code",-1);
+					rmap.put("message",oErrMessage);
+					return rmap;
+				}
 			}
-			oErrMessage+=SetPcbaData(value.toString().toUpperCase(),specificationName,UserName,"OK");
-			if(oErrMessage.equals("null")){
-				oErrMessage="";
-			}else{
-				rmap.put("code",-1);
-				rmap.put("message",oErrMessage);
-				return rmap;
-			}*/
 		}
 		if(oErrMessage.equals("")||oErrMessage==null){
 			rmap.put("code",0);