Merge branch 'fix/serial' into 'develop'

Fix/serial

See merge request o2oa/o2oa!1862

(cherry picked from commit dc4954e9)

25da90a7 编号由流程改为应用
eb50f285 恢复ScriFactory

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();