改为V2AddSplit

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2AddSplit.java

@@ -158,7 +158,8 @@ class V2AddSplit extends BaseAction {
 			ProcessingAttributes processingAttributes = new ProcessingAttributes();
 			processingAttributes.setType(ProcessingAttributes.TYPE_ADDSPLIT);
 			processingAttributes.setSeries(series);
-			processingAttributes.setForceJoinAtArrive(true);
+			// 不需要从arrived开始,已经设置好全部状态.
+			// processingAttributes.setForceJoinAtArrive(true);
 			WoId processingResp = ThisApplication.context().applications()
 					.putQuery(x_processplatform_service_processing.class,
 							Applications.joinQueryUri("work", id, "processing"), processingAttributes, work.getJob())

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2AddSplit.java

@@ -137,9 +137,7 @@ class V2AddSplit extends BaseAction {
 						emc.persist(arrivedCopy, CheckPersistType.all);
 						emc.persist(fromCopy, CheckPersistType.all);
 						emc.commit();
-						// Processing processing = new Processing(wi);
-						// processing.processing(workCopy.getId());
-						wo.addValue(work.getId(), true);
+						wo.addValue(workCopy.getId(), true);
 					}
 					result.setData(wo);
 					return result;
@@ -151,21 +149,6 @@ class V2AddSplit extends BaseAction {
 
 	}
 
-	// private Wo wo(Business business, Work copy) throws Exception {
-	// Wo wo = business.entityManagerContainer().fetch(copy.getId(), Wo.copier);
-	// if (null != wo) {
-	// wo.setTaskList(this.woTasks(business, copy));
-	// return wo;
-	// }
-	// return null;
-	// }
-
-	// private List<WoTask> woTasks(Business business, Work copy) throws Exception {
-	// return business.entityManagerContainer().fetchEqual(Task.class,
-	// WoTask.copier, Task.work_FIELDNAME,
-	// copy.getId());
-	// }
-
 	public static class Wi extends V2AddSplitWi {
 
 	}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java

@@ -7,6 +7,7 @@ import java.util.concurrent.Callable;
 import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.exception.ExceptionEntityNotExist;
 import com.x.base.core.project.executor.ProcessPlatformExecutorFactory;
@@ -230,7 +231,7 @@ class V2Retract extends BaseAction {
 
 	private void deleteWorks(Business business, String job, List<String> workIds) throws Exception {
 		List<Work> os = business.entityManagerContainer().listEqualAndIn(Work.class, Work.job_FIELDNAME, job,
-				Work.id_FIELDNAME, workIds);
+				JpaObject.id_FIELDNAME, workIds);
 		for (Work o : os) {
 			business.entityManagerContainer().remove(o, CheckRemoveType.all);
 		}