Sarita: Done changes tom set trandate instead currentdate on 02JUL18

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

webitm-fin/ibase/webitm/ejb/fin/AssetSalesConf.java

@@ -112,7 +112,7 @@ AssetSalesConfLocal,AssetSalesConfRemote
 		
 		//Modified by Piyush on 30/06/2018 [To get sales transaction date & other values].Start
 		java.sql.Timestamp salesTranDate = null;
-		String salesAcPeriod = "", sqlTemp1 = "";
+		String salesAcPeriod = "", sqlTemp1 = "", salesPeriod = "" ;//Added salesPeriod on 02JUL18
 		int detRowNo = 0;
 		ResultSet rsTemp1 = null;
 		PreparedStatement pstmtTemp1 = null;
@@ -179,13 +179,14 @@ AssetSalesConfLocal,AssetSalesConfRemote
 				detRowNo = detRowNo + 1;
 				if (detRowNo == 1)
 				{
-					sqlTemp1 = "select acct_prd from period where ? between fr_date and to_date";
+					sqlTemp1 = "select acct_prd,code from period where ? between fr_date and to_date";//Added code on 02JUL18
 					pstmtTemp1 = conn.prepareStatement(sqlTemp1);
 					pstmtTemp1.setTimestamp(1,salesTranDate);
 					rsTemp1 = pstmtTemp1.executeQuery();
 					if (rsTemp1.next())
 					{
 						salesAcPeriod = rsTemp1.getString("acct_prd");
+						salesPeriod = rsTemp1.getString("code"); // Added to get code on 02JUL18
 					}
 					if (rsTemp1 != null)
 					{
@@ -784,7 +785,9 @@ AssetSalesConfLocal,AssetSalesConfRemote
 						sql4 = "select code from period where fr_date = (select fr_date from period where code = (select acct_prd from period where ? between fr_date and to_date))";
 						pstmt4=conn.prepareStatement(sql4);
 						//Added by sarita on 06 JUN 2018
-						pstmt4.setTimestamp(1,currentDate);
+						// Modified by Piyush [Should be tran date and not current date] on 02JUL18
+						// pstmt4.setTimestamp(1,currentDate);
+						pstmt4.setTimestamp(1,salesTranDate);
 						rs4 = pstmt4.executeQuery();
 						if(rs4.next())
 						{
@@ -815,7 +818,9 @@ AssetSalesConfLocal,AssetSalesConfRemote
 					sql5 = "select code from period where ? between fr_date and to_date"; 
 					pstmt5=conn.prepareStatement(sql5);
 					//Added by sarita on 06 JUN 2018
-					pstmt5.setTimestamp(1,currentDate);
+					// Modified by Piyush [Should be tran date and not current date] on 02JUL18
+					// pstmt5.setTimestamp(1,currentDate);
+					pstmt5.setTimestamp(1,salesTranDate);
 					rs5 = pstmt5.executeQuery();
 					if(rs5.next())
 					{
@@ -871,7 +876,9 @@ AssetSalesConfLocal,AssetSalesConfRemote
 						sql7 = "update asset_register set rem_date = ?,status=?,tran_id__rem=?,tran_ser__rem=?,rem_value=? where asset_code = ?"; 		
 						pstmt7=conn.prepareStatement(sql7);
 						//pstmt.setString(1, currAppdate);//Added by sarita to set current date Timestamp parameter on 06 JUN 2018
-						pstmt7.setTimestamp(1, currentDate);
+						// Modified by Piyush on 30/06/2018[Should be tran date]
+						//pstmt7.setTimestamp(1, currentDate);
+						pstmt7.setTimestamp(1, salesTranDate);
 						pstmt7.setString(2, "S");
 						pstmt7.setString(3, tranId);
 						pstmt7.setString(4, transer);
@@ -927,7 +934,9 @@ AssetSalesConfLocal,AssetSalesConfRemote
 						recTabStrBuff.append(itmCode).append("\t"); //item_code__to
 						recTabStrBuff.append(assetCode).append("\t"); //asset_code__fr
 						recTabStrBuff.append(assetCode).append("\t"); //asset_code__to
-						recTabStrBuff.append(prdCdUpto).append("\t"); //prd_code__upto
+						// Modified by Piyush on 30/06/2018 [To set sales period]
+						//recTabStrBuff.append(prdCdUpto).append("\t"); //prd_code__upto changes on 02 JUL18
+						recTabStrBuff.append(salesPeriod).append("\t"); //prd_code__upto
 						recTabStrBuff.append(purpose).append("\t"); //purpose
 						recTabStrBuff.append(deprMethod).append("\t"); //depr_method
 						recTabStrBuff.append(confirm).append("\t"); //confirm
@@ -948,7 +957,9 @@ AssetSalesConfLocal,AssetSalesConfRemote
 						valueXmlString.append("<item_code__to>").append(itmCode).append("</item_code__to>\r\n");
 						valueXmlString.append("<asset_code__fr>").append(assetCode).append("</asset_code__fr>\r\n");
 						valueXmlString.append("<asset_code__to>").append(assetCode).append("</asset_code__to>\r\n");
-						valueXmlString.append("<prd_code__upto>").append(prdCdUpto).append("</prd_code__upto>\r\n");
+						// Modified by Piyush on 30/06/2018 [To set sales period]
+						// valueXmlString.append("<prd_code__upto>").append(prdCdUpto).append("</prd_code__upto>\r\n");
+						valueXmlString.append("<prd_code__upto>").append(salesPeriod).append("</prd_code__upto>\r\n");
 						valueXmlString.append("<purpose>").append(purpose).append("</purpose>\r\n");
 						valueXmlString.append("<depr_method>").append(deprMethod).append("</depr_method>\r\n");
 						valueXmlString.append("<confirm>").append(confirm).append("</confirm>\r\n");