midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3942 #2 Transition need to match with Activity

This commit is contained in:
Ray Lee 2019-04-09 17:17:11 +08:00
parent f61ef24e77
commit fc1014f25a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org.adempiere.base/src/org/compiere/wf/MWFProcess.java
View File

@ -348,14 +348,6 @@ public class MWFProcess extends X_AD_WF_Process
if (transitions == null || transitions.length == 0) if (transitions == null || transitions.length == 0)
return false; // done return false; // done
// We need to wait for last activity
if (MWFNode.JOINELEMENT_AND.equals(last.getNode().getJoinElement()))
{
// get previous nodes
// check if all have closed activities
// return false for all but the last
}
// eliminate from active processed
last.setProcessed(true); last.setProcessed(true);
last.saveEx(); last.saveEx();
@ -400,11 +392,16 @@ public class MWFProcess extends X_AD_WF_Process
private boolean isJoinElementANDProcessed(MWFActivity activity) { private boolean isJoinElementANDProcessed(MWFActivity activity) {
Query queryNodeNextTest = new Query(Env.getCtx(), MWFNodeNext.Table_Name, "AD_WF_Next_ID = ?", get_TrxName()); Query queryNodeNext = new Query(Env.getCtx(), MWFNodeNext.Table_Name, "AD_WF_Next_ID = ?", get_TrxName());
queryNodeNextTest.setParameters(activity.getAD_WF_Node_ID()); queryNodeNext.setParameters(activity.getAD_WF_Node_ID());
List<MWFNodeNext> NodeNexts = queryNodeNextTest.list(); List<MWFNodeNext> nodeNexts = queryNodeNext.list();
for (MWFNodeNext nodeNext : NodeNexts) { /**
* IDEMPIERE-3942 #2 Transition need to match with Activity
*/
int totalParent = 0;
int totalActivities = 0;
for (MWFNodeNext nodeNext : nodeNexts) {
totalParent++;
Query queryMWFActivity = new Query(Env.getCtx(), MWFActivity.Table_Name, Query queryMWFActivity = new Query(Env.getCtx(), MWFActivity.Table_Name,
"AD_WF_Process_ID = ? AND AD_WF_Node_ID = ? ", get_TrxName()); "AD_WF_Process_ID = ? AND AD_WF_Node_ID = ? ", get_TrxName());
@ -413,11 +410,14 @@ public class MWFProcess extends X_AD_WF_Process
queryMWFActivity.setParameters(params); queryMWFActivity.setParameters(params);
List<MWFActivity> parentActivitys = queryMWFActivity.list(); List<MWFActivity> parentActivitys = queryMWFActivity.list();
for (MWFActivity parentActivity : parentActivitys) { for (MWFActivity parentActivity : parentActivitys) {
totalActivities++;
if(!parentActivity.isProcessed()) if(!parentActivity.isProcessed())
return false; return false;
} }
} }
if(totalParent < totalActivities)
return false;
return true; return true;
} }