merge from branch

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

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

@@ -225,7 +225,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 				sql = "select status,desp_date,available_yn,desp_id,site_code,sord_no,cust_code__dlv,cust_code,gp_date,gp_ser,gp_no "
-						+ " from despatch where desp_id = ? ";// QUERY OF SRD TO BE COPIED...........
+					+ " from despatch where desp_id = ? ";// QUERY OF SRD TO BE COPIED...........
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranId);
 				rs = pstmt.executeQuery();
@@ -255,46 +255,50 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 				/**************************For despatch GP NO Generation********************************************************************/	
 
 
-
-
-
-				sql1 = "select site_code__exc "
-						+" from site where site_code = ? ";
-
-				pstmt1 = conn.prepareStatement(sql1);
-				pstmt1.setString(1,siteCode);
-				rs1 = pstmt1.executeQuery();
-				while(rs1.next())
+				varValue=	distCommon.getDisparams("999999", "GP_NO_REQ", conn);
+				if("NULLFOUND".equalsIgnoreCase(varValue))
 				{
-					siteCodeExc = checkNull(rs1.getString("site_code__exc"));
+					varValue = "Y";
 				}
-				rs1.close();
-				rs1 = null;
-				pstmt1.close();
-				pstmt1 = null;
+				if("Y".equals(varValue))
+				{
+					sql1 = "select site_code__exc "
+						+" from site where site_code = ? ";
+
+					pstmt1 = conn.prepareStatement(sql1);
+					pstmt1.setString(1,siteCode);
+					rs1 = pstmt1.executeQuery();
+					while(rs1.next())
+					{
+						siteCodeExc = checkNull(rs1.getString("site_code__exc"));
+					}
+					rs1.close();
+					rs1 = null;
+					pstmt1.close();
+					pstmt1 = null;
 
-				/*		genKey.put("site_code",siteCodeExc);
+					/*		genKey.put("site_code",siteCodeExc);
 			genKey.put("desp_date",despDate);
 			genKey.put("sord_no",sordNo);
 			genKey.put("gp_date",gpDate);
 			genKey.put("gp_ser",gpSer);*/
 
-				String xmlValues = "";
-				xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
-				xmlValues = xmlValues + "<Header></Header>";
-				xmlValues = xmlValues + "<Detail1>";
-				xmlValues = xmlValues +	"<tran_id/>";
-				xmlValues = xmlValues + "<site_code>" + siteCodeExc + "</site_code>";
-				xmlValues = xmlValues + "<desp_date>"+ despDate + "</desp_date>";
-				xmlValues = xmlValues + "<gp_ser>"+ gpSer + "</gp_ser>";
-				xmlValues = xmlValues + "</Detail1></Root>";
+					String xmlValues = "";
+					xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
+					xmlValues = xmlValues + "<Header></Header>";
+					xmlValues = xmlValues + "<Detail1>";
+					xmlValues = xmlValues +	"<tran_id/>";
+					xmlValues = xmlValues + "<site_code>" + siteCodeExc + "</site_code>";
+					xmlValues = xmlValues + "<desp_date>"+ despDate + "</desp_date>";
+					xmlValues = xmlValues + "<gp_ser>"+ gpSer + "</gp_ser>";
+					xmlValues = xmlValues + "</Detail1></Root>";
 
 
-				varValue=	distCommon.getDisparams("999999", "EXC_SITE_NO", conn);
-				System.out.println("varValue===="+varValue);
+					varValue=	distCommon.getDisparams("999999", "EXC_SITE_NO", conn);
+					System.out.println("varValue===="+varValue);
 
 
-				/*sql1 = "select var_value  from  disparm where  prd_code = '999999' and var_name = 'EXC_SITE_NO' ";
+					/*sql1 = "select var_value  from  disparm where  prd_code = '999999' and var_name = 'EXC_SITE_NO' ";
 			pstmt1 = conn.prepareStatement(sql1);
 
 			rs1 = pstmt1.executeQuery();
@@ -307,35 +311,35 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 			pstmt1.close();
 			pstmt1 = null;*/
 
-				if(	varValue.contains(siteCodeExc))
-				{
+					if(	varValue.contains(siteCodeExc))
+					{
 
-					gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNo,conn);//Code need to be migrated
+						gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNo,conn);//Code need to be migrated
 
-				}
-				else{
+					}
+					else{
 
-					gpNo = generateGPNO(xmlValues,siteCodeExc,sordNo,conn);//Code need to be migrated
+						gpNo = generateGPNO(xmlValues,siteCodeExc,sordNo,conn);//Code need to be migrated
 
-				}
+					}
 
-				sql =  "update despatch set gp_no = ? , gp_date = ? "
+					sql =  "update despatch set gp_no = ? , gp_date = ? "
 						+" where desp_id = ? ";
 
-				pstmt1 = conn.prepareStatement(sql);
-				pstmt1.setString(1,gpNo);
-				pstmt1.setTimestamp(2,gpDate);
-				pstmt1.setString(3,tranId);
-
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setString(1,gpNo);
+					pstmt1.setTimestamp(2,gpDate);
+					pstmt1.setString(3,tranId);
 
-				int cnt2 = pstmt1.executeUpdate();
 
-				System.out.println("Count value after updating despatch...."+cnt2);
+					int cnt2 = pstmt1.executeUpdate();
 
-				pstmt1.close();
-				pstmt1 = null;
+					System.out.println("Count value after updating despatch...."+cnt2);
 
+					pstmt1.close();
+					pstmt1 = null;
 
+				}
 
 				//despatch_edit.setitem(ll_ctr,"confirmed", 'Y')	//Ruchira 21/09/2k5 taken out of abovve if ... endif statement.
 				//		CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
@@ -345,7 +349,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 				sql1 = "select edi_option from transetup "
-						+ "where tran_window = 'w_despatch' ";
+					+ "where tran_window = 'w_despatch' ";
 				pstmt1 = conn.prepareStatement(sql1);
 
 				rs1 = pstmt1.executeQuery();
@@ -370,7 +374,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 					if(channelPartner == null || channelPartner.trim().length() == 0 )
 					{
 						sql1 = "select channel_partner, dis_link  from customer "
-								+" where cust_code = ? ";
+							+" where cust_code = ? ";
 
 						pstmt1 = conn.prepareStatement(sql1);
 						pstmt1.setString(1, custCode);
@@ -436,8 +440,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 				sql3 = "select sord_no,line_no,line_no__sord,exp_lev,item_code__ord,item_code,lot_no,lot_sl," +
-						"loc_code,unit__std,quantity__stduom,quantity,rate__stduom,no_art,lock_code " +
-						"from despatchdet where desp_id = ?";
+				"loc_code,unit__std,quantity__stduom,quantity,rate__stduom,no_art,lock_code " +
+				"from despatchdet where desp_id = ?";
 				pstmt3 = conn.prepareStatement(sql3);
 				pstmt3.setString(1,tranId);
 				rs3 = pstmt3.executeQuery();
@@ -465,7 +469,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 						sql = " Select hold_qty as lc_hold_qty "
-								+" From stock Where item_code  = ? and site_code = ? and loc_code  = ? and  lot_no = ? and lot_sl = ? ";
+							+" From stock Where item_code  = ? and site_code = ? and loc_code  = ? and  lot_no = ? and lot_sl = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,itemCode);
 						pstmt.setString(2,siteCode);
@@ -486,10 +490,10 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						if(hldQty > 0.0)
 						{
 							sql =  "select count(*) as ll_cnt from inv_hold a, inv_hold_det b , inv_hold_rel_trace c"
-									+" where a.tran_id = b.tran_id and b.tran_id = c.ref_no and c.item_code  = ? and c.site_code = ? and c.loc_code  = ?"
-									+" and c.lot_no = ? and c.lot_sl  = ? and b.lot_no  = ?"
-									+" and b.lot_sl = ? and (b.line_no_sl = 0 or b.line_no_sl is null)"
-									+" and  a.confirmed='Y' 	and b.hold_status ='H' and a.lock_code = ? ";
+								+" where a.tran_id = b.tran_id and b.tran_id = c.ref_no and c.item_code  = ? and c.site_code = ? and c.loc_code  = ?"
+								+" and c.lot_no = ? and c.lot_sl  = ? and b.lot_no  = ?"
+								+" and b.lot_sl = ? and (b.line_no_sl = 0 or b.line_no_sl is null)"
+								+" and  a.confirmed='Y' 	and b.hold_status ='H' and a.lock_code = ? ";
 
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,itemCode);
@@ -646,14 +650,14 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 						sql = " select count(*) as count1 from sordalloc "
-								+" where  sale_order 	 	= ? "
-								+" and 	 line_no 		 	= ? "
-								+" and 	 exp_lev 			= ? "
-								+" and 	 item_code__ord 	= ? "
-								+" and 	 item_code 			= ? "
-								+" and 	 lot_no 				= ? "
-								+" and 	 lot_sl 				= ? "
-								+" and 	 loc_code 			= ? ";
+							+" where  sale_order 	 	= ? "
+							+" and 	 line_no 		 	= ? "
+							+" and 	 exp_lev 			= ? "
+							+" and 	 item_code__ord 	= ? "
+							+" and 	 item_code 			= ? "
+							+" and 	 lot_no 				= ? "
+							+" and 	 lot_sl 				= ? "
+							+" and 	 loc_code 			= ? ";
 
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,sordNo);
@@ -687,8 +691,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						if(isAllocated == "Y")
 						{
 							sql ="select qty_alloc  from sordalloc "
-									+"  where sale_order 	 = ? and line_no 		 = ? and exp_lev 		 = ? 	and item_code__ord = ? and item_code 	 	 = ? "
-									+"	and lot_no 			 = ? and lot_sl 			 = ? and loc_code 		 = ? ";
+								+"  where sale_order 	 = ? and line_no 		 = ? and exp_lev 		 = ? 	and item_code__ord = ? and item_code 	 	 = ? "
+								+"	and lot_no 			 = ? and lot_sl 			 = ? and loc_code 		 = ? ";
 
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,sordNo);
@@ -714,7 +718,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							if((qtyAlloc - quantityStduom) <= 0.0)
 							{
 								sql =" delete from sordalloc where sale_order  = ? and line_no = ? and exp_lev = ? and item_code__ord = ? and item_code  = ?"
-										+" and lot_no = ? and lot_sl = ? and loc_code  = ? ";
+									+" and lot_no = ? and lot_sl = ? and loc_code  = ? ";
 
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,sordNo);
@@ -735,8 +739,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							}
 							else{
 								sql = "Update sordalloc 		set status 		= 'D', qty_alloc 	=  qty_alloc - ? "
-										+" where sale_order 	 = ? and line_no 		 = ?  and   exp_lev 		 = ? and item_code__ord = ? and item_code 	 	 = ? "
-										+"	and lot_no 			 = ? and lot_sl 			 = ? and loc_code 		 = ? ";
+									+" where sale_order 	 = ? and line_no 		 = ?  and   exp_lev 		 = ? and item_code__ord = ? and item_code 	 	 = ? "
+									+"	and lot_no 			 = ? and lot_sl 			 = ? and loc_code 		 = ? ";
 								pstmt = conn.prepareStatement(sql);
 								//pstmt.setDouble(1,qtyAlloc - quantityStduom);
 								pstmt.setDouble(1,quantityStduom);
@@ -760,8 +764,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						}
 
 						sql = " update sorditem	set status	  = 'D', qty_alloc = qty_alloc - ? , " +
-								"  qty_desp  = (case when qty_desp is null then 0 else qty_desp end )  + ? , "+
-								"  date_desp = ? where sale_order = ? and line_no    = ? and exp_lev	  = ? ";
+						"  qty_desp  = (case when qty_desp is null then 0 else qty_desp end )  + ? , "+
+						"  date_desp = ? where sale_order = ? and line_no    = ? and exp_lev	  = ? ";
 
 						pstmt = conn.prepareStatement(sql);
 						//	pstmt.setDouble(1,quantity);
@@ -784,7 +788,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 						sql = "  select grade ,acct_code__inv,cctr_code__inv  from   stock "
-								+" where  site_code = ? and    item_code = ? and    loc_code = ? and    lot_no = ? and    lot_sl = ? ";
+							+" where  site_code = ? and    item_code = ? and    loc_code = ? and    lot_no = ? and    lot_sl = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,siteCode);
 
@@ -813,7 +817,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 						sql = "   select order_type, item_ser  from sorder  "
-								+" where  sale_order = ?";
+							+" where  sale_order = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,sordNo);
 
@@ -832,7 +836,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 
 						sql   =     " select acct_code__cogs, cctr_code__cogs from   item_acct_detr 	where  item_ser = ?  and    grp_code = ' '"
-								+" and    item_code = ' ' and    tran_type = ? ";
+							+" and    item_code = ' ' and    tran_type = ? ";
 
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,itemSer);
@@ -887,19 +891,19 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						if(hldQty > 0.0)
 						{
 							sql =  "  Select a.lock_code ,a.tran_id "
-									+ "	From inv_hold a, inv_hold_det b , inv_hold_rel_trace c"
-									+ "	Where a.tran_id = b.tran_id "
-									+ "	And b.tran_id = c.ref_no "
-									+ "	And c.item_code  = ? "
-									+ "	And c.site_code = ? "
-									+ "	And c.loc_code  = ? "
-									+ "	And c.lot_no    = ? "
-									+ "	And c.lot_sl    = ? "
-									+ "	And b.lot_no    = ? "
-									+ "	And b.lot_sl    = ? "
-									+ "	And (b.line_no_sl = 0 or b.line_no_sl is null) "
-									+ "	And a.confirmed='Y' "
-									+ "	And b.hold_status ='H' ";
+								+ "	From inv_hold a, inv_hold_det b , inv_hold_rel_trace c"
+								+ "	Where a.tran_id = b.tran_id "
+								+ "	And b.tran_id = c.ref_no "
+								+ "	And c.item_code  = ? "
+								+ "	And c.site_code = ? "
+								+ "	And c.loc_code  = ? "
+								+ "	And c.lot_no    = ? "
+								+ "	And c.lot_sl    = ? "
+								+ "	And b.lot_no    = ? "
+								+ "	And b.lot_sl    = ? "
+								+ "	And (b.line_no_sl = 0 or b.line_no_sl is null) "
+								+ "	And a.confirmed='Y' "
+								+ "	And b.hold_status ='H' ";
 
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,itemCode);
@@ -979,7 +983,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 							sql = "select exp_date,mfg_date,site_code__mfg,pack_code,acct_code__inv,cctr_code__inv "
 
-	                    	+"	from stock where site_code = ? and item_code = ? and loc_code = ? and lot_no = ? and lot_sl = ? ";
+								+"	from stock where site_code = ? and item_code = ? and loc_code = ? and lot_no = ? and lot_sl = ? ";
 
 
 							pstmt = conn.prepareStatement(sql);
@@ -1021,7 +1025,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 							{
 								sql = 	" Update stock 	set  hold_qty = case when hold_qty is null then 0 else hold_qty end + ? Where item_code  = ?  And site_code = ? "
-										+" And loc_code  = ? And lot_no  = ? And lot_sl  = ? ";
+									+" And loc_code  = ? And lot_no  = ? And lot_sl  = ? ";
 
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setDouble(1,quantityStduom);
@@ -1036,7 +1040,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 								pstmt = null;
 
 								sql = 	"update inv_hold_det	set loc_code = ?, site_code  = ? Where tran_id   = ? And item_code = ? And lot_no  = ? "
-										+"  And lot_sl  = ? And loc_code  = ? And hold_status ='H'" ;
+									+"  And lot_sl  = ? And loc_code  = ? And hold_status ='H'" ;
 
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,invStatTransit);
@@ -1053,7 +1057,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 								pstmt = null;
 
 								sql = "	update inv_hold_rel_trace 	set loc_code    = ?,	site_code  = ? Where ref_no   = ? And site_code   = ? "
-										+"	And item_code   = ? 	And lot_no   = ? And lot_sl  = ? And loc_code = ? And hold_qty    > 0  ";
+									+"	And item_code   = ? 	And lot_no   = ? And lot_sl  = ? And loc_code = ? And hold_qty    > 0  ";
 
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,invStatTransit);
@@ -1077,7 +1081,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						//Updating sorder status.	
 
 						sql = "select sum(quantity) as lc_order_qty , sum(quantity) - sum(qty_desp) as mqty_chk from sorditem "
-								+ "where sale_order = ?  and line_type = 'I'";
+							+ "where sale_order = ?  and line_type = 'I'";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,sordNo);
 						rs = pstmt.executeQuery();
@@ -1105,7 +1109,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						}
 
 						sql = " update sorder	set  status = ?,order_status = ?,  status_date = ?,alloc_flag  = ? "
-								+" where  sale_order = ?";
+							+" where  sale_order = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,status);
 						pstmt.setString(2,status);
@@ -1137,7 +1141,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						{
 
 							sql = "Select (case when ordc_perc is null then 0 else ordc_perc end) as mCancperc "
-									+"	from item where item_code = ? "	;	
+								+"	from item where item_code = ? "	;	
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,itemCode);
 							rs = pstmt.executeQuery();
@@ -1196,7 +1200,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 								if(detCount == 0)
 								{
 									sql = "update sorder set   status   = 'C', status_date = ?, alloc_flag  = 'Y', order_status = 'C'  " 
-											+"where  sale_order = ? " ;	
+										+"where  sale_order = ? " ;	
 
 									pstmt = conn.prepareStatement(sql);
 									pstmt.setTimestamp(1,despDate);
@@ -1244,7 +1248,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						{
 							bondTaxAmt = 0.0;
 							sql = "select Sum(case when tax_amt is null then 0 else tax_amt end) as tax_amt from   taxtran Where  tran_code = 'S-DSP'  and tran_id = ? "
-									+ "and line_no = ? and tax_code IN ( select tax_code from tax where tax_group in ( ? )" ;
+								+ "and line_no = ? and tax_code IN ( select tax_code from tax where tax_group in ( ? )" ;
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,tranId);
 							pstmt.setString(2,lineNo);
@@ -1264,8 +1268,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 								int cnt4=0;
 								bondValue = 0.0;
 								sql = "select bond_no, case when  bond_value is null then 0 else bond_value end as bond_value,case when  bank_guarantee is null then 0 else bank_guarantee end " 
-										+ " as lc_bank_guarantee from b17_bond where site_code = ? and ? >= eff_from and ? <= valid_upto "
-										+"	and case when confirmed is null then 'N' else confirmed end = 'Y'	and bond_type = 'B' " ;
+									+ " as lc_bank_guarantee from b17_bond where site_code = ? and ? >= eff_from and ? <= valid_upto "
+									+"	and case when confirmed is null then 'N' else confirmed end = 'Y'	and bond_type = 'B' " ;
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,siteCode);
 								pstmt.setTimestamp(2,despDate);
@@ -1345,8 +1349,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							Timestamp fromDate = null;
 
 							sql = " select d.sord_no,d.cust_code,so.order_type, d.desp_date, so.site_code__ship " +
-									" from despatch d, sorder so " +
-									" where d.desp_id = ? and d.sord_no = so.sale_order ";
+							" from despatch d, sorder so " +
+							" where d.desp_id = ? and d.sord_no = so.sale_order ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, tranId );
 							rs = pstmt.executeQuery();
@@ -1370,23 +1374,38 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							//Boolean adjDrcrFlag= false, adjAdv=false, adjNewProdInvFlag=false;
 							clubOrder = "N";
 							clubPendingOrd="N";
-							adjDrcr="N";
-							adjCustAdv="N";
-							advAdjMode="C";
-							adjNewProdInv="N";
-
-
+							//adjDrcr="N";
+							//adjCustAdv="N";
+							//advAdjMode="C";
+							//adjNewProdInv="N";
+
+							adjDrcr = checkNull(distCommon.getDisparams("999999","ADJUST_DR_CR_NOTE",conn));
+							adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn));
+							adjNewProdInv = checkNull(distCommon.getDisparams("999999","ADJUST_NEW_PRODUCT_INVOICE",conn));
+							advAdjMode = checkNull(distCommon.getDisparams("999999","ADJ_ADV_CUST_SALE",conn));
+
+							System.out.println("@@@@@adjDrcr["+adjDrcr+"]adjCustAdv["+adjCustAdv+"]adjNewProdInv["+adjNewProdInv+"]advAdjMode["+advAdjMode+"]");
+							
 							PostOrderProcess postOrderProcess = new PostOrderProcess();
-
-
 							// fromSaleOrder,   toSaleOrder, fromCustCode,   toCustCode, tranIdDespatch,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn
-
+							long startTime = System.currentTimeMillis();
+							System.out.println("START TIME FOR POST ORDER PROCESS IN SECONDS:::["+startTime/1000+"]");
+							
 							errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId ,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn);
 
+							long endTime = System.currentTimeMillis();
+							System.out.println("END TIME FOR POST ORDER PROCESS IN SECONDS:::["+endTime/1000+"]");
+							System.out.println("DIFFERANCE IN TIME FOR POST ORDER PROCESS IN SECONDS:::["+(endTime-startTime)/1000+"]for SALE_ORDER["+fromSaleOrder+"]");
+
+							
 							System.out.println("@@@@@@@@@689 invPosting() errString::::::["+errString+"]");
+							if(errString.indexOf("Success") > -1)
+							{
+								errString = "";
+							}
 						}
 					}
-
+					System.out.println("@@@@@@@@@689 out:::::["+errString+"]");
 					if( errString == null || errString.trim().length() == 0)
 					{
 						System.out.println("errCode in despatch posting===="+errString);

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

@@ -62,7 +62,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 	double lcAdj = 0;
 	String xmlValues = null;
 	String mTranId="", mTranSer="", mRefNo="";
-	
+	String  sqlStr1 = "";
 	try
 	{
 
@@ -71,8 +71,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		genericUtility = new E12GenericUtility();
 		itmDBAccessEJB = new ITMDBAccessEJB();
 
-		//24/01/14 manoharan FI3JSUN007 adjust freight dr note also
-		drnNotIn = " ";
+		//24/01/14 manoharan FI3JSUN007 adjust freight dr note alsof
 
 		if (frtDrnArr.length == 1)
 		{
@@ -85,10 +84,15 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		drnNotIn ="";
 		for(int i = 0; i < frtDrnArr.length; i++)
 		{
-			drnNotIn =drnNotIn+"'"+frtDrnArr[i]+"',";
+			if(  frtDrnArr[i] != null && frtDrnArr[i].trim().length() > 0)
+			{
+				drnNotIn =drnNotIn+"'"+frtDrnArr[i]+"',";
+			}
 		}
-		drnNotIn =drnNotIn.substring(0,drnNotIn.length()-1);
-		System.out.println("12-Mar-16 manoharan drnNotIn after ["+drnNotIn + "]");
+		if( drnNotIn != null && drnNotIn.trim().length() > 0)
+		{
+			drnNotIn =drnNotIn.substring(0,drnNotIn.length()-1);
+		}System.out.println("12-Mar-16 manoharan drnNotIn after ["+drnNotIn + "]");
 		adjustNewProduct = distCommon.getDisparams("999999","ADJUST_NEWPRODUCT",conn);
 		if (!"NULLFOUND".equals(adjustNewProduct) || "Y".equals(adjustNewProduct) )
 		{
@@ -257,23 +261,23 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		pstmt.close();
 		pstmt = null;
 		//ended by bhavin
-
+System.out.println("@@@@@@@@264 drnNotIn["+drnNotIn+"]");
 		//24/01/14 Manoharan FI3JSUN007 adjust all the freight drn
 		if (drnNotIn.trim().length() > 0  )
 		{
-			sqlStr = "insert into receivables_adj "
+			sqlStr1 = "insert into receivables_adj "
 				+ "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
 				+ " values (?, ?, ?, ?, ?, 0, ?, ? ,?) ";
-			pstmtInsert  = conn.prepareStatement(sqlStr);
+			pstmtInsert  = conn.prepareStatement(sqlStr1);
 			//old logic kept in this Condition
 			sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables "
-				+ " where  tran_ser = 'MDRCRD' and ref_no in ( ? ) "  //( " + drnNotIn + ") ) "
+				+ " where  tran_ser = 'MDRCRD' and ref_no in ( "+drnNotIn+" ) "  
 				+ " and tot_amt - adj_amt > 0 " 
 				+ " and site_code = '" + siteCode + "' " 
 				+ " and item_ser  = '" + itemSer + "' " 
 				+ " and cust_code = '" + custCode + "' order by tran_id ";
 			pstmt = conn.prepareStatement(sqlStr);
-			pstmt.setString(1,mOrderNo);
+			//pstmt.setString(1,drnNotIn);
 			rs = pstmt.executeQuery();
 			while(rs.next())
 			{
@@ -328,7 +332,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		//04-09-2005 manoharan
 		//reverted on 15-09-2005 as per sun requirement
 		//if (adjDrCr = TRUE ) //Commented by jasmina-19/01/10-DI89SUN228
-
+System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdInv+"]adjustNewProduct["+adjustNewProduct+"]ordTypeNewPrd["+ordTypeNewPrd+"]");
 		if (adjDrCr  || (adjNewProdInv  && ("Y".equals(adjustNewProduct) && ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) ) ) //Added by jasmina-19/01/10-DI89SUN228
 		{
 			//if (adjDrCr or adjustNewProduct = 'Y' )
@@ -353,8 +357,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			//
 
 			String[] arrStr;
+			System.out.println("@@@@@@@@360 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdInv+"]");
 			if (adjDrCr && adjNewProdInv ) //if (condition Added by jasmina-19/01/10-DI89SUN228
 			{
+				System.out.println("1@@@@@@@@ tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
 				//old logic kept in this Condition
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) 
@@ -394,6 +400,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 				//}
 				// 04-09-2005 manoharan
 				//if ((not isnull(ordTypeNewPrd)) and (len(trim(ordTypeNewPrd)) > 0) )
+				System.out.println("@@@@@@@@ ordTypeNewPrd["+ordTypeNewPrd+"]adjustNewProduct["+adjustNewProduct+"]tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
 				if (ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) )
 				{
 					// end 04-09-2005 manoharan
@@ -418,7 +425,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 					}
 					else
 					{
-						sqlStr = sqlStr + " ) ";
+					//	sqlStr = sqlStr + " ) ";//TEST
 					}
 				}
 				sqlStr =  sqlStr + " and tot_amt - adj_amt > 0 " 
@@ -430,6 +437,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}
 			else if (adjDrCr && (!adjNewProdInv) )  //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
+				System.out.println("2@@@@@@@@ ");
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) 
 				{
@@ -476,6 +484,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}
 			else if (!adjDrCr && adjNewProdInv ) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
+				System.out.println("3@@@@@@@@ ");
 				if ( ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) )
 				{
 					
@@ -503,10 +512,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 
 			
 			
-			sqlStr = "insert into receivables_adj "
+			sqlStr1 = "insert into receivables_adj "
 				+ "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
 				+ " values (?, ?, ?, ?, ?, 0, ?, ? ,?) ";
-			pstmtInsert  = conn.prepareStatement(sqlStr);
+			pstmtInsert  = conn.prepareStatement(sqlStr1);
 
 			pstmt = conn.prepareStatement(sqlStr);
 			rs = pstmt.executeQuery();
@@ -593,6 +602,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			//String[] arrStr;
 			if (adjDrCr && adjNewProdInv) //if (condition Added by jasmina-19/01/10-DI89SUN228
 			{
+				System.out.println("4@@@@@@@@ ");
 				//old logic kept in this Condition
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
@@ -658,7 +668,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 					}
 					else
 					{
-						sqlStr = sqlStr + " ) ";
+						//sqlStr = sqlStr + " ) ";
 					}
 				}
 				sqlStr =  sqlStr + " and tot_amt - adj_amt > 0 " 
@@ -670,6 +680,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}
 			else if (adjDrCr && !adjNewProdInv)  //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
+				System.out.println("5@@@@@@@@ tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
 				{
@@ -716,7 +727,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}	
 			else if (!adjDrCr && adjNewProdInv) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
-				
+				System.out.println("6@@@@@@@@ ");
 				if ((ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) && "Y".equals(adjustNewProduct))
 				{
 					arrStr = ordTypeNewPrd.split(",");
@@ -972,11 +983,11 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 				nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn);
 				System.out.println("nextID ["+nextID + "]");
 				// 09-01-02 End Arif
-				sqlStr = "insert into receivables_adj "
+				sqlStr1 = "insert into receivables_adj "
 					+ " (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
 					+ " values (?, ?, ?, ?, ?, ?, ?, ? ,?) ";
 				pstmtInsert.close();	
-				pstmtInsert = conn.prepareStatement(sqlStr);
+				pstmtInsert = conn.prepareStatement(sqlStr1);
 
 				pstmtInsert.setString(1,nextID);
 				pstmtInsert.setString(2,mTranSer);
@@ -1015,29 +1026,29 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn);
 			System.out.println("nextID ["+nextID + "]");
 			// 09-01-02 End Arif
-			sqlStr = "INSERT INTO receivables_adj "
+			sqlStr1 = "INSERT INTO receivables_adj "
 				+ " (tran_id, ref_ser, ref_no, tot_amt, "
 				+ " adj_amt, ref_ser_adj, ref_no_adj, "
 				+ " net_amt, tran_id__rcv ) "
 				+ " values (?, ?, ?, ?, ?, ' ', ' ', ?, ' ') ";
-			pstmtInsert = conn.prepareStatement(sqlStr);
+			pstmtInsert = conn.prepareStatement(sqlStr1);
 
 			pstmtInsert.setString(1,nextID);
 			pstmtInsert.setString(2,adjTranSer);
 			pstmtInsert.setString(3,adjRefNo);
 			pstmtInsert.setDouble(4,netAmt);
-			pstmtInsert.setDouble(5,(mDrAmt - netAmt) * -1);
+			pstmtInsert.setDouble(5,netAmt-((mDrAmt - netAmt) * -1));
 			pstmtInsert.setDouble(6,(netAmt - (mDrAmt - netAmt)));
 			pstmtInsert.executeUpdate();
 			pstmtInsert.close();
 			//ended by prince                
 			sqlStr = "update invoice "
 				+ " set adj_amount = ? "
-				+ " where invoice_id =  ? ";
+				+ " where invoice_id  =  ? ";
 			pstmtInsert = conn.prepareStatement(sqlStr);
 
 			pstmtInsert.setDouble(1,(mDrAmt - netAmt) * -1);
-			pstmtInsert.setString(1,invoiceId);
+			pstmtInsert.setString(2,invoiceId);
 			pstmtInsert.executeUpdate();
 
 		}

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

@@ -31,7 +31,8 @@ public class PostOrdCreditChk
 {
 
 	//public HashMap CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException//Amit 27/10/04. This function is a copy of gf_credit_check function.
-	public String CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException
+	//public String CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException
+	public ArrayList<String> CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException//Amit 27/10/04. This function is a copy of gf_credit_check function.
 	{
 		int mCount=0, mChkDays=0, llIgnGays=0, llSerCount=0, llPolicyNo=0 ;
 		String errString = " ", mStat="", lsCreditTerm="", lsVarValue="", lsItemSerCrPolicy="", lsItemSer="", lsConsiderPbo="", lsOrdNewPrd="" ;
@@ -78,6 +79,8 @@ public class PostOrdCreditChk
 		int ctr=0;
 		String lsMail[]=null,asCheck[]=null,gs_inv_call_fr="";
 		//E12GenericUtility e12GenericUtility = new E12GenericUtility();
+		
+		ArrayList<String> retArrayList = new ArrayList<String>();
 		try
 		{
 			Timestamp currDate = new java.sql.Timestamp(System.currentTimeMillis());
@@ -397,8 +400,21 @@ public class PostOrdCreditChk
 							////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 							//******************							gbf_credit_check_update(asSorder,'P01',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
 
-							credit_check_update(asSorder,"P01",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
-
+							
+							retArrayList = credit_check_update(asSorder,"P01",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+							
+							// added on 19/04/16 for status and amount
+							System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+							if( retArrayList.size() > 0)
+							{
+								lsStatus = retArrayList.get(0);
+							}
+							if( retArrayList.size() > 1)
+							{
+								lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+							}	
+							System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+							
 							//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
 							if ("I".equalsIgnoreCase(asApplyTime))
 							{
@@ -408,7 +424,7 @@ public class PostOrdCreditChk
 							{
 								lsStr3 = ", Sales Order Amt.=> "+String(adNetAmt);
 							}
-							lsStr = lcCheckAmt +"\t " +lsStr1 + ", " + lsStr2 +", " + lsStr3;
+							lsStr = lcCheckAmt +"\t" +lsStr1 + ", " + lsStr2 +", " + lsStr3;
 
 							if (lcCheckAmt > 0)
 							{
@@ -545,7 +561,20 @@ public class PostOrdCreditChk
 
 							//******************						gbf_credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus);
 
-							credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+							retArrayList = credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+							
+							// added on 19/04/16 for status and amount
+							System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+							if( retArrayList.size() > 0)
+							{
+								lsStatus = retArrayList.get(0);
+							}
+							if( retArrayList.size() > 1)
+							{
+								lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+							}	
+							System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+							
 
 							lsStr1 = "Outstanding amount exceeds limit for customer "+lsCustName;
 							lsStr2 = " , Total O/S Amt: " + mTotOsAmt + " for division "+ lsItemSerDescr.trim() + " exceeds limit: "+ mCrLimit ; 
@@ -639,8 +668,21 @@ public class PostOrdCreditChk
 							////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 							//******************					gbf_credit_check_update(asSorder,'P03',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
 
-							credit_check_update(asSorder,"P03",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+							retArrayList = credit_check_update(asSorder,"P03",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+							// added on 19/04/16 for status and amount
+							System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+							if( retArrayList.size() > 0)
+							{
+								lsStatus = retArrayList.get(0);
+							}
+							if( retArrayList.size() > 1)
+							{
+								lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+							}	
+							System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+							
+							
 							lsStr1 = "Overall credit check failed for "+lsCustName;
 							lsStr2 = " , Total O/S Amt over and above "+ llIgnGays  +" days is " + mTotalOsAmt + " exceeds limit: "+String(mIgnCr);
 							//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -787,8 +829,21 @@ public class PostOrdCreditChk
 
 							////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 							//******************					gbf_credit_check_update(asSorder,'P04',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-							credit_check_update(asSorder,"P04",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+							retArrayList = credit_check_update(asSorder,"P04",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+							// added on 19/04/16 for status and amount
+							System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+							if( retArrayList.size() > 0)
+							{
+								lsStatus = retArrayList.get(0);
+							}
+							if( retArrayList.size() > 1)
+							{
+								lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+							}	
+							System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+							
+							
 							lsStr1 = "Overall total credit check failed for "+lsCustName;
 							lsStr2 = " , Total O/S Amt: "+ mTotOsAmt + " exceeds credit limit: "+ mCrLimit; 
 							//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -948,8 +1003,21 @@ public class PostOrdCreditChk
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************						gbf_credit_check_update(asSorder,'P05',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
 
-								credit_check_update(asSorder,"P05",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList = credit_check_update(asSorder,"P05",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+									System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+									if( retArrayList.size() > 0)
+									{
+										lsStatus = retArrayList.get(0);
+									}
+									if( retArrayList.size() > 1)
+									{
+										lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+									}	
+									System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+									
+								 
 								lsStr1 = lsCustName + " is on Advance Term";
 								lsStr2 = " , Credit Balance: "+ lcNetAdv + " is less than invoice amount: "+ adNetAmt;
 								//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -1103,8 +1171,21 @@ public class PostOrdCreditChk
 								{
 									////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 									//******************							gbf_credit_check_update(asSorder,'P06',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
-									credit_check_update(asSorder,"P06",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+									retArrayList = credit_check_update(asSorder,"P06",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+									// added on 19/04/16 for status and amount
+									System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+									if( retArrayList.size() > 0)
+									{
+										lsStatus = retArrayList.get(0);
+									}
+									if( retArrayList.size() > 1)
+									{
+										lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+									}	
+									System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+									
+									
 									lsStr1 = lsCustName + " is crossing the business limit";
 									lsStr2 = " , Sales for the month: " + lcNetAmt + " exceeds defined business limit: "+ lcBusiLimit +"*"+asItemSer;
 									//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -1246,8 +1327,21 @@ public class PostOrdCreditChk
 
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************					gbf_credit_check_update(asSorder,'P07',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-								credit_check_update(asSorder,"P07",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList = credit_check_update(asSorder,"P07",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
 								lsStr1 = lsCustName + " is crossing the minimum invoice limit";
 								lsStr2 = " , Net Invoice Amt: " + adNetAmt + " is below the minimum sales value: " + lcMinInvAmt;
 								//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -1342,8 +1436,21 @@ public class PostOrdCreditChk
 								{
 									////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 									//******************							gbf_credit_check_update(asSorder,'P08',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-									credit_check_update(asSorder,"P08",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+									retArrayList = credit_check_update(asSorder,"P08",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+									// added on 19/04/16 for status and amount
+									System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+									if( retArrayList.size() > 0)
+									{
+										lsStatus = retArrayList.get(0);
+									}
+									if( retArrayList.size() > 1)
+									{
+										lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+									}	
+									System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+									
+									
 									lsStr1 = "Rate is not matching with price list master";
 									lsStr2 = " , Rate From Master: " + lcPickRate + " does not match with sales order detail rate: " + lcRate;
 									//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -1513,8 +1620,21 @@ public class PostOrdCreditChk
 
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************						gbf_credit_check_update(asSorder,'P09',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-								credit_check_update(asSorder,"P09",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList = credit_check_update(asSorder,"P09",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
 								lsSql = "select sp_name from sales_pers where sales_pers = ?";
 
 								pstmt = conn.prepareStatement(lsSql);
@@ -1640,8 +1760,22 @@ public class PostOrdCreditChk
 
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************					gbf_credit_check_update(asSorder,'P10',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
-								credit_check_update(asSorder,"P10",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList = credit_check_update(asSorder,"P10",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
+								
 								lsSql = "select sp_name from sales_pers where sales_pers = ?";
 
 								pstmt = conn.prepareStatement(lsSql);
@@ -1819,8 +1953,21 @@ public class PostOrdCreditChk
 
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************						gbf_credit_check_update(asSorder,'P11',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-								credit_check_update(asSorder,"P11",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList = credit_check_update(asSorder,"P11",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
 								lsSql = "select sp_name from sales_pers where sales_pers = ?";
 
 								pstmt = conn.prepareStatement(lsSql);
@@ -1948,8 +2095,21 @@ public class PostOrdCreditChk
 							{
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************					gbf_credit_check_update(asSorder,'P12',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-								credit_check_update(asSorder,"P12",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList =  credit_check_update(asSorder,"P12",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
 								lsSql = "select sp_name from sales_pers where sales_pers = ?";
 
 								pstmt = conn.prepareStatement(lsSql);
@@ -2134,8 +2294,21 @@ public class PostOrdCreditChk
 							{
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************						gbf_credit_check_update(asSorder,'P13',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-								credit_check_update(asSorder,"P13",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList = credit_check_update(asSorder,"P13",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
 								lsSql = "select name from contact where contact_code = ? ";
 
 								pstmt = conn.prepareStatement(lsSql);
@@ -2262,8 +2435,21 @@ public class PostOrdCreditChk
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************					gbf_credit_check_update(asSorder,'P14',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
 
-								credit_check_update(asSorder,"P14",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList =  credit_check_update(asSorder,"P14",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
 								lsSql = "select name from contact where contact_code = ? ";
 
 								pstmt = conn.prepareStatement(lsSql);
@@ -2369,8 +2555,21 @@ public class PostOrdCreditChk
 						{
 							////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 							//******************					gbf_credit_check_update(asSorder,'P15',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-							credit_check_update(asSorder,"P15",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+							retArrayList =  credit_check_update(asSorder,"P15",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+							// added on 19/04/16 for status and amount
+							System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+							if( retArrayList.size() > 0)
+							{
+								lsStatus = retArrayList.get(0);
+							}
+							if( retArrayList.size() > 1)
+							{
+								lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+							}	
+							System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+							
+							
 							lsStr1 = "Cash discount credit check failed for customer " + lsCustName;
 							lsStr2 = " , Total over due O/S Amt: " + mTotOsAmt;
 							//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -2508,8 +2707,21 @@ public class PostOrdCreditChk
 
 								////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 								//******************					gbf_credit_check_update(asSorder,'P16',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-								credit_check_update(asSorder,"P16",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+								retArrayList =  credit_check_update(asSorder,"P16",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+								// added on 19/04/16 for status and amount
+								System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+								if( retArrayList.size() > 0)
+								{
+									lsStatus = retArrayList.get(0);
+								}
+								if( retArrayList.size() > 1)
+								{
+									lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+								}	
+								System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+								
+								
 								lsStr1 = "Advance credit check failed for customer " + lsCustName;
 								lsStr2 = " , Total Advance Amt: " + mTotOsAmt + " exceeds order amount: " + lcPendOrd;
 								//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -2596,8 +2808,21 @@ public class PostOrdCreditChk
 						{
 							////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 							//******************					gbf_credit_check_update(asSorder,'P17',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
-							credit_check_update(asSorder,"P17",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+							retArrayList =  credit_check_update(asSorder,"P17",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+							// added on 19/04/16 for status and amount
+							System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+							if( retArrayList.size() > 0)
+							{
+								lsStatus = retArrayList.get(0);
+							}
+							if( retArrayList.size() > 1)
+							{
+								lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+							}	
+							System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+							
+							
 							lsStr1 = "";
 							lsStr2 = " Total Advance Amt: " + lcAdvVal + " less than advance percentage specified in sale order";
 							//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
@@ -2681,7 +2906,7 @@ public class PostOrdCreditChk
 						}
 						lsFail = "F";
 
-
+						System.out.println("@@@@ lsPolicySql====["+lsPolicySql+"]lsPolicyInput["+lsPolicyInput+"]lsPolicyResult["+lsPolicyResult+"]lsPolicyCondition["+lsPolicyCondition+"]");
 						////If policy_sql is null then credit check will not be done.
 						if (lsPolicySql != null && lsPolicySql.trim().length() > 0 )
 						{
@@ -2691,7 +2916,7 @@ public class PostOrdCreditChk
 							{
 
 								arrStr = lsPolicyInput.split(",");
-								arrSql = lsPolicySql.split ("?");
+								arrSql = lsPolicySql.split ("\\?");
 								lsSql = "";
 								int arrCtr = 0;
 								for (arrCtr = 0; arrCtr < arrStr.length; arrCtr++)
@@ -2722,6 +2947,7 @@ public class PostOrdCreditChk
 										lsValue = "" + adNetAmt;
 									}
 									lsSql = lsSql + arrSql[arrCtr] + lsValue;
+									System.out.println("@@@@1 lsSql====["+lsSql+"]arrCtr===["+arrCtr+"]");
 								}
 								if (arrStr.length < arrSql.length)
 								{
@@ -2733,13 +2959,15 @@ public class PostOrdCreditChk
 							{
 								lsSql = lsPolicySql;
 							}
-
+							System.out.println("@@@@2 lsSql====["+lsSql+"]");
 							////Executing the dynamit sql to get the result.
 
 							pstmt = conn.prepareStatement(lsSql);
 							rs = pstmt.executeQuery();
 							ResultSetMetaData rsmd=rs.getMetaData();  
-							int resultType = Integer.parseInt(rsmd.getColumnTypeName(1));
+						//	int resultType = Integer.parseInt(rsmd.getColumnTypeName(1));
+							int resultType = rsmd.getColumnType(1);
+							System.out.println("@@@@@ resultType["+resultType+"]");
 							lsResult = "";
 							double lcResult = 0;
 							int liResult = 9;
@@ -2771,11 +2999,13 @@ public class PostOrdCreditChk
 							{
 								if( resultType== 4 || resultType == 5)
 								{									
-									liResult = rs.getInt(1);
+									//liResult = rs.getInt(1);
+									lsResult = rs.getString(1);
 								} 
 								else if( resultType >= 2 && resultType <= 8)
 								{									
-									lcResult = rs.getDouble(1);
+									//lcResult = rs.getDouble(1);
+									lsResult = rs.getString(1);
 								}
 								else if( resultType == 1 || resultType == 12)
 								{									
@@ -2792,7 +3022,7 @@ public class PostOrdCreditChk
 							pstmt.close();
 							pstmt = null;
 
-
+							System.out.println("@@@@@@@lsPolicyCondition["+lsPolicyCondition+"]lsPolicyResult["+lsPolicyResult+"] lsResult["+lsResult+"]ldtResultResult["+ldtResultResult+"]");
 							////comparing the sql result with the given result in policy_result using the conditional
 							////operater given in the policy_condition column.
 							if (lsPolicyCondition != null && lsPolicyCondition.trim().length() > 0 && lsPolicyResult != null && lsPolicyResult.trim().length() > 0)
@@ -2949,9 +3179,11 @@ public class PostOrdCreditChk
 							}
 
 						}
+						
+						System.out.println("@@@@ 3182 lsFail["+lsFail+"]");
 					}
 				}
-
+				System.out.println("@@@@ 3185 lsFail["+lsFail+"]");
 				//Added Ruchira 08/06/2k6
 				//Credit check is failed so adding it into the asCheck array.
 				if("T".equalsIgnoreCase(lsFail))
@@ -2961,7 +3193,7 @@ public class PostOrdCreditChk
 					sql = " select title  from   itemser_cr_policy " +
 							"	where  item_ser  =  ? " +
 							" and    cr_policy = ?  ";
-					pstmt = conn.prepareStatement(lsSql);
+					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,asItemSer);
 					pstmt.setString(2,lsCrPolicy);
 					rs = pstmt.executeQuery();
@@ -2979,7 +3211,7 @@ public class PostOrdCreditChk
 					{
 						lsStr1 = lsCrPolicy+" Dynamic credit check failed !!!";
 					}
-				}
+				//}
 
 				//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
 				if ("I".equals(asApplyTime))
@@ -2998,8 +3230,21 @@ public class PostOrdCreditChk
 
 				////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 				//******************							gbf_credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
-				credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+				retArrayList =  credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 
+				// added on 19/04/16 for status and amount
+				System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+				if( retArrayList.size() > 0)
+				{
+					lsStatus = retArrayList.get(0);
+				}
+				if( retArrayList.size() > 1)
+				{
+					lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+				}	
+				System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
+				
+				
 				////Always when credit check fails it must get added into as_mail.
 				if (!"O".equals(lsStatus))
 				{
@@ -3010,7 +3255,8 @@ public class PostOrdCreditChk
 				{
 					//asCheck[ctr] = lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr;
 					//ctr = ctr + 1;
-					asCheckList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
+					//asCheckList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
+					failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
 				}
 			}
 
@@ -3021,6 +3267,9 @@ public class PostOrdCreditChk
 				//******************							credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,'U',lsStatus)
 				credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
 			}
+			
+			
+		}
 			////End Added Ruchira 29/08/2k6
 
 			//End Added Ruchira 08/06/2k6
@@ -3154,7 +3403,8 @@ public class PostOrdCreditChk
 			}
 
 		}
-		return errString;
+//		return errString;
+		return failedPolicyList;
 
 	}
 
@@ -3576,7 +3826,7 @@ public class PostOrdCreditChk
 			return crPolicyList;
 		}
 
-		public void credit_check_update(String SOrder, String cr_policy,double adNetAmt, String  asApplyTime, double lcCheckAmt,String as_check_flag,String lsStatus, Connection conn) throws SQLException
+		public ArrayList<String> credit_check_update(String SOrder, String cr_policy,double adNetAmt, String  asApplyTime, double lcCheckAmt,String as_check_flag,String lsStatus, Connection conn) throws SQLException
 		{
 			System.out.println("@@@@@@@@@@@ credit_check_update() called.............as_check_flag["+as_check_flag+"]lsStatus["+lsStatus+"]cr_policy["+cr_policy+"]asApplyTime["+asApplyTime+"]");
 			////Updating the overriden records in business_logic_check table by invoice amount.
@@ -3594,6 +3844,8 @@ public class PostOrdCreditChk
 			String sql = "", sql2 = "";
 			ResultSet rs = null,rs2 = null;
 
+			ArrayList<String> retArrayList = new ArrayList<String>();
+			
 			if("C".equalsIgnoreCase(as_check_flag)) // as_check_flag = 'C' then		//Calculate amount	
 			{		
 				sql = " select sum(aprv_amt), count(1)" +
@@ -3615,6 +3867,7 @@ public class PostOrdCreditChk
 				pstmt.close();
 				pstmt = null;
 
+				System.out.println("@@@@@@ lc_aprv_amt["+lc_aprv_amt+"]ll_count["+ll_count+"]");
 				//Checking for status only.
 				if( lc_aprv_amt == 0  && ll_count > 0 )	
 				{	
@@ -3784,8 +4037,13 @@ public class PostOrdCreditChk
 				pstmt = null;
 
 
-			}		
-
+				
+			}
+			System.out.println("@@@ lsStatus["+lsStatus+"]ac_check_amt["+ac_check_amt+"]");
+			retArrayList.add(lsStatus);
+			retArrayList.add(""+ac_check_amt);
+			
+			return retArrayList;
 		}//end if
 		////End Added Ruchira 24/08/2k6 (DI6SUN0120), If approved amt = 0 or status = 'O' then not to make any credit check.
 

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

@@ -8,6 +8,7 @@ import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ProcessEJB;
 import ibase.webitm.ejb.fin.InvAcct;
 import ibase.webitm.ejb.sys.UtilMethods;
+import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.TransIDGenerator;
 
@@ -33,6 +34,7 @@ import javax.naming.InitialContext;
 
 import org.w3c.dom.Document;
 //import ibase.utility.CommunicationComp;
+import org.w3c.dom.NodeList;
 
 @Stateless
 public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLocal,PostOrderProcessRemote
@@ -52,6 +54,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 	String err = "";
 	boolean postLogYn=false;
 	//Connection conn = null;
+	
+	
 	public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException
 	{
 		Document detailDom = null;
@@ -654,12 +658,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 								despatchConfirm = (DespatchConfirmLocal) ctx.lookup("ibase/DespatchConfirm/local");
 								System.out.println("-----------despatchConfirm------- " + despatchConfirm);
 								String forcedFlag="N";
-								errStringConf=despatchConfirm.confirm(tranIdDespatch, xtraParams, forcedFlag,conn);
-								System.out.println("errCode in despatch confirmation===="+errStringConf);
+								errString=despatchConfirm.confirm(tranIdDespatch, xtraParams, forcedFlag,conn);
+								System.out.println("errCode in despatch confirmation===="+errString);
 							}
 						}
 					}
-					if( errString.contains("CONFSUCC")|| errString.contains("VTPOSTDES") )
+					if(errString == null || errString.trim().length()==0 || "".equalsIgnoreCase(errString) || errString.contains("CONFSUCC")|| errString.contains("VTPOSTDES") )
 					{
 						errString = "";
 					}	
@@ -726,7 +730,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 		PreparedStatement pstmt=null;
 		ResultSet rs=null;
 		String applyTime="I",crPolicy="",lsStatus="";
-
+		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		String autoInvOnDesp = dis.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn);
 
 		if("Y".equalsIgnoreCase(autoInvOnDesp))
@@ -791,7 +795,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					System.out.println("invoiceId=====["+invoiceId+"]");
 
 					String itemSer=""; 
-					double netAmt=0;
+					double netAmt=0,lc_check_amt=0;
 
 					sql = " select item_ser,net_amt from invoice where invoice_id = ? ";
 					pstmt = conn.prepareStatement(sql);
@@ -819,14 +823,47 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					System.out.println("@@@@@@@@@@ paramMap["+paramMap+"]");
 
 					PostOrdCreditChk postOrdCreditChk = new PostOrdCreditChk();
-					errString = postOrdCreditChk.CreditCheck(paramMap, conn);
+					//errString = postOrdCreditChk.CreditCheck(paramMap, conn);
+					ArrayList<String> errStringList = new ArrayList<String>(); 
+					errStringList = postOrdCreditChk.CreditCheck(paramMap, conn);
+					System.out.println("@@@@@@@@@@@ errStringList size["+errStringList.size()+"]");
+					if( errStringList.size() > 0 )
+					{
+						conn.rollback();
+						int retCtr = writeBusinessLogicCheck( errStringList,siteCodeShip,applyTime,conn );
+
+						System.out.println("@@@@@@@@@ insert retCtr["+retCtr+"]errStringList.size()["+errStringList.size()+"]");
+						if( retCtr > 0  )
+						{
+							System.out.println("@@@@@@@@@ errorlist and inserted record missmatch........");
+							conn.commit();
+						}
+						//errString = "VTWBLGCCHK";
+						errString = itmDBAccessEJB.getErrorString("", "VTWBLGCCHK", "","", conn);
+						System.out.println("@@@@@@@@@@ writeBusinessLogicCheck errString["+errString+"]");
+					}
 
 					System.out.println("@@@@@@@@@2 postOrdCreditChk errString["+errString+"]");
 
 					if( errString == null || errString.trim().length() == 0 )
 					{
+						ArrayList<String> retArrayList = new ArrayList<String>();
 						// i_nvo_sales.gbf_credit_check_update(ls_sale_order,ls_cr_policy,mnet_amt,'S',lc_check_amt,'C',ls_status) 	//Added Ruchira 29/08/2k6, to pass invoice amt.
-						postOrdCreditChk.credit_check_update(fromSaleOrder, crPolicy, netAmt, "S", netAmt, "C", lsStatus, conn);
+						retArrayList = postOrdCreditChk.credit_check_update(fromSaleOrder, crPolicy, netAmt, "S", lc_check_amt, "C", lsStatus, conn);
+						
+						// added on 19/04/16 for status and amount
+						System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
+						if( retArrayList.size() > 0)
+						{
+							lsStatus = retArrayList.get(0);
+						}
+						if( retArrayList.size() > 1)
+						{
+							netAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
+						}	
+						System.out.println("@@@@@ crPolicy["+crPolicy+"]lc_check_amt["+lc_check_amt+"]lsStatus["+lsStatus+"]");
+						
+						
 						System.out.println("@@@@@@@@@@@@ postOrdCreditChk()...........finish.........");
 
 						System.out.println("@@@@@@@@@@@@ InvoiceDrcrAdj()...........calling..........");
@@ -918,6 +955,214 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 
 
 
+	private int writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws SQLException, ITMException 
+	{
+
+		PreparedStatement pstmt = null;
+		String sql = "",tranId="";
+		int cnt = 0,cnt2=0;
+		ResultSet rs = null;
+
+		String lsCrPolicy= "",asDespId="",asSorder="", lsStr="";
+
+		System.out.println("@@@@@@@@@@ errStringList["+errStringList.size()+"]");
+
+		for( int i = 0 ; i < errStringList.size(); i++)
+		{
+			lsCrPolicy= "";asDespId="";asSorder=""; lsStr="";
+			cnt2=0;
+
+			String str = errStringList.get(i).toString();
+
+			System.out.println("@@@@@@@ i["+i+"]str["+str+"]");
+
+			String strArray[]=str.split("\t");
+			System.out.println("@@@@@ strArray.length["+strArray.length+"]");
+			for(int j=0;j<strArray.length;j++)
+			{
+				if( strArray.length > 0 )
+				{
+					lsCrPolicy=strArray[0];
+				}
+				if( strArray.length > 1 )
+				{
+					asDespId=strArray[1];
+				}
+				if( strArray.length > 2 )
+				{
+					asSorder=strArray[2];
+				}
+				if( strArray.length > 4 )
+				{
+					lsStr=strArray[4];
+				}
+			}
+			System.out.println("@@@@@@@@["+lsCrPolicy+"]["+asDespId+"]["+asSorder+"]["+lsStr+"]");
+
+		
+
+			sql  = "select count(1) from BUSINESS_LOGIC_CHECK  where " +
+					" tran_type = ? and sale_order = ? and cr_policy = ? and aprv_stat = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,applyTime);
+			pstmt.setString(2,asSorder);
+			pstmt.setString(3,lsCrPolicy);
+			pstmt.setString(4,"O");
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				cnt2 = rs.getInt(1);
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			System.out.println("@@@@@@@@@@@@ BUSINESS_LOGIC_CHECK cnt2["+cnt2+"]");
+			if( cnt2 == 0 )
+			{	
+				tranId = generateTranId( "T_CRCHKTRACE",siteCode, conn );
+				if( tranId == null || tranId.trim().length() == 0 )
+				{
+					tranId = generateTranId( "GENERAL",siteCode, conn );
+				}
+				System.out.println("@@@@@@@@@@ tranId["+tranId+"]");
+				
+				sql = " insert into BUSINESS_LOGIC_CHECK (" +
+						" TRAN_ID, TRAN_TYPE, SALE_ORDER, CR_POLICY, DESCR, APRV_STAT" +
+						//		" , APRV_DATE, EMP_CODE__APRV" +
+								", APRV_AMT, USED_AMT " +
+						//		" , LINE_NO, OS_AMT__CUST, OS_AMT__CONT, REMARKS, AMD_NO " +
+						" )" +
+						" values (?,?,?,?,?,?,?,?" +
+						//		" ,?,?,?," +
+						//		" ?,?,?,?,?" +
+						" ) ";
+				pstmt = conn.prepareStatement(sql);
+				//TRAN_ID                        NOT NULL CHAR(10)
+				pstmt.setString(1,tranId);
+				//TRAN_TYPE                      NOT NULL CHAR(1)
+				pstmt.setString(2,applyTime);
+				//SALE_ORDER                     NOT NULL CHAR(10)
+				pstmt.setString(3,asSorder);
+				//CR_POLICY                               CHAR(3)
+				pstmt.setString(4,lsCrPolicy);
+				//DESCR                                   VARCHAR2(500)
+				pstmt.setString(5,lsStr);
+				//APRV_STAT                               CHAR(1)
+				pstmt.setString(6,"O");
+				//APRV_AMT                                NUMBER(14,3)
+				pstmt.setDouble(7,0);
+				//USED_AMT                                NUMBER(14,3)
+				pstmt.setDouble(8,0);
+				
+				
+				/*	//APRV_DATE                               DATE
+			pstmt.setString(7,tranId);
+			//EMP_CODE__APRV                          CHAR(10)
+			pstmt.setString(8,tranId);
+			
+			//LINE_NO                                 CHAR(3)
+			pstmt.setString(11,tranId);
+			//OS_AMT__CUST                            NUMBER(14,3)
+			pstmt.setString(12,tranId);
+			//OS_AMT__CONT                            NUMBER(14,3)
+			pstmt.setString(13,tranId);
+			//REMARKS                                 VARCHAR2(120)
+			pstmt.setString(14,tranId);
+			//AMD_NO  
+			pstmt.setString(15,tranId);*/
+
+				pstmt.executeUpdate();
+				pstmt.close();
+				pstmt = null;
+				cnt++;
+			}
+		}
+		System.out.println("@@@@@@@@@ insert cnt["+cnt+"]");
+		return cnt;
+	}
+
+	private String generateTranId( String windowName,  String siteCode, Connection conn ) throws ITMException 
+	{
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		String selSql = "";
+		String tranId = "";
+		String tranSer = "";
+		String keyString = "";
+		String keyCol = "";
+		String xmlValues = "";
+		java.sql.Timestamp currDate = null;
+		GenericUtility genericUtility = GenericUtility.getInstance();
+
+		try
+		{
+
+			SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
+
+			currDate = new java.sql.Timestamp(System.currentTimeMillis());
+			String currDateStr = sdfAppl.format(currDate);
+
+			selSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
+			pstmt = conn.prepareStatement(selSql);
+			pstmt.setString( 1, windowName );
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				keyString = rs.getString("KEY_STRING");
+				keyCol = rs.getString("TRAN_ID_COL");
+				tranSer = rs.getString("REF_SER");
+			}
+			rs.close();rs = null;
+			pstmt.close();pstmt = null;
+			System.out.println("keyString :"+keyString);
+			System.out.println("keyCol :"+keyCol);
+			System.out.println("tranSer :"+tranSer);
+
+			xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
+			xmlValues = xmlValues + "<Header></Header>";
+			xmlValues = xmlValues + "<Detail1>";
+			xmlValues = xmlValues +        "<tran_id></tran_id>";
+			xmlValues = xmlValues +        "<site_code>" + siteCode + "</site_code>";
+			xmlValues = xmlValues +        "<tran_date>" + currDateStr + "</tran_date>";
+			xmlValues = xmlValues + "</Detail1></Root>";
+			System.out.println("xmlValues  :["+xmlValues+"]");
+			TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
+			tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
+			System.out.println("tranId :"+tranId);
+		}
+		catch (SQLException ex)
+		{
+			System.out.println("Exception ::" +selSql+ ex.getMessage() + ":");
+			ex.printStackTrace();
+			throw new ITMException(ex);
+		}
+		catch (Exception e)
+		{
+			System.out.println("Exception ::" + e.getMessage() + ":");
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try
+			{
+				if (rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if (pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+			}
+			catch(Exception e){}
+		}
+		return tranId;
+	}
+
 	private String postOrder(String fromSaleOrder, String toSaleOrder,String custCodeFrom, String custCodeTo, Timestamp fromDate,Timestamp toDate, String lotSldom, String siteCodeShip, String xtraParams,
 			Connection conn) throws ITMException, IOException 
 			{