Skip to content

B
business-java
Commit 875a08c7 authored by wansari's avatar wansari
Browse files
Options

updated source to solve issue from QC. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43820 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 09110289
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 42 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ 875a08c7
...@@ -355,7 +355,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -355,7 +355,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
sql = "update sreturn set tran_date = ? where tran_id = ?"; sql = "update sreturn set tran_date = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,currDateStr ); //Changed by wasim on 15-may-2017 to set current date in Time stamp in prepared statement
//pstmt.setString(1,currDateStr );
pstmt.setTimestamp(1,currDate );
pstmt.setString(2,msalereturn ); pstmt.setString(2,msalereturn );
int rowcnt = pstmt.executeUpdate(); int rowcnt = pstmt.executeUpdate();
if (pstmt != null) if (pstmt != null)
...@@ -418,6 +420,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -418,6 +420,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
} }
catch (Exception e) catch (Exception e)
{ {
System.out.println("Inside catch confirm==>"+e.getMessage());
isError = true; isError = true;
e.printStackTrace(); e.printStackTrace();
} }
...@@ -492,6 +495,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -492,6 +495,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
UtilMethods utilMethods = UtilMethods.getInstance(); UtilMethods utilMethods = UtilMethods.getInstance();
ArrayList tempList = new ArrayList(); ArrayList tempList = new ArrayList();
InvHoldGen invHoldGen = new InvHoldGen(); InvHoldGen invHoldGen = new InvHoldGen();
boolean isError = false;
try try
{ {
System.out.println("------------------- Inside confirmSalesReturn --------------- "); System.out.println("------------------- Inside confirmSalesReturn --------------- ");
...@@ -534,7 +538,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -534,7 +538,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{ {
sql = "update sreturn set tran_date = ? where tran_id = ?"; sql = "update sreturn set tran_date = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,currDateStr ); //Changed by wasim on 15-may-2017 to set current date in Time stamp in prepared statement
//pstmt.setString(1,currDateStr );
pstmt.setTimestamp(1,currDate );
pstmt.setString(2,msalereturn ); pstmt.setString(2,msalereturn );
int rowcnt = pstmt.executeUpdate(); int rowcnt = pstmt.executeUpdate();
if (pstmt != null) if (pstmt != null)
...@@ -856,31 +862,35 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -856,31 +862,35 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
} }
else
sql = "insert into customeritem (cust_code, item_code, item_code__ref, rate__ref, quantity__dem, unit, descr, restrict_upto, " + {
"min_qty, integral_qty, min_shelf_life, chg_date, chg_user, chg_term) " + sql = "insert into customeritem (cust_code, item_code, item_code__ref, rate__ref, quantity__dem, unit, descr, restrict_upto, " +
"values(?, ?, ?, ?, ?, ?, ? , ?, ?, ?, ?, ?, ?, ?) "; "min_qty, integral_qty, min_shelf_life, chg_date, chg_user, chg_term) " +
pstmt = conn.prepareStatement(sql); "values(?, ?, ?, ?, ?, ?, ? , ?, ?, ?, ?, ?, ?, ?) ";
pstmt.setString(1,ls_cust_code ); pstmt = conn.prepareStatement(sql);
pstmt.setString(2,ls_item_code ); pstmt.setString(1,ls_cust_code );
pstmt.setString(3,ls_item_code ); pstmt.setString(2,ls_item_code );
pstmt.setDouble(4,lc_rate ); pstmt.setString(3,ls_item_code );
pstmt.setDouble(5,lc_qty ); pstmt.setDouble(4,lc_rate );
pstmt.setString(6,ls_unit ); pstmt.setDouble(5,lc_qty );
pstmt.setString(7,ls_descr ); pstmt.setString(6,ls_unit );
pstmt.setDate(8,new java.sql.Date(ld_restr_upto_date.getTime()) ); pstmt.setString(7,ls_descr );
pstmt.setString(9,"0" ); pstmt.setDate(8,new java.sql.Date(ld_restr_upto_date.getTime()) );
pstmt.setString(10,"0" ); pstmt.setString(9,"0" );
pstmt.setString(11,"0" ); pstmt.setString(10,"0" );
pstmt.setString(12,currDateStr ); pstmt.setString(11,"0" );
pstmt.setString(13,chgUser ); //Changed by wasim on 15-may-2017 to set current date in Time stamp in prepared statement
pstmt.setString(14,chgTerm ); //pstmt.setString(12,currDateStr );
pstmt.executeUpdate(); pstmt.setTimestamp(12,currDate);
if (pstmt != null) pstmt.setString(13,chgUser );
{ pstmt.setString(14,chgTerm );
pstmt.close(); pstmt.executeUpdate();
pstmt = null; if (pstmt != null)
} {
pstmt.close();
pstmt = null;
}
}
} }
sql = "Select site_code, item_ser, tran_date, invoice_id, eff_date , cust_code, ret_opt, tran_type, case when site_code__dlv is null then site_code else site_code__dlv end from sreturn where tran_id = ?"; sql = "Select site_code, item_ser, tran_date, invoice_id, eff_date , cust_code, ret_opt, tran_type, case when site_code__dlv is null then site_code else site_code__dlv end from sreturn where tran_id = ?";
...@@ -932,8 +942,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -932,8 +942,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(ll_count > 0 && !"B".equalsIgnoreCase(gs_run_mode)) if(ll_count > 0 && !"B".equalsIgnoreCase(gs_run_mode))
{ {
merrcode = gbf_create_sretqc(msalereturn, xtraParams, conn); merrcode = gbf_create_sretqc(msalereturn, xtraParams, conn);
errorString = itmDBAccessLocal.getErrorString("",merrcode,""); System.out.println("After creating QC order="+merrcode);
return errorString; if(merrcode != null && merrcode.trim().length() > 0)
{
errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString;
}
} }
System.out.println("------------- ls_ret_opt ------------ "+ ls_ret_opt); System.out.println("------------- ls_ret_opt ------------ "+ ls_ret_opt);
if("R".equalsIgnoreCase(ls_ret_opt)) if("R".equalsIgnoreCase(ls_ret_opt))
...@@ -1139,8 +1153,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1139,8 +1153,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
mloc_code = checkNullAndTrim(rs.getString(6)); mloc_code = checkNullAndTrim(rs.getString(6));
mlot_no = checkNull(rs.getString(7)); mlot_no = checkNull(rs.getString(7));
mlot_sl = checkNull(rs.getString(8)); mlot_sl = checkNull(rs.getString(8));
mmfg_date = rs.getDate(9); //Changed by wasim on 16-MAY-2017 to get date in Timestamp [START]
mexp_date = rs.getDate(10); //mmfg_date = rs.getDate(9);
//mexp_date = rs.getDate(10);
mmfg_date = rs.getTimestamp(9);
mexp_date = rs.getTimestamp(10);
//Changed by wasim on 16-MAY-2017 to get date in Timestamp [END]
msite_code_mfg = checkNullAndTrim(rs.getString(11)); msite_code_mfg = checkNullAndTrim(rs.getString(11));
lc_rate = rs.getDouble(12); lc_rate = rs.getDouble(12);
mreas_code = checkNullAndTrim(rs.getString(13)); mreas_code = checkNullAndTrim(rs.getString(13));
...@@ -1163,6 +1181,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1163,6 +1181,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{ {
mvar_value = distCommon.getDisparams( "999999", "RESTRICT_ON_FRET", conn); mvar_value = distCommon.getDisparams( "999999", "RESTRICT_ON_FRET", conn);
} }
//Changed by wasim on 15-may-2017 if mvar_value is blank or null then set as 0 [START]
if(mvar_value == null || mvar_value.length() == 0)
{
mvar_value = "0";
}
//Changed by wasim on 15-may-2017 if mvar_value is blank or null then set as 0 [END]
mrestrict_upto = utilMethods.RelativeDate(meff_date,Integer.parseInt(mvar_value)); mrestrict_upto = utilMethods.RelativeDate(meff_date,Integer.parseInt(mvar_value));
sql = "Select count(*) From customeritem Where cust_code = ? And item_code = ?"; sql = "Select count(*) From customeritem Where cust_code = ? And item_code = ?";
...@@ -1194,7 +1218,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1194,7 +1218,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
minvoice_id = checkNull(minvoice_id);//Added by wasim as it is giving null pointer if minvoice_id is null
if(minvoice_id.trim().length() >0) if(minvoice_id.trim().length() >0)
{ {
sql = "Select inv_type From invoice Where invoice_id = ?"; sql = "Select inv_type From invoice Where invoice_id = ?";
...@@ -1259,8 +1284,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1259,8 +1284,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
} }
tokens = null; tokens = null;
} }
ls_acct_code__dr = ls_cctr_code__dr.substring(0,ls_cctr_code__dr.indexOf(",")); System.out.println("@@ls_cctr_code__dr ["+ls_cctr_code__dr+"]");
ls_cctr_code__dr = ls_cctr_code__dr.substring(ls_cctr_code__dr.indexOf(",")+1); //ls_acct_code__dr = ls_cctr_code__dr.substring(0,ls_cctr_code__dr.indexOf(","));
//ls_cctr_code__dr = ls_cctr_code__dr.substring(ls_cctr_code__dr.indexOf(",")+1);
} }
if(ls_cctr_code__cr == null || ls_cctr_code__cr.length() == 0) if(ls_cctr_code__cr == null || ls_cctr_code__cr.length() == 0)
{ {
...@@ -1400,6 +1426,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1400,6 +1426,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
stockUpd.put("net_weight",lc_net_wt); stockUpd.put("net_weight",lc_net_wt);
merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn); merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
System.out.println("After stockUpdate1 ["+merrcode+"]");
if(merrcode !=null && merrcode.trim().length() >0) if(merrcode !=null && merrcode.trim().length() >0)
{ {
return merrcode; return merrcode;
...@@ -1411,6 +1438,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1411,6 +1438,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
stockUpd.put("loc_code",ls_loc_code_git); stockUpd.put("loc_code",ls_loc_code_git);
stockUpd.put("tran_type","I"); stockUpd.put("tran_type","I");
merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn); merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
System.out.println("After stockUpdate2 ["+merrcode+"]");
if(merrcode !=null && merrcode.trim().length() >0) if(merrcode !=null && merrcode.trim().length() >0)
{ {
return merrcode; return merrcode;
...@@ -1661,10 +1689,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1661,10 +1689,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
stockUpd.put("net_weight",lc_net_wt); stockUpd.put("net_weight",lc_net_wt);
merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn); merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
System.out.println("After stockUpdate3 ["+merrcode+"]");
if(merrcode !=null && merrcode.trim().length() >0) if(merrcode !=null && merrcode.trim().length() >0)
{ {
errorString = vdt.getErrorString("",merrcode,""); //Commented by wasim as it is returning the full XML
return errorString; //errorString = vdt.getErrorString("",merrcode,"");
//return errorString;
return merrcode;
} }
if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link)) if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
...@@ -1738,6 +1769,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -1738,6 +1769,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
merrcode = invHoldGen.generateHoldTrans(ls_quar_lockcode, msalereturn, "S-RET", msite_code, tempList, xtraParams, conn); merrcode = invHoldGen.generateHoldTrans(ls_quar_lockcode, msalereturn, "S-RET", msite_code, tempList, xtraParams, conn);
System.out.println("After invHoldGen.generateHoldTrans ["+merrcode+"]");
if (merrcode != null && merrcode.trim().length() > 0) if (merrcode != null && merrcode.trim().length() > 0)
{ {
errorString = vdt.getErrorString("",merrcode,""); errorString = vdt.getErrorString("",merrcode,"");
...@@ -2122,13 +2154,26 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2122,13 +2154,26 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
} }
catch(Exception e) catch(Exception e)
{ {
System.out.println("Expception inside confirmSalesReturn-->"+e.getMessage());
isError = true;
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
{ {
try{ try
{
//Changed by wasim on 15-MAY-17 for returning the success error string if merrcode and errorString and blank [START]
System.out.println("Inside Finaly confirmSalesReturn["+isError+"] merrcode["+merrcode+"] errorString["+errorString+"]");
if(!isError)
{
if((errorString == null || errorString.trim().length() == 0) && (merrcode == null || merrcode.trim().length() == 0))
{
errorString = itmDBAccessLocal.getErrorString("", "VTSRTRNCMP", "", "", conn);
}
}
//Changed by wasim on 15-MAY-17 for returning the success error string if merrcode and errorString and blank [END]
if (pstmt != null ) if (pstmt != null )
{ {
pstmt.close(); pstmt.close();
...@@ -2156,6 +2201,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2156,6 +2201,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
} }
} }
System.out.println("Returning from confirmSalesReturn ["+errorString+"]");
return errorString; return errorString;
} }
public String gbf_create_sretqc(String msalereturn, String xtraParams, Connection conn) throws ITMException public String gbf_create_sretqc(String msalereturn, String xtraParams, Connection conn) throws ITMException
...@@ -2470,7 +2516,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2470,7 +2516,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
DistCommon distCommon = new DistCommon(); DistCommon distCommon = new DistCommon();
Timestamp currDate = null; Timestamp currDate = null;
UtilMethods utilMethods = UtilMethods.getInstance(); UtilMethods utilMethods = UtilMethods.getInstance();
java.sql.Date startDate = null, dueDate = null, retestDate = null; java.sql.Date startDate = null, dueDate = null, retestDate = null,qcOrderDate = null;
try try
{ {
System.out.println("----------- Inside createQc -------------"); System.out.println("----------- Inside createQc -------------");
...@@ -2749,7 +2795,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2749,7 +2795,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
dueDate = java.sql.Date.valueOf(genericUtility.getValidDateString(qcOrd.get("due_date").toString(), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())); dueDate = java.sql.Date.valueOf(genericUtility.getValidDateString(qcOrd.get("due_date").toString(), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
} }
System.out.println("---------- dueDate -----------------"+dueDate); System.out.println("---------- dueDate -----------------"+dueDate);
//Changed by wasim to convert for getting proper date formate [START]
if(qcOrd.get("qorder_date") != null)
{
qcOrderDate = java.sql.Date.valueOf(genericUtility.getValidDateString(qcOrd.get("qorder_date").toString(), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
}
//Changed by wasim to convert for getting proper date formate [END]
/*if(qcOrd.get("retest_date") != null) /*if(qcOrd.get("retest_date") != null)
{ {
...@@ -2763,7 +2816,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2763,7 +2816,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_qcno); pstmt.setString(1,ls_qcno);
pstmt.setString(2,qcOrd.get("qorder_type").toString()); pstmt.setString(2,qcOrd.get("qorder_type").toString());
pstmt.setString(3,qcOrd.get("qorder_date").toString()); //pstmt.setString(3,qcOrd.get("qorder_date").toString());//Changed by wasim on 15-MAY-17
pstmt.setDate(3,qcOrderDate);
pstmt.setString(4,qcOrd.get("site_code").toString()); pstmt.setString(4,qcOrd.get("site_code").toString());
pstmt.setString(5,qcOrd.get("item_code").toString()); pstmt.setString(5,qcOrd.get("item_code").toString());
pstmt.setString(6,route_code); pstmt.setString(6,route_code);
......
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