Request Id:W16LSER006

Added update condition for wf_status column if tran_type is not 'SR' or 'RC' in Sales Return Workflow.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105549 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/SalesReturnWF.java

@@ -35,7 +35,7 @@ public class SalesReturnWF {
 		ConnDriver connDriver = new ConnDriver();
 		E12GenericUtility genericUtility = null;
 		
-		if("C".equalsIgnoreCase(keyFlag) || "R".equalsIgnoreCase(keyFlag)){
+		if("C".equalsIgnoreCase(keyFlag) || "R".equalsIgnoreCase(keyFlag) || "O".equalsIgnoreCase(keyFlag)){
 			retString = updateWfStatus(tran_id, empCodeAprv, loginSiteCode, keyFlag);
 		}
 		else{
@@ -168,17 +168,12 @@ public class SalesReturnWF {
 			conn = connDriver.getConnectDB("DriverITM");
 			conn.setAutoCommit(false);
 			connDriver = null;
-			if ("C".equalsIgnoreCase(wfStatus)) {
-				sql = "UPDATE SRETURN SET WF_STATUS = 'C' WHERE TRAN_ID = ?";
+			if ("C".equalsIgnoreCase(wfStatus) || "R".equalsIgnoreCase(wfStatus) || "O".equalsIgnoreCase(wfStatus)) {
+				sql = "UPDATE SRETURN SET WF_STATUS = '"+wfStatus+"' WHERE TRAN_ID = ?";
 				pStmt = conn.prepareStatement(sql);
 				pStmt.setString(1, tran_id);
 				cnt = pStmt.executeUpdate();
-			} else if("R".equalsIgnoreCase(wfStatus)){
-				sql = "UPDATE SRETURN SET WF_STATUS = 'R' WHERE TRAN_ID = ?";
-				pStmt = conn.prepareStatement(sql);
-				pStmt.setString(1, tran_id);
-				cnt = pStmt.executeUpdate();
-			}
+			} 
 			else{
 				System.out.println("Workflow In Progress");
 			}