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

IDEMPIERE-3659 Workflow with nodes in more than one tenant

This commit is contained in:
Carlos Ruiz 2018-03-15 14:45:09 -03:00
parent b9c1774edc
commit 79ffb1fe76
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/WorkflowElementHandler.java
View File

@ -171,8 +171,7 @@ public class WorkflowElementHandler extends AbstractElementHandler {
} }
} }
String sql = "SELECT AD_WF_Node_ID FROM AD_WF_Node WHERE AD_Workflow_ID = " String sql = "SELECT AD_WF_Node_ID FROM AD_WF_Node WHERE AD_Workflow_ID=? AND AD_Client_ID=?";
+ AD_Workflow_ID;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
PreparedStatement psNodeNext = null; PreparedStatement psNodeNext = null;
@ -182,20 +181,26 @@ public class WorkflowElementHandler extends AbstractElementHandler {
ResultSet nodeNConditionrs = null; ResultSet nodeNConditionrs = null;
try { try {
pstmt = DB.prepareStatement(sql, getTrxName(ctx)); pstmt = DB.prepareStatement(sql, getTrxName(ctx));
pstmt.setInt(1, AD_Workflow_ID);
pstmt.setInt(2, Env.getAD_Client_ID(ctx.ctx));
// Generated workflowNodeNext(s) and // Generated workflowNodeNext(s) and
// workflowNodeNextCondition(s) // workflowNodeNextCondition(s)
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) { while (rs.next()) {
int nodeId = rs.getInt("AD_WF_Node_ID"); int nodeId = rs.getInt("AD_WF_Node_ID");
createNode(ctx, document, nodeId); createNode(ctx, document, nodeId);
sql = "SELECT ad_wf_nodenext_id from ad_wf_nodenext WHERE ad_wf_node_id =" +nodeId; sql = "SELECT ad_wf_nodenext_id from ad_wf_nodenext WHERE ad_wf_node_id=? AND AD_Client_ID=?";
psNodeNext = DB.prepareStatement(sql, getTrxName(ctx)); psNodeNext = DB.prepareStatement(sql, getTrxName(ctx));
psNodeNext.setInt(1, nodeId);
psNodeNext.setInt(2, Env.getAD_Client_ID(ctx.ctx));
nodeNextrs = psNodeNext.executeQuery(); nodeNextrs = psNodeNext.executeQuery();
while (nodeNextrs.next()){ while (nodeNextrs.next()){
ad_wf_nodenext_id = nodeNextrs.getInt("AD_WF_NodeNext_ID"); ad_wf_nodenext_id = nodeNextrs.getInt("AD_WF_NodeNext_ID");
createNodeNext(ctx, document, ad_wf_nodenext_id); createNodeNext(ctx, document, ad_wf_nodenext_id);
sql = "SELECT ad_wf_nextcondition_id from ad_wf_nextcondition WHERE ad_wf_nodenext_id =" + ad_wf_nodenext_id; sql = "SELECT ad_wf_nextcondition_id from ad_wf_nextcondition WHERE ad_wf_nodenext_id=? AND AD_Client_ID=?";
psNCondition = DB.prepareStatement(sql, getTrxName(ctx)); psNCondition = DB.prepareStatement(sql, getTrxName(ctx));
psNCondition.setInt(1, ad_wf_nodenext_id);
psNCondition.setInt(2, Env.getAD_Client_ID(ctx.ctx));
nodeNConditionrs = psNCondition.executeQuery(); nodeNConditionrs = psNCondition.executeQuery();
while (nodeNConditionrs.next()) { while (nodeNConditionrs.next()) {
ad_wf_nodenextcondition_id= nodeNConditionrs.getInt("AD_WF_NextCondition_ID"); ad_wf_nodenextcondition_id= nodeNConditionrs.getInt("AD_WF_NextCondition_ID");