Price list generation - If the tax rate fails then system gives an error...

Price list generation - If the tax rate fails then system gives an error message based on added MUST_RET_REC column 

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

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

@@ -12098,7 +12098,7 @@ public class DistCommon {
 		String varExpr = "";
 		String varInput = "";
 		String varSrc = "";
-		
+		String mustRetRec = "";
 		String finalRate = "";
 		//HashMap<String,String> sqlInputDataMap = new HashMap<String, String>();
 		GenericUtility genericUtility ;
@@ -12113,8 +12113,8 @@ public class DistCommon {
 				ScriptEngineManager manager = new ScriptEngineManager();
 				ScriptEngine exprsEngine = manager.getEngineByName("js");
 
-				sqlStmt = "select var_name, var_expr, var_source, var_input from calc_method_var where calc_method = ? order by calc_seq ";
-
+				//sqlStmt = "select var_name, var_expr, var_source, var_input from calc_method_var where calc_method = ? order by calc_seq ";
+				sqlStmt = "select var_name, var_expr, var_source, var_input, must_ret_rec from calc_method_var where calc_method = ? order by calc_seq ";
 				pstmt  = conn.prepareStatement(sqlStmt);
 				pstmt.setString(1, calcMethod);
 				rs = pstmt.executeQuery();
@@ -12125,7 +12125,11 @@ public class DistCommon {
 					varExpr = checkNull(rs.getString("var_expr"));
 					varSrc = checkNull(rs.getString("var_source"));
 					varInput = checkNull(rs.getString("var_input"));					
-					
+					mustRetRec = E12GenericUtility.checkNull(rs.getString("must_ret_rec"));
+					if(mustRetRec == null  || mustRetRec.trim().length() == 0) 
+					{					
+						mustRetRec = "1";
+					}					
 					String inputValues[] = null;
 					System.out.println("varName["+varName+"]varSrc["+varSrc+"]varInput["+varInput+"]varExpr--["+varExpr+"]");
 					if((varName != null && varName.trim().length() > 0) && (varExpr != null && varExpr.trim().length() > 0))
@@ -12206,17 +12210,28 @@ public class DistCommon {
 								exprsEngine.put(varName, getDoubleValue(finalRate));
 							}
 						}					
+						System.out.println("calcRate::finalRate["+getDoubleValue(finalRate)+"]mustRetRec["+mustRetRec+"]");
+						//Pavan R 23may19 start
+						if(getDoubleValue(finalRate) <= 0)
+						{													
+							if("1".equals(mustRetRec)) {
+								errCode = "Result of step # "+varName+" failed with no data. Step Type "+varSrc+", step data "+varExpr+" ";							
+								errMap.put("error", errCode);	
+								return errMap;
+							}
+						}
+						//Pavan R 23may19 end
 					}
 				}
 				rs.close();
 				rs = null;
 				pstmt.close();
 				pstmt = null;
-				if(getDoubleValue(finalRate) <= 0)
+				/*if(getDoubleValue(finalRate) <= 0)
 				{
 					errCode = "VTRATE2";
 					errMap.put("error", errCode);
-				}
+				}*/
 			}
 		}
 		catch(Exception e)

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

@@ -1642,7 +1642,8 @@ public class PriceListConf extends ActionHandlerEJB implements PriceListConfLoca
 					if (calcRate != null) 
 					{
 						if (calcRate.containsKey("error")) {
-							retString = itmDBAccessLocal.getErrorString("", calcRate.get("error"), "", "", conn);
+							//retString = itmDBAccessLocal.getErrorString("", calcRate.get("error"), "", "", conn);
+							retString = new FinCommon().getErrorXML(calcRate.get("error"), "calcmeth", "VTRATE2", calcRate.get("error"));
 							return retString;
 						} else {
 							finalRate = Double.parseDouble(calcRate.get("rate"));