-Changes for the scheme approve detail amount is calculated by free qty multiple by rate.

-Changes for the charge back  when the confirm then valid upto is insert in the scheme balance is comes from the scheme approve valid_upto. 


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

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

@@ -1194,6 +1194,11 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 					    			errList.add("VTAMTDIF2");
 			    					errFields.add(childNodeName.toLowerCase());
 					    		}
+					    		else
+					    		{
+					    			errList.add("VTAMTADJT");
+			    					errFields.add(childNodeName.toLowerCase());
+					    		}
 					    	}
 					    }
 						//Added by AMOL S on 01-JUL-2019 [D19CMES002] END
@@ -3484,7 +3489,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 		//offer means scheme_code
 		PreparedStatement preparedStatement = null;
 		ResultSet resultSet = null;
-		String sqlQuery = "", itemCode = "", quantity ="", itemCodeRepl = "", freeQty = "", rateCount = "";
+		String sqlQuery = "", itemCode = "", quantity ="", itemCodeRepl = "", freeQty = "", rateCount = "", itemDescr = "", itemReplDescr = "";
 		double amount = 0, freeQuntity = 0, rateCnt = 0;
 		sqlQuery ="SELECT ITEM_CODE,ITEM_CODE__REPL,QUANTITY,FREE_QTY,RATE FROM SCHEME_APPRV_DET WHERE TRAN_ID = ?";
 		
@@ -3510,6 +3515,28 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 			{
 				rateCnt = Double.parseDouble(rateCount);
 			}
+			preparedStatement.close();
+			resultSet.close();
+			//Added by saiprasad G. for set the item description  or item replacement description [START]
+			sqlQuery="select descr from item where item_code=?";
+			preparedStatement = conn.prepareStatement(sqlQuery);
+			preparedStatement.setString(1, itemCode);
+			resultSet = preparedStatement.executeQuery();
+			while(resultSet.next())
+			{
+				itemDescr = resultSet.getString("descr");
+			}
+			closeResources(preparedStatement, resultSet);
+			sqlQuery="select descr from item where item_code=?";
+			preparedStatement = conn.prepareStatement(sqlQuery);
+			preparedStatement.setString(1, itemCodeRepl);
+			resultSet = preparedStatement.executeQuery();
+			while(resultSet.next())
+			{
+				itemReplDescr = resultSet.getString("descr");
+			}
+			closeResources(preparedStatement, resultSet);
+			//Added by saiprasad G. for set the item description  or item replacement description [END]
 		} catch (SQLException e)
 		{
 			e.printStackTrace();
@@ -3522,8 +3549,10 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 		amount = (freeQuntity * rateCnt);
 		
 		valueXmlString.append("<item_code protect =\"1\"><![CDATA[").append(itemCode).append("]]></item_code>");
+		valueXmlString.append("<item_descr><![CDATA[").append(itemDescr).append("]]></item_descr>");
 		valueXmlString.append("<quantity protect =\"1\"><![CDATA[").append(quantity).append("]]></quantity>");
 		valueXmlString.append("<item_code__repl><![CDATA[").append(itemCodeRepl).append("]]></item_code__repl>");
+		valueXmlString.append("<item_repl_descr><![CDATA[").append(itemReplDescr).append("]]></item_repl_descr>");
 		valueXmlString.append("<rate><![CDATA[").append(0).append("]]></rate>");
 		valueXmlString.append("<free_qty><![CDATA[").append(freeQty).append("]]></free_qty>");
 		valueXmlString.append("<rate__count protect =\"1\"><![CDATA[").append(rateCount).append("]]></rate__count>");

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

@@ -885,15 +885,36 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
 						Timestamp effFrom1 = new Timestamp(confDate.getTime());
 						System.out.println("eff from is :" + effFrom1 + " confDate str is : " + confDateStr);
 
-						Calendar calObj1 = Calendar.getInstance();
+						/*Calendar calObj1 = Calendar.getInstance();
 						calObj1.setTime(new java.util.Date());
 						calObj1.add(Calendar.YEAR, 2);
 						java.util.Date dateFrom = calObj1.getTime();
 						Timestamp vaildUpto1 = new Timestamp(dateFrom.getTime());
                         Date validUptoDate=new Date(vaildUpto1.getTime());
+                        validUpto=sdf1.format(validUptoDate);*/	
+						Timestamp vaildUpto1 = null;
+						String schemeApprSql = "select VALID_UPTO from SCHEME_APPRV where SCHEME_CODE=?";
+						preparedStatement = conn.prepareStatement(schemeApprSql);
+						preparedStatement.setString(1, offer);
+						resultSet = preparedStatement.executeQuery();
+						while(resultSet.next())
+						{
+							vaildUpto1 = resultSet.getTimestamp("VALID_UPTO");
+							System.out.println("scheme apprv date:"+vaildUpto1);
+						}
+						Date validUptoDate=new Date(vaildUpto1.getTime());
                         validUpto=sdf1.format(validUptoDate);
-                          
-						// insert into scheme balance
+                        if(resultSet != null)
+                        {
+                        	resultSet.close();
+                        	resultSet=null;
+                        }
+                        if(preparedStatement != null)
+                        {
+                        	preparedStatement.close();
+                        	preparedStatement=null;
+                        }
+                       	// insert into scheme balance
 						System.out.println("settle method2::[" + settleMethod + "]");
 						if (settleMethod.equalsIgnoreCase("V") || settleMethod.equalsIgnoreCase("Q")) 
 						{

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

@@ -915,7 +915,7 @@ public class SchemeApprv extends ValidatorEJB
 					System.out.println("rate"+rate);
 					valueXmlString.append( "<item_descr><![CDATA[" ).append(itmDescr).append( "]]></item_descr>\r\n" );
 					valueXmlString.append( "<rate><![CDATA[" ).append(rate).append( "]]></rate>\r\n" );
-					valueXmlString.append( "<quantity><![CDATA[" ).append(0).append( "]]></quantity>\r\n" );
+					//valueXmlString.append( "<quantity><![CDATA[" ).append(0).append( "]]></quantity>\r\n" );
 					valueXmlString.append( "<amount><![CDATA[" ).append(0).append( "]]></amount>\r\n" );
 					if(rs!=null)
 					{
@@ -928,18 +928,6 @@ public class SchemeApprv extends ValidatorEJB
 						pStmt = null;
 					}
 				}
-				else if("quantity".equalsIgnoreCase(currentColumn))
-				{
-					double amount,qty,rate;
-					String rateStr,qtyStr;
-					rateStr = genericUtility.getColumnValue("rate", dom);
-					System.out.println("ratestr:"+rateStr);
-					rate = Double.parseDouble(rateStr);
-					qtyStr = genericUtility.getColumnValue("quantity", dom);
-					qty = Double.parseDouble(qtyStr);
-					amount = qty * rate;
-					valueXmlString.append( "<amount><![CDATA[" ).append(amount).append( "]]></amount>\r\n" );
-				}
 				else if("item_code__repl".equalsIgnoreCase(currentColumn))
 				{
 					itemCodeRepl = genericUtility.getColumnValue("item_code__repl", dom);
@@ -955,6 +943,30 @@ public class SchemeApprv extends ValidatorEJB
 					pStmt.close();
 					valueXmlString.append( "<item_repl_descr><![CDATA[" ).append(itemReplDescr).append( "]]></item_repl_descr>\r\n" );
 				}
+				else if("free_qty".equalsIgnoreCase(currentColumn))
+				{
+					double amount,freeQty,rate;
+					String rateStr,freeQtyStr;
+					rateStr = genericUtility.getColumnValue("rate", dom);
+					System.out.println("ratestr:"+rateStr);
+					rate = Double.parseDouble(rateStr);
+					freeQtyStr = genericUtility.getColumnValue("free_qty", dom);
+					freeQty = Double.parseDouble(freeQtyStr);
+					amount = freeQty * rate;
+					valueXmlString.append( "<amount><![CDATA[" ).append(amount).append( "]]></amount>\r\n" );
+				}
+				else if("rate".equalsIgnoreCase(currentColumn))
+				{
+					double amount,freeQty,rate;
+					String rateStr,freeQtyStr;
+					rateStr = genericUtility.getColumnValue("rate", dom);
+					System.out.println("ratestr:"+rateStr);
+					rate = Double.parseDouble(rateStr);
+					freeQtyStr = genericUtility.getColumnValue("free_qty", dom);
+					freeQty = Double.parseDouble(freeQtyStr);
+					amount = freeQty * rate;
+					valueXmlString.append( "<amount><![CDATA[" ).append(amount).append( "]]></amount>\r\n" );
+				}
 				valueXmlString.append( "</Detail2>\r\n" );
 			}
 		}