added custCodeBill in credit check map and policies P21,P22,P23,P24 in...

added custCodeBill in credit check map and policies P21,P22,P23,P24 in PostOrdCreditCheck which considers custCodeBill 

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

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

@@ -1142,7 +1142,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 		String advAdj="";
 		String commDrcrConf="",commJvConf="";
 		DistCommon dis=new DistCommon();
-		String errString="",invoiceId="",sql="",ls_drnid="",loginEmpCode;
+		String errString="",invoiceId="",sql="",ls_drnid="",loginEmpCode,custCodeBil="";
 		PreparedStatement pstmt=null;
 		ResultSet rs=null;
 		String applyTime="I",crPolicy="",lsStatus="",finScheme="";
@@ -1259,8 +1259,27 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					pstmt.close();
 					pstmt = null;
 					errString = "";
+					
+					sql="Select cust_code__bil from sorder where sale_order= ? ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, fromSaleOrder);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						custCodeBil =  rs.getString("cust_code__bil");					
+					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+
+					
+					System.out.println("Inside invPosting credit check cust_code["+fromCustCode+"] custCodeBil["+custCodeBil+"]");
+					
 					HashMap paramMap = new HashMap();
 					paramMap.put("as_cust_code_bil",fromCustCode);
+					//added by kunal on 12/11/2018 to add custCodeBil in map for credit check
+					paramMap.put("as_cust_code_sold_to", custCodeBil);
 					paramMap.put("as_item_ser",itemSer);
 					paramMap.put("ad_net_amt",""+netAmt);
 					paramMap.put("as_sorder",fromSaleOrder);

webitm-dis/ibase/webitm/ejb/dis/adv/SOrderAmdConf.java

@@ -62,7 +62,7 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 	    String errString = null;
 	    String confirm = "",status= "" ,indNo = "",reason = "" ,pordType = "",saleOrd = "",
 	    		projCode = "",suppCode= "" , pordSite = "" , custCode ="", itemSer = "", 
-	    		totAmt = "", ordAmt= "" , aprvSta = "", tranId = "" , siteCode = "" , lsCrPolicy = "" , editOpn = "";
+	    		totAmt = "", ordAmt= "" , aprvSta = "", tranId = "" , siteCode = "" , lsCrPolicy = "" , editOpn = "",custCodeBil="";
 	    String loginEmpCode="", dataStr = "", retString = "";
 	    double totordqty = 0.0 ,amount = 0.0 ,hnetAmt = 0.0,hordAmt = 0.0;
 		ResultSet rs = null,rs1=null;
@@ -123,7 +123,7 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 			else
 			{
 				//Start.......
-				sql = "SELECT DUE_DATE, CUST_CODE, ITEM_SER,  TOT_AMT, SITE_CODE FROM SORDER WHERE  SALE_ORDER = ? ";
+				sql = "SELECT DUE_DATE,CUST_CODE__BIL, CUST_CODE, ITEM_SER,  TOT_AMT, SITE_CODE FROM SORDER WHERE  SALE_ORDER = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, saleOrd);
 				rs= pstmt.executeQuery();
@@ -131,6 +131,8 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 				 {
 					 dueDate = rs.getTimestamp("DUE_DATE");
 					 custCode = checkNull(rs.getString("CUST_CODE"));
+					 custCodeBil = checkNull(rs.getString("CUST_CODE__BIL"));
+					 //Added by kunal on 5/11/2018 to add cust_code__bill value
 					 itemSer = checkNull(rs.getString("ITEM_SER"));
 					 totAmt = checkNull(rs.getString("TOT_AMT"));
 					 siteCode = checkNull(rs.getString("SITE_CODE"));
@@ -230,6 +232,8 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
 				//errString = gbf_credit_check(ls_cust_code, ls_item_ser, lc_tot_amt_bc, '', ls_sales_order, ld_due_date, ls_site_code, 'S','',ls_check[])
 				HashMap CreditCheckMap = new HashMap();
 				CreditCheckMap.put("as_cust_code_bil", custCode);
+				//Added by kunal on 5/11/2018 to add cust_code__bill value
+				CreditCheckMap.put("as_cust_code_sold_to", custCodeBil);
 				CreditCheckMap.put("as_item_ser", itemSer);
 				CreditCheckMap.put("ad_net_amt", totAmt);
 				CreditCheckMap.put("as_sorder", saleOrd);

webitm-dis/ibase/webitm/ejb/dis/adv/SorderConf.java

@@ -40,7 +40,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		Connection conn = null;
 		PreparedStatement pstmt = null,pstmt1=null;
 		String errString = null;
-		String refSer = "",winName= "",custCode="",itemSer="",siteCode="",status="",stopBusiness="",automps="";
+		String refSer = "",winName= "",custCode="",itemSer="",siteCode="",status="",stopBusiness="",automps="",custCodeBil="";
 		String errCode="",totalAmtStr="";
 		ResultSet rs = null,rs1=null;
 		double totAmt=0.0,totalAmt=0.0;
@@ -69,7 +69,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				//Changes and Commented By Ajay on 22-12-2017:START
 				//sql = "	select cust_code , item_ser , site_code ,	due_date	, tot_amt, confirmed , " +
 				//		" status, order_date   from sorder where sale_order = ? ";
-				sql = "select cust_code , item_ser , site_code ,	due_date	, tot_amt, confirmed , " +
+				sql = "select cust_code ,cust_code__bil, item_ser , site_code ,	due_date	, tot_amt, confirmed , " +
 						"(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status , order_date from sorder where sale_order = ?";
 				//Changes and Commented By Ajay on 22-12-2017:END
 				pstmt = conn.prepareStatement(sql);
@@ -79,6 +79,8 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				{
 					isSaleOrder=true;
 					custCode = rs.getString("cust_code");
+					//Added by Kunal to get cust_code__bil
+					custCodeBil = rs.getString("cust_code__bil");
 					itemSer = rs.getString("item_ser");
 					siteCode = rs.getString("site_code");
 					dueDate = rs.getTimestamp("due_date");
@@ -173,6 +175,8 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 
 						HashMap CreditCheckMap = new HashMap();
 						CreditCheckMap.put("as_cust_code_bil", custCode);
+						//added by kunal on 5/11/2018 to add cust_code__bill in Map
+						CreditCheckMap.put("as_cust_code_sold_to", custCodeBil);
 						CreditCheckMap.put("as_item_ser", itemSer);
 						//CreditCheckMap.put("ad_net_amt", totalAmt);
 						CreditCheckMap.put("ad_net_amt", totalAmtStr);
@@ -181,7 +185,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						CreditCheckMap.put("as_site_code", siteCode);
 						CreditCheckMap.put("as_apply_time", "S");
 						CreditCheckMap.put("as_despid", "");
-
+						System.out.println("Credit check custCodeBill["+custCodeBil+"]");
 						CreditCheckList = postcrdchk.CreditCheck(CreditCheckMap, conn);
 						if(CreditCheckList.size() > 0)
 						{