编号由流程改为应用

o2server/x_base_core_project/src/main/java/com/x/base/core/project/script/ScriptFactory.java

@@ -101,13 +101,13 @@ public class ScriptFactory {
 		return COMPILEDSCRIPT_INITIALSCRIPTTEXT;
 	}
 
-	public static String functionalization(String text) {
-		StringBuffer sb = new StringBuffer();
-		sb.append("(function(){").append(System.lineSeparator());
-		sb.append(Objects.toString(text, "")).append(System.lineSeparator());
-		sb.append("})();");
-		return sb.toString();
-	}
+//	public static String functionalization(String text) {
+//		StringBuffer sb = new StringBuffer();
+//		sb.append("(function(){").append(System.lineSeparator());
+//		sb.append(Objects.toString(text, "")).append(System.lineSeparator());
+//		sb.append("})();");
+//		return sb.toString();
+//	}
 
 	public static List<String> asStringList(Object o) throws Exception {
 		return readAsStringList(o);

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/SerialBuilder.java

@@ -195,7 +195,7 @@ public class SerialBuilder {
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			CriteriaQuery<SerialNumber> cq = cb.createQuery(SerialNumber.class);
 			Root<SerialNumber> root = cq.from(SerialNumber.class);
-			Predicate p = cb.equal(root.get(SerialNumber_.process), process.getId());
+			Predicate p = cb.equal(root.get(SerialNumber_.application), process.getApplication());
 			p = cb.and(p, cb.equal(root.get(SerialNumber_.name), name));
 			cq.select(root).where(p);
 			List<SerialNumber> list = em.createQuery(cq).setMaxResults(1).getResultList();