Commit bda029b4 authored by kshinde's avatar kshinde

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
parent c7a1e4a7
......@@ -55,7 +55,7 @@ public class PostOrdCreditChk
HashMap s_pass1 = null, returnMap = null;
ArrayList mailList = null, failedPolicyList = null, asCheckList = null;
String asCustCodeBil="";
String asCustCodeBil="",asCustCodeSoldTo="";
String asItemSer="";
double adNetAmt=0;
String asRunOpt="";
......@@ -91,6 +91,7 @@ public class PostOrdCreditChk
asCheckList = new ArrayList();
failedPolicyList = new ArrayList();// This has to be returned to the calling routine part of the returnMap
asCustCodeBil = (String) paramMap.get("as_cust_code_bil");
asCustCodeSoldTo = (String)paramMap.get("as_cust_code_sold_to");
asItemSer = (String) paramMap.get("as_item_ser");
adNetAmt = Double.parseDouble((String) paramMap.get("ad_net_amt"));
//asRunOpt = (String) paramMap.get("as_runopt"); 19-Mar-2016 not used
......@@ -312,7 +313,7 @@ public class PostOrdCreditChk
pstmt.close();
pstmt = null;
if ("P01".equals(lsCrPolicy.trim()))
if ("P01".equals(lsCrPolicy.trim()) || "P21".equals(lsCrPolicy.trim()))
{
// //if adNetAmt > 0 then //Added Ruchira 27/06/2k6, //Commented to check for amt = 0 (batch pricelist) case, Ruchira 28/08/2k6
......@@ -344,7 +345,14 @@ public class PostOrdCreditChk
+ " where (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end ) = ? ) " ;
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P01".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
pstmt.setString(2,asItemSer);
rs = pstmt.executeQuery();
if (rs.next())
......@@ -371,7 +379,15 @@ public class PostOrdCreditChk
+ " and tot_amt - dispute_amt - adj_amt > 0 and ref_type <> ? " ;
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P01".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
pstmt.setString(2,asItemSer);
pstmt.setString(3,lsOrdNewPrd);
rs = pstmt.executeQuery();
......@@ -403,7 +419,7 @@ public class PostOrdCreditChk
//****************** gbf_credit_check_update(asSorder,'P01',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
retArrayList = credit_check_update(asSorder,"P01",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("@@@@@@@@@409 retArrayList.size()["+ retArrayList.size()+"]");
......@@ -437,24 +453,24 @@ public class PostOrdCreditChk
////Always when credit check fails it must get added into as_mail.
if (!"O".equals(lsStatus))
{
mailList.add("P01"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
mailList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
if (lcCheckAmt > 0 || "F".equals(lsStatus) || lsStatus.trim().length() == 0)
{
failedPolicyList.add("P01"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
writeLog(asSorder, ("P01"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
writeLog(asSorder, (lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
}
///if the cr check is failed or not failed.
if ("I".equalsIgnoreCase(asApplyTime) )
{
//****************** gbf_credit_check_update(asSorder,"P01",adNetAmt,asApplyTime,lcCheckAmt,'U',lsStatus);
credit_check_update(asSorder,"P01",adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
}
}
else if ("P02".equals(lsCrPolicy.trim()))
else if ("P02".equals(lsCrPolicy.trim()) || "P22".equalsIgnoreCase(lsCrPolicy.trim()))
{
//PICKING TOTAL O/S AMT AND CREDIT LIMIT & COMPARING
lsSql = "select sum((case when tot_amt is null then 0 else tot_amt end) - (case when dispute_amt is null then 0 else dispute_amt end)) - sum(case when adj_amt is null then 0 else adj_amt end ) os_amt "
......@@ -465,7 +481,14 @@ public class PostOrdCreditChk
+ " and ref_type <> ?";
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P02".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
pstmt.setString(2,asItemSer);
pstmt.setString(3,lsOrdNewPrd);
rs = pstmt.executeQuery();
......@@ -482,7 +505,7 @@ public class PostOrdCreditChk
/// amish 3-10-03
lsSql = "select consider_pbo "
+ " from itemser_cr_policy "
+ " where item_ser = ? and cr_policy = 'P02'";
+ " where item_ser = ? and cr_policy = '"+lsCrPolicy+"' ";
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asItemSer);
......@@ -519,7 +542,15 @@ public class PostOrdCreditChk
+ " where (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end ) = ?)) ";
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P02".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
pstmt.setString(2,lsOrdNewPrd);
pstmt.setString(3,asItemSer);
rs = pstmt.executeQuery();
......@@ -547,7 +578,14 @@ public class PostOrdCreditChk
+ " where (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end ) = ?)" ;
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P02".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
pstmt.setString(2,asItemSer);
rs = pstmt.executeQuery();
if (rs.next())
......@@ -558,13 +596,13 @@ public class PostOrdCreditChk
rs = null;
pstmt.close();
pstmt = null;
System.out.println("*** P22 mTotOsAmt["+mTotOsAmt+"]mCrLimit["+mCrLimit+"]mStat["+mStat+"]");
if (mTotOsAmt > mCrLimit && "C".equals(mStat))
{
//****************** gbf_credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus);
retArrayList = credit_check_update(asSorder,"P02",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()+"]");
......@@ -599,24 +637,24 @@ public class PostOrdCreditChk
////Always when credit check fails it must get added into as_mail.
if (!"O".equals(lsStatus))
{
mailList.add("P02"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
mailList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
if (lcCheckAmt > 0 || "F".equalsIgnoreCase(lsStatus) || "".equalsIgnoreCase(lsStatus) )
{
failedPolicyList.add("P02"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
writeLog(asSorder, ("P02"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
writeLog(asSorder, (lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
}
///if the cr check is failed or not failed.
if ("I".equals(asApplyTime))
{
//****************** gbf_credit_check_update(asSorder,'P02',adNetAmt,asApplyTime,lcCheckAmt,'U',lsStatus);
credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
}
}
else if ("P03".equals(lsCrPolicy.trim()))
else if ("P03".equals(lsCrPolicy.trim()) || "P23".equals(lsCrPolicy.trim()))
{
mIgnCr = 0;
......@@ -648,7 +686,15 @@ public class PostOrdCreditChk
+ " and ref_type <> ?" ;
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P03".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
pstmt.setString(2,lsOrdNewPrd);
rs = pstmt.executeQuery();
while (rs.next())
......@@ -671,7 +717,7 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P03',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
retArrayList = credit_check_update(asSorder,"P03",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()+"]");
......@@ -708,13 +754,13 @@ public class PostOrdCreditChk
if (!"O".equals(lsStatus))
{
//lsMail[lsMail.length + 1] = "P03"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr;
mailList.add("P03"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
mailList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
if (lcCheckAmt > 0 || "F".equals(lsStatus) || lsStatus.trim().length() == 0)
{
failedPolicyList.add("P03"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
writeLog(asSorder, ("P03"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
writeLog(asSorder, (lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
}
......@@ -724,14 +770,14 @@ public class PostOrdCreditChk
{
//****************** gbf_credit_check_update(asSorder,'P03',adNetAmt,asApplyTime,lcCheckAmt,'U',lsStatus);
credit_check_update(asSorder,"P03",adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
}
////End Added Ruchira 29/08/2k6
//////Added Ruchira 20/02/2k6, re-assigned adNetAmt by ld_old_adNetAmt.
//adNetAmt = ld_old_adNetAmt
}
else if ("P04".equals(lsCrPolicy.trim()))
else if ("P04".equals(lsCrPolicy.trim()) || "P24".equals(lsCrPolicy.trim()))
{
//PICKING TOTAL O/S AMT AND CREDIT LIMIT & COMPARING
lsSql = "select sum((case when tot_amt is null then 0 else tot_amt end) - (case when dispute_amt is null then 0 else dispute_amt end)) - sum(case when adj_amt is null then 0 else adj_amt end ) as os_amt "
......@@ -756,7 +802,7 @@ public class PostOrdCreditChk
/// amish 3-10-03
lsSql = "select consider_pbo "
+ " from itemser_cr_policy "
+ " where item_ser = ? and cr_policy = 'P04'";
+ " where item_ser = ? and cr_policy = '"+lsCrPolicy+"'";
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asItemSer);
......@@ -791,7 +837,14 @@ public class PostOrdCreditChk
+ " and ( sorder.confirmed = 'Y' )" ;
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P04".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
pstmt.setString(2,lsOrdNewPrd);
rs = pstmt.executeQuery();
if (rs.next())
......@@ -817,7 +870,14 @@ public class PostOrdCreditChk
+ " where cust_code = ?";
pstmt = conn.prepareStatement(lsSql);
pstmt.setString(1,asCustCodeBil);
if("P04".equals(lsCrPolicy.trim()))
{
pstmt.setString(1,asCustCodeBil);
}
else
{
pstmt.setString(1,asCustCodeSoldTo);
}
rs = pstmt.executeQuery();
if (rs.next())
{
......@@ -832,7 +892,7 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P04',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
retArrayList = credit_check_update(asSorder,"P04",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()+"]");
......@@ -867,20 +927,20 @@ public class PostOrdCreditChk
////Always when credit check fails it must get added into as_mail.
if (!"O".equals(lsStatus))
{
mailList.add("P04"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
mailList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
if (lcCheckAmt > 0 || "F".equalsIgnoreCase(lsStatus) || "".equalsIgnoreCase(lsStatus) )
{
failedPolicyList.add("P04"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
}
writeLog(asSorder, ("P04"+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
writeLog(asSorder, (lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr));
}
////Added Ruchira 29/08/2k6, to update the used_amt in business_logic_check table even
///if the cr check is failed or not failed.
if ("I".equals(asApplyTime))
{
//****************** gbf_credit_check_update(asSorder,'P04',adNetAmt,asApplyTime,lcCheckAmt,'U',lsStatus);
credit_check_update(asSorder,"P04",adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
}
////End Added Ruchira 29/08/2k6
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment