Skip to content

B
business-java
Commit f914711f authored by smestry's avatar smestry
Browse files
Options

Added new component SalesreturnConfirm. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104827 ce508802-f39f-4f6c-b175-0d175dae99d5
parent caec4432
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 60 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ f914711f
...@@ -53,6 +53,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -53,6 +53,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{ {
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
String DB = CommonConstants.DB_NAME; String DB = CommonConstants.DB_NAME;
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
ValidatorEJB vdt = new ValidatorEJB();
CommonWmsUtil common = new CommonWmsUtil();
DistCommon distCommon = new DistCommon();
@Override @Override
/*public String postSave() throws RemoteException,ITMException /*public String postSave() throws RemoteException,ITMException
...@@ -62,13 +66,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -62,13 +66,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
public String postSave(String domString, String tranId,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException*/ public String postSave(String domString, String tranId,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException*/
public String confirm(String msalereturn, String xtraParams, String forcedFlag)throws RemoteException, ITMException public String confirm(String msalereturn, String xtraParams, String forcedFlag)throws RemoteException, ITMException
{ {
System.out.println("SalesReturnConf Called........"); System.out.println("SalesReturnConf Called........" + msalereturn);
Connection conn = null; Connection conn = null;
CommonWmsUtil common = new CommonWmsUtil();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
DistCommon distCommon = new DistCommon();
ValidatorEJB vdt=new ValidatorEJB();
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
java.sql.Timestamp chgDate = null,currDate = null; java.sql.Timestamp chgDate = null,currDate = null;
...@@ -88,7 +90,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -88,7 +90,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
String currDateStr = sdfAppl.format(currDate); String currDateStr = sdfAppl.format(currDate);
sql = "select invoice_id, full_ret,status,confirmed,cust_code__trf from sreturn where tran_id = ? "; sql = "select invoice_id, full_ret,status,confirmed,cust_code__trf from sreturn where tran_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn ); pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -111,6 +112,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -111,6 +112,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
System.out.println("ls_status---------->>"+ls_status);
System.out.println("ls_confirmed---------->>"+ls_confirmed);
if("S".equalsIgnoreCase(ls_status)) if("S".equalsIgnoreCase(ls_status))
{ {
errMsg = itmDBAccessLocal.getErrorString("","VTALSUB",""); errMsg = itmDBAccessLocal.getErrorString("","VTALSUB","");
...@@ -128,10 +133,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -128,10 +133,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
} }
ls_var_value = distCommon.getDisparams( "999999", "HO_APPROVAL_REQD", conn); ls_var_value = distCommon.getDisparams( "999999", "HO_APPROVAL_REQD", conn);
System.out.println("ls_var_value---------->>"+ls_var_value);
if("Y".equalsIgnoreCase(ls_var_value)) if("Y".equalsIgnoreCase(ls_var_value))
{ {
sql = "select lr_no from despatch where desp_id in ( select desp_id from invoice where invoice_id = ? )"; sql = "select lr_no from despatch where desp_id in ( select desp_id from invoice where invoice_id = ? )";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_invoice_id ); pstmt.setString(1,ls_invoice_id );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -149,21 +154,24 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -149,21 +154,24 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("ls_lr_no---------->>"+ls_lr_no);
} }
if((ls_invoice_id == null || ls_invoice_id.length() == 0) || (ls_lr_no != null && ls_lr_no.length() > 0)) // Sneha need to uncomment
/*if((ls_invoice_id == null || ls_invoice_id.length() == 0) || (ls_lr_no != null && ls_lr_no.length() > 0))
{ {
errMsg = itmDBAccessLocal.getErrorString("","VTHOAPRV",""); errMsg = itmDBAccessLocal.getErrorString("","VTHOAPRV","");
return errMsg; return errMsg;
} }*/
System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
if(ls_invoice_id != null && ls_invoice_id.length() > 0) if(ls_invoice_id != null && ls_invoice_id.length() > 0)
{ {
System.out.println("ls_full_ret---------->>"+ls_full_ret);
if("Y".equalsIgnoreCase(ls_full_ret)) if("Y".equalsIgnoreCase(ls_full_ret))
{ {
sql = "select sum((case when b.net_amt is null then 0 else b.net_amt end) - (case when b.tax_amt is null then 0 else b.tax_amt end)) from sreturn a, sreturndet b " + sql = "select sum((case when b.net_amt is null then 0 else b.net_amt end) - (case when b.tax_amt is null then 0 else b.tax_amt end)) from sreturn a, sreturndet b " +
" where b.tran_id = a.tran_id and b.invoice_id = ? and a.status <> 'X' "; " where b.tran_id = a.tran_id and b.invoice_id = ? and a.status <> 'X' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_invoice_id ); pstmt.setString(1,ls_invoice_id );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -181,6 +189,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -181,6 +189,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("lc_sret_amt---------->>"+lc_sret_amt);
sql = "select ((case when net_amt is null then 0 else net_amt end) - (case when round_adj is null then 0 else round_adj end) - (case when tax_amt is null then 0 else tax_amt end))" + sql = "select ((case when net_amt is null then 0 else net_amt end) - (case when round_adj is null then 0 else round_adj end) - (case when tax_amt is null then 0 else tax_amt end))" +
" from invoice where invoice_id = ?"; " from invoice where invoice_id = ?";
...@@ -201,6 +211,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -201,6 +211,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("lc_inv_amt---------->>"+lc_inv_amt);
sql = "select sum(case when a.drcr_flag = 'C' then ((case when b.drcr_amt is null then 0 else b.drcr_amt end) * -1) else 0 End) " + sql = "select sum(case when a.drcr_flag = 'C' then ((case when b.drcr_amt is null then 0 else b.drcr_amt end) * -1) else 0 End) " +
" from drcr_rcp a, drcr_rdet b where a.tran_id = b.tran_id and b.invoice_id = ? and a.sreturn_no is null "; " from drcr_rcp a, drcr_rdet b where a.tran_id = b.tran_id and b.invoice_id = ? and a.sreturn_no is null ";
...@@ -221,8 +233,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -221,8 +233,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("lc_amt_drcr---------->>"+lc_amt_drcr);
} }
lc_inv_amt = lc_inv_amt + lc_amt_drcr; lc_inv_amt = lc_inv_amt + lc_amt_drcr;
System.out.println("lc_inv_amt---------->>"+lc_inv_amt);
System.out.println("lc_sret_amt---------->>"+lc_sret_amt);
if ((lc_sret_amt - lc_inv_amt) > 1 ) if ((lc_sret_amt - lc_inv_amt) > 1 )
{ {
errMsg = itmDBAccessLocal.getErrorString("","VTAMTDIF",""); errMsg = itmDBAccessLocal.getErrorString("","VTAMTDIF","");
...@@ -236,7 +253,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -236,7 +253,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
*/ */
//nvo_dist_sales = create nvo_business_object_dist_salesreturn //nvo_dist_sales = create nvo_business_object_dist_salesreturn
sql = "select edi_option, (case when ledg_post_conf is null then 'N' else ledg_post_conf end),verify_password " + sql = "select edi_option, (case when ledg_post_conf is null then 'N' else ledg_post_conf end), verify_password " +
" from transetup where lower(tran_window) = ? "; " from transetup where lower(tran_window) = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -327,10 +344,16 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -327,10 +344,16 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
} }
System.out.println("ls_confirmed---------->>"+ls_confirmed);
System.out.println("ls_ledg_post_conf---------->>"+ls_ledg_post_conf);
System.out.println("gs_run_mode---------->>"+gs_run_mode);
System.out.println("ls_verify_password_filter---------->>"+ls_verify_password_filter);
if("Y".equalsIgnoreCase(ls_ledg_post_conf)) if("Y".equalsIgnoreCase(ls_ledg_post_conf))
{ {
if(!"B".equalsIgnoreCase(gs_run_mode)) if(!"B".equalsIgnoreCase(gs_run_mode))
{ {
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 ); pstmt.setString(1,currDateStr );
...@@ -351,7 +374,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -351,7 +374,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (ls_verify_password_filter.length() > 0) if (ls_verify_password_filter.length() > 0)
{ {
lb_ask_pwd = false ; lb_ask_pwd = false;
} }
sql = "select cust_code, invoice_id from sreturn where tran_id = ?"; sql = "select cust_code, invoice_id from sreturn where tran_id = ?";
...@@ -373,6 +396,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -373,6 +396,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("ls_cust_code__bill---------->>"+ls_cust_code__bill);
System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
ls_errcode = confirmSalesReturn(msalereturn, xtraParams, conn); ls_errcode = confirmSalesReturn(msalereturn, xtraParams, conn);
//ls_errcode = nvo_dist_sales.gbf_sreturn_confirm(msalereturn, 1, sqlca_cp) //ls_errcode = nvo_dist_sales.gbf_sreturn_confirm(msalereturn, 1, sqlca_cp)
...@@ -385,10 +411,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -385,10 +411,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (ls_errcode != null && ls_errcode.trim().length() > 0) if (ls_errcode != null && ls_errcode.trim().length() > 0)
{ {
errMsg = itmDBAccessLocal.getErrorString("",ls_errcode,""); //errMsg = itmDBAccessLocal.getErrorString("",ls_errcode,"");
errMsg = ls_errcode;
return errMsg; return errMsg;
} }
System.err.println("errMsg===========>>"+errMsg);
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -468,6 +495,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -468,6 +495,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
InvHoldGen invHoldGen = new InvHoldGen(); InvHoldGen invHoldGen = new InvHoldGen();
try try
{ {
System.out.println("------------------- Inside confirmSalesReturn --------------- ");
currDate = new java.sql.Timestamp(System.currentTimeMillis()); currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
...@@ -480,7 +508,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -480,7 +508,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
" from transetup where lower(tran_window) = ? "; " from transetup where lower(tran_window) = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,"w_salesreturn" );
pstmt.setString(1,"w_salesreturn_retn" ); pstmt.setString(1,"w_salesreturn_retn" );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
...@@ -498,9 +525,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -498,9 +525,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("---------- ls_ledg_post_conf ---------------"+ls_ledg_post_conf);
if("Y".equalsIgnoreCase(ls_ledg_post_conf)) if("Y".equalsIgnoreCase(ls_ledg_post_conf))
{ {
// No vale is initialized for gs_run_mode
System.out.println("---------- gs_run_mode ---------------"+gs_run_mode);
if("B".equalsIgnoreCase(gs_run_mode)) if("B".equalsIgnoreCase(gs_run_mode))
{ {
sql = "update sreturn set tran_date = ? where tran_id = ?"; sql = "update sreturn set tran_date = ? where tran_id = ?";
...@@ -513,8 +543,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -513,8 +543,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
sql = "select b.reas_code, b.quantity, b.rate, a.eff_date, b.invoice_id , b.item_code, a.cust_code ,b.line_no__inv, b.full_ret ,b.line_no__invtrace, b.line_no, a.ret_opt, b.lot_no, b.lot_sl " + sql = "select b.reas_code, b.quantity, b.rate, a.eff_date, b.invoice_id , b.item_code, a.cust_code ,b.line_no__inv, b.full_ret ,b.line_no__invtrace, b.line_no, a.ret_opt, b.lot_no, b.lot_sl " +
" from sreturn a,sreturndet b where a.tran_id = b.tran_id and a.tran_id = ? "; " from sreturn a,sreturndet b where a.tran_id = b.tran_id and a.tran_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -548,8 +578,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -548,8 +578,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
} }
if(ls_invoice_id != null && ls_invoice_id.length()>0)
System.out.println("---------- ls_invoice_id ---------------"+ls_invoice_id);
if(ls_invoice_id != null && ls_invoice_id.length() > 0)
{ {
System.out.println("---------- ll_line_no__invtrace ---------------"+ll_line_no__invtrace);
if(ll_line_no__invtrace > 0) if(ll_line_no__invtrace > 0)
{ {
sql = "select count(1) from sreturndet where tran_id = ? and invoice_id = ? and line_no__invtrace = ? and line_no <> ? "; sql = "select count(1) from sreturndet where tran_id = ? and invoice_id = ? and line_no__invtrace = ? and line_no <> ? ";
...@@ -575,13 +608,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -575,13 +608,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
} }
if(li_cnt > 0) if(li_cnt > 0)
{ {
merrcode = "VTINVLN"; merrcode = "VTINVLN"; // Pending
errorString = vdt.getErrorString("",merrcode,""); errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString; return errorString;
} }
} }
} }
System.out.println("---------- ll_line_no__invtrace ---------------"+ll_line_no__invtrace);
if(ll_line_no__invtrace == 0) if(ll_line_no__invtrace == 0)
{ {
sql = "select sum(quantity__stduom) from invoice_trace where invoice_id = ? and inv_line_no = ? and lot_no = ? and lot_sl = ? "; sql = "select sum(quantity__stduom) from invoice_trace where invoice_id = ? and inv_line_no = ? and lot_no = ? and lot_sl = ? ";
...@@ -629,7 +663,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -629,7 +663,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
} }
System.out.println("---------- lc_invqty_lot ---------------"+lc_invqty_lot);
sql = "select sum(b.quantity__stduom) from sreturn a, sreturndet b where b.tran_id = a.tran_id and b.invoice_id = ? and b.line_no__inv = ? " + sql = "select sum(b.quantity__stduom) from sreturn a, sreturndet b where b.tran_id = a.tran_id and b.invoice_id = ? and b.line_no__inv = ? " +
" and ((b.line_no__invtrace = ?) or (b.line_no__invtrace is null or b.line_no__invtrace = 0)) and a.tran_id <> ? and a.status <> 'X'" ; " and ((b.line_no__invtrace = ?) or (b.line_no__invtrace is null or b.line_no__invtrace = 0)) and a.tran_id <> ? and a.status <> 'X'" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -651,7 +686,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -651,7 +686,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("---------- lc_srqty_prev ---------------"+lc_srqty_prev);
sql = "select sum(b.quantity__stduom) from sreturn a, sreturndet b where b.tran_id = a.tran_id and b.tran_id = ? and b.invoice_id = ? and b.line_no__inv = ?" + sql = "select sum(b.quantity__stduom) from sreturn a, sreturndet b where b.tran_id = a.tran_id and b.tran_id = ? and b.invoice_id = ? and b.line_no__inv = ?" +
" and ((b.line_no__invtrace = ?) or (b.line_no__invtrace is null or b.line_no__invtrace = 0))" ; " and ((b.line_no__invtrace = ?) or (b.line_no__invtrace is null or b.line_no__invtrace = 0))" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -674,22 +711,28 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -674,22 +711,28 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
System.out.println("---------- lc_srqty ---------------"+lc_srqty);
lc_srqty_lot = lc_srqty + lc_srqty_prev ; lc_srqty_lot = lc_srqty + lc_srqty_prev ;
System.out.println("---------- lc_srqty_lot ---------------"+lc_srqty_lot);
System.out.println("---------- lc_invqty_lot ---------------"+lc_invqty_lot);
System.out.println("---------- ls_full_ret ---------------"+ls_full_ret);
if (lc_srqty_lot > lc_invqty_lot) if (lc_srqty_lot > lc_invqty_lot)
{ {
System.out.println("---------- ls_ret_opt ---------------"+ls_ret_opt);
if(!"D".equalsIgnoreCase(ls_ret_opt)) if(!"D".equalsIgnoreCase(ls_ret_opt))
{ {
merrcode = "VTSRET7"; merrcode = "VTSRET7";
errorString = vdt.getErrorString("",merrcode,""); errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString; return errorString;
} }
} }
else if(lc_srqty_lot < lc_invqty_lot && "Y".equalsIgnoreCase(ls_full_ret)) else if(lc_srqty_lot < lc_invqty_lot && "Y".equalsIgnoreCase(ls_full_ret))
{ {
merrcode = "VTSRET11"; merrcode = "VTSRET11";
errorString = vdt.getErrorString("",merrcode,""); errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString; return errorString;
} }
else if(lc_srqty_prev == 0) else if(lc_srqty_prev == 0)
...@@ -697,20 +740,20 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -697,20 +740,20 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (lc_srqty_lot == lc_invqty_lot && !"Y".equalsIgnoreCase(ls_full_ret)) if (lc_srqty_lot == lc_invqty_lot && !"Y".equalsIgnoreCase(ls_full_ret))
{ {
merrcode = "VTSRET10"; merrcode = "VTSRET10";
errorString = vdt.getErrorString("",merrcode,""); errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString; return errorString;
} }
else if (lc_srqty_lot != lc_invqty_lot && "Y".equalsIgnoreCase(ls_full_ret)) else if (lc_srqty_lot != lc_invqty_lot && "Y".equalsIgnoreCase(ls_full_ret))
{ {
merrcode = "VTSRET11"; merrcode = "VTSRET11";
errorString = vdt.getErrorString("",merrcode,""); errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString; return errorString;
} }
} }
else if (lc_srqty_lot != lc_invqty_lot && "Y".equalsIgnoreCase(ls_full_ret)) else if (lc_srqty_lot != lc_invqty_lot && "Y".equalsIgnoreCase(ls_full_ret))
{ {
merrcode = "VTSRET12"; merrcode = "VTSRET12";
errorString = vdt.getErrorString("",merrcode,""); errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString; return errorString;
} }
...@@ -736,7 +779,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -736,7 +779,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (li_restr_days > 0 ) if (li_restr_days > 0 )
{ {
ld_restr_upto_date = utilMethods.RelativeDate(ld_eff_date,li_restr_days); ld_restr_upto_date = utilMethods.RelativeDate(ld_eff_date,li_restr_days);
System.out.println("ld_restr_upto_date===["+ld_restr_upto_date+"]");
sql = "select unit, descr from item where item_code = ? "; sql = "select unit, descr from item where item_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -800,7 +843,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -800,7 +843,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
sql = "update customeritem set restrict_upto = ?, quantity__dem = (case when quantity__dem is null then 0 else quantity__dem end) " + sql = "update customeritem set restrict_upto = ?, quantity__dem = (case when quantity__dem is null then 0 else quantity__dem end) " +
" + (?- ?) where cust_code = ? and item_code = ?"; " + (? - ?) where cust_code = ? and item_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDate(1,new java.sql.Date(ld_restr_upto_date.getTime())); pstmt.setDate(1,new java.sql.Date(ld_restr_upto_date.getTime()));
pstmt.setDouble(2,lc_qty ); pstmt.setDouble(2,lc_qty );
...@@ -814,8 +857,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -814,8 +857,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; pstmt = null;
} }
} }
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) " +
"values(?, ?, ?, ?, ?, ?, ? , ?, ?, ?, ?, ?, ?, ?) "; 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) " +
"values(?, ?, ?, ?, ?, ?, ? , ?, ?, ?, ?, ?, ?, ?) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_cust_code ); pstmt.setString(1,ls_cust_code );
pstmt.setString(2,ls_item_code ); pstmt.setString(2,ls_item_code );
...@@ -838,7 +883,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -838,7 +883,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null; 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 = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn ); pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -887,9 +933,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -887,9 +933,10 @@ 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 = vdt.getErrorString("",merrcode,""); errorString = itmDBAccessLocal.getErrorString("",merrcode,"");
return errorString; return errorString;
} }
System.out.println("------------- ls_ret_opt ------------ "+ ls_ret_opt);
if("R".equalsIgnoreCase(ls_ret_opt)) if("R".equalsIgnoreCase(ls_ret_opt))
{ {
sql = "Select count(*) From sreturndet Where tran_id = ? and ret_rep_flag = 'P'"; sql = "Select count(*) From sreturndet Where tran_id = ? and ret_rep_flag = 'P'";
...@@ -2137,6 +2184,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2137,6 +2184,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
try try
{ {
System.out.println("------- Inside gbf_create_sretqc ----------------");
currDate = new java.sql.Timestamp(System.currentTimeMillis()); currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
...@@ -2164,6 +2212,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2164,6 +2212,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null; rs = null;
} }
ls_sretinvqty = distCommon.getDisparams("999999","SRET_INV_QTY",conn) ; ls_sretinvqty = distCommon.getDisparams("999999","SRET_INV_QTY",conn) ;
System.out.println("ls_sretinvqty--------->>"+ls_sretinvqty);
sql = "select item_code, sum(quantity__stduom) ,count(1), max(lot_sl), max(unit__std), loc_code, lot_no, min(exp_date), Min(line_no), min(mfg_date), sum(physical_qty) " + sql = "select item_code, sum(quantity__stduom) ,count(1), max(lot_sl), max(unit__std), loc_code, lot_no, min(exp_date), Min(line_no), min(mfg_date), sum(physical_qty) " +
" from sreturndet where tran_id = ? and qc_reqd = 'Y' Group by loc_code, item_code, lot_no Order by loc_code, item_code, lot_no"; " from sreturndet where tran_id = ? and qc_reqd = 'Y' Group by loc_code, item_code, lot_no Order by loc_code, item_code, lot_no";
...@@ -2195,6 +2244,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2195,6 +2244,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null; rs = null;
} }
System.out.println("ll_ctr--------->>"+ll_ctr);
if(ll_ctr > 1) if(ll_ctr > 1)
{ {
//SetNull(ls_lotsl) //SetNull(ls_lotsl)
...@@ -2220,7 +2270,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2220,7 +2270,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close(); rs.close();
rs = null; rs = null;
} }
System.out.println("lc_sample_qty--------->>"+lc_sample_qty);
if(lc_sample_qty == 0) if(lc_sample_qty == 0)
{ {
sql = "select QTY_SAMPLE from item where item_code = ? "; sql = "select QTY_SAMPLE from item where item_code = ? ";
...@@ -2240,7 +2291,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2240,7 +2291,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }
System.out.println("lc_sample_qty 111111 --------->>"+lc_sample_qty);
} }
sql = "select count(*) from item_lot_info where item_code = ? and lot_no = ? "; sql = "select count(*) from item_lot_info where item_code = ? and lot_no = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2261,7 +2314,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2261,7 +2314,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close(); rs.close();
rs = null; rs = null;
} }
System.out.println("ll_count 111111 --------->>"+ll_count);
if (ll_count > 0) if (ll_count > 0)
{ {
sql = "select supp_code__mfg , supp_code, exp_date, mfg_date from item_lot_info where item_code = ? and lot_no = ? "; sql = "select supp_code__mfg , supp_code, exp_date, mfg_date from item_lot_info where item_code = ? and lot_no = ? ";
...@@ -2271,10 +2325,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2271,10 +2325,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
ls_supp_code__mfg = checkNullAndTrim(rs.getString(1)); ls_supp_code__mfg = checkNullAndTrim(rs.getString("supp_code__mfg"));
ls_supp_code = checkNullAndTrim(rs.getString(2)); ls_supp_code = checkNullAndTrim(rs.getString("supp_code"));
ldt_expdate = rs.getDate(3); ldt_expdate = rs.getDate("exp_date");
ldt_mfgdate = rs.getDate(4); ldt_mfgdate = rs.getDate("mfg_date");
} }
if (pstmt != null ) if (pstmt != null )
{ {
...@@ -2287,10 +2341,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2287,10 +2341,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null; rs = null;
} }
} }
System.out.println("ll_count 22222222 --------->>"+ll_count);
System.out.println("ls_supp_code__mfg 22222222 --------->>"+ls_supp_code__mfg);
if (ll_count == 0 || ls_supp_code__mfg == null) if (ll_count == 0 || ls_supp_code__mfg == null)
{ {
sql = "select exp_date, mfg_date, supp_code__mfg from stock where item_code = ? and site_code = ? and lot_no = ? and exp_date is not null "; sql = "select exp_date, mfg_date, supp_code__mfg from stock where item_code = ? and site_code = ? and lot_no = ? " +
"and exp_date is not null ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_itemcode ); pstmt.setString(1,ls_itemcode );
pstmt.setString(2,ls_sitecode ); pstmt.setString(2,ls_sitecode );
...@@ -2311,8 +2367,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2311,8 +2367,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }
System.out.println(" 22222222 --------->>");
} }
lstr_qc.put("supp_code", ls_supp_code); lstr_qc.put("supp_code", ls_supp_code);
lstr_qc.put("supp_code__mfg", ls_supp_code__mfg); lstr_qc.put("supp_code__mfg", ls_supp_code__mfg);
lstr_qc.put("qorder_type", "I"); lstr_qc.put("qorder_type", "I");
...@@ -2339,13 +2397,19 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2339,13 +2397,19 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ll_lineno= " "+ll_lineno; ll_lineno= " "+ll_lineno;
ll_lineno = ll_lineno.substring(ll_lineno.length()-3, ll_lineno.length()); ll_lineno = ll_lineno.substring(ll_lineno.length()-3, ll_lineno.length());
String expdate = (ldt_expdate == null) ? null : sdf.format(ldt_expdate);
String mfgdate = (ldt_mfgdate == null) ? null : sdf.format(ldt_mfgdate);
lstr_qc.put("line_no", ll_lineno); lstr_qc.put("line_no", ll_lineno);
lstr_qc.put("unit", ls_unit); lstr_qc.put("unit", ls_unit);
lstr_qc.put("batch_no", ls_lotno); lstr_qc.put("batch_no", ls_lotno);
lstr_qc.put("qc_create_type", "A"); lstr_qc.put("qc_create_type", "A");
lstr_qc.put("expiry_date", sdf.format(ldt_expdate)); /*lstr_qc.put("expiry_date", expdate);
lstr_qc.put("mfg_date", sdf.format(ldt_mfgdate)); lstr_qc.put("mfg_date", mfgdate);*/
lstr_qc.put("expiry_date", ldt_expdate);
lstr_qc.put("mfg_date", ldt_mfgdate);
lstr_qc.put("qty_sample", lc_sample_qty); lstr_qc.put("qty_sample", lc_sample_qty);
lstr_qc.put("route_code", null); lstr_qc.put("route_code", null);
...@@ -2407,8 +2471,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2407,8 +2471,10 @@ 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;
try try
{ {
System.out.println("----------- Inside createQc -------------");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"); chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
currDate = new java.sql.Timestamp(System.currentTimeMillis()); currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
...@@ -2505,7 +2571,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2505,7 +2571,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
qcOrd.put("qorder_date", currDateStr); qcOrd.put("qorder_date", currDateStr);
qcOrd.put("start_date", currDateStr); qcOrd.put("start_date", currDateStr);
qcOrd.put("due_date", sdfAppl.format(ldt_duedate)); qcOrd.put("due_date", sdfAppl.format(ldt_duedate));
sql = "select KEY_STRING, TRAN_ID_COL, REF_SER from transetup where tran_window = ? "; sql = "select KEY_STRING, TRAN_ID_COL, REF_SER from transetup where tran_window = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,"w_qcorder_new" ); pstmt.setString(1,"w_qcorder_new" );
...@@ -2526,6 +2592,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2526,6 +2592,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close(); rs.close();
rs = null; rs = null;
} }
if(ls_key == null || ls_key.length() == 0) if(ls_key == null || ls_key.length() == 0)
{ {
sql = " select KEY_STRING, TRAN_ID_COL, REF_SER from transetup where tran_window = 'GENERAL'"; sql = " select KEY_STRING, TRAN_ID_COL, REF_SER from transetup where tran_window = 'GENERAL'";
...@@ -2554,6 +2621,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2554,6 +2621,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
"\r\n</header><Detail1><site_code>"+qcOrd.get("site_code").toString()+"</site_code><qorder_type>"+qcOrd.get("qorder_type").toString()+"</qorder_type>"+ "\r\n</header><Detail1><site_code>"+qcOrd.get("site_code").toString()+"</site_code><qorder_type>"+qcOrd.get("qorder_type").toString()+"</qorder_type>"+
" <qorder_date>"+new java.sql.Date(System.currentTimeMillis())+"</qorder_date><lot_no>"+qcOrd.get("lot_no").toString()+"</lot_no><item_ser>"+ls_item_ser+"</item_ser></Detail1></Root>"; " <qorder_date>"+new java.sql.Date(System.currentTimeMillis())+"</qorder_date><lot_no>"+qcOrd.get("lot_no").toString()+"</lot_no><item_ser>"+ls_item_ser+"</item_ser></Detail1></Root>";
TransIDGenerator tg = new TransIDGenerator(XMLString, userId, ""); TransIDGenerator tg = new TransIDGenerator(XMLString, userId, "");
ls_qcno = tg.generateTranSeqID(tranSer, keyCol, ls_key, conn); ls_qcno = tg.generateTranSeqID(tranSer, keyCol, ls_key, conn);
if ("ERROR".equals(ls_qcno)) if ("ERROR".equals(ls_qcno))
{ {
...@@ -2667,13 +2735,28 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2667,13 +2735,28 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close(); rs.close();
rs = null; rs = null;
} }
if(qcOrd.get("route_code").toString() == null || qcOrd.get("route_code").toString().trim().length() == 0)
if(qcOrd.get("route_code") == null || qcOrd.get("route_code").toString().trim().length() == 0)
{ {
qcOrd.put("route_code", null); qcOrd.put("route_code", null);
} }
String route_code = (qcOrd.get("route_code") == null) ? "" : qcOrd.get("route_code").toString();
qcOrd.put("qcorder_no", ls_qcno); qcOrd.put("qcorder_no", ls_qcno);
double qtyPass = Double.parseDouble(qcOrd.get("quantity").toString())-Double.parseDouble(qcOrd.get("qty_sample").toString()); double qtyPass = Double.parseDouble(qcOrd.get("quantity").toString())-Double.parseDouble(qcOrd.get("qty_sample").toString());
if(qcOrd.get("due_date") != null)
{
dueDate = java.sql.Date.valueOf(genericUtility.getValidDateString(qcOrd.get("due_date").toString(), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
}
System.out.println("---------- dueDate -----------------"+dueDate);
/*if(qcOrd.get("retest_date") != null)
{
retestDate = java.sql.Date.valueOf(genericUtility.getValidDateString(qcOrd.get("retest_date").toString(), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
}
System.out.println("---------- retestDate -----------------"+retestDate);*/
sql = "insert into qc_order (qorder_no,qorder_type,qorder_date,site_code,item_code,route_code,quantity,qty_passed,qty_rejected,start_date,due_date,rel_date,porcp_no,porcp_line_no," + sql = "insert into qc_order (qorder_no,qorder_type,qorder_date,site_code,item_code,route_code,quantity,qty_passed,qty_rejected,start_date,due_date,rel_date,porcp_no,porcp_line_no," +
" lot_no,lot_sl,chg_date,chg_user,chg_term,loc_code,qty_sample,status, unit,qc_create_type,unit__sample,loc_code__aprv,loc_code__rej,lot_no__new, batch_no,expiry_date, proj_code," + " lot_no,lot_sl,chg_date,chg_user,chg_term,loc_code,qty_sample,status, unit,qc_create_type,unit__sample,loc_code__aprv,loc_code__rej,lot_no__new, batch_no,expiry_date, proj_code," +
...@@ -2684,18 +2767,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2684,18 +2767,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.setString(3,qcOrd.get("qorder_date").toString()); pstmt.setString(3,qcOrd.get("qorder_date").toString());
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,qcOrd.get("route_code").toString()); pstmt.setString(6,route_code);
pstmt.setDouble(7,Double.parseDouble(qcOrd.get("quantity").toString())); pstmt.setDouble(7,Double.parseDouble(qcOrd.get("quantity").toString()));
pstmt.setDouble(8,qtyPass); pstmt.setDouble(8,qtyPass);
pstmt.setString(9,"0"); pstmt.setString(9,"0");
pstmt.setString(10,qcOrd.get("start_date").toString()); pstmt.setDate(10, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(11,qcOrd.get("due_date").toString()); pstmt.setDate(11, dueDate);
pstmt.setString(12,currDateStr); pstmt.setDate(12, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(13,qcOrd.get("tran_id").toString()); pstmt.setString(13,qcOrd.get("tran_id").toString());
pstmt.setString(14,qcOrd.get("line_no").toString()); pstmt.setString(14,qcOrd.get("line_no").toString());
pstmt.setString(15,qcOrd.get("lot_no").toString()); pstmt.setString(15,qcOrd.get("lot_no").toString());
pstmt.setString(16,qcOrd.get("lot_sl").toString()); pstmt.setString(16,qcOrd.get("lot_sl").toString());
pstmt.setString(17,currDateStr); pstmt.setDate(17,new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(18,userId); pstmt.setString(18,userId);
pstmt.setString(19,chgTerm); pstmt.setString(19,chgTerm);
pstmt.setString(20,qcOrd.get("loc_code").toString()); pstmt.setString(20,qcOrd.get("loc_code").toString());
...@@ -2708,23 +2791,24 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2708,23 +2791,24 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.setString(27,ls_rej); pstmt.setString(27,ls_rej);
pstmt.setString(28,qcOrd.get("lot_no").toString()); pstmt.setString(28,qcOrd.get("lot_no").toString());
pstmt.setString(29,qcOrd.get("batch_no").toString()); pstmt.setString(29,qcOrd.get("batch_no").toString());
pstmt.setString(30,qcOrd.get("expiry_date").toString()); pstmt.setDate(30, (java.sql.Date) qcOrd.get("expiry_date"));
pstmt.setString(31,null); pstmt.setString(31,null);
pstmt.setString(32,ls_empcode); pstmt.setString(32,ls_empcode);
pstmt.setString(33,qcOrd.get("item_code").toString()); pstmt.setString(33,qcOrd.get("item_code").toString());
pstmt.setString(34,qcOrd.get("mfg_date").toString()); pstmt.setDate(34, (java.sql.Date) qcOrd.get("mfg_date"));
pstmt.setString(35,null); pstmt.setString(35,null);
pstmt.setString(36,qcOrd.get("supp_code").toString()); pstmt.setString(36,qcOrd.get("supp_code").toString());
pstmt.setString(37,qcOrd.get("supp_code__mfg").toString()); pstmt.setString(37,qcOrd.get("supp_code__mfg").toString());
pstmt.setString(38,qcOrd.get("retest_date").toString()); //pstmt.setString(38,qcOrd.get("retest_date").toString()); // retest_date is not put into map
pstmt.setDate(38, null);
pstmt.executeUpdate(); pstmt.executeUpdate();
if (pstmt != null ) if (pstmt != null )
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
catch(Exception e) catch(Exception e)
{ {
......
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