Skip to content

B
business-java
Commit 01c8263b authored by manohar's avatar manohar
Browse files
Options

deprecated methods avoided 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104115 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 569f9869
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 156 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java
View file @ 01c8263b
......@@ -108,9 +108,10 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
ITMDBAccessEJB itmDBAccessEJB = null;
try
{
connDriver = new ConnDriver();
conn = connDriver.getConnectDB("Driver");
conn.setAutoCommit(false);
//connDriver = new ConnDriver();
//conn = connDriver.getConnectDB("Driver");
//conn.setAutoCommit(false);
conn = getConnection() ;
itmDBAccessEJB = new ITMDBAccessEJB();
retString = confirm( tranID, xtraParams, forcedFlag,conn,connCP); //calling and creating connection
......@@ -192,20 +193,16 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
boolean lockSuccess = false;
Date lrDate = null;
PostOrderActivity postordact=null;
String ordType = "",itemSer = "",acctCodeDr = "",cctrCodeDr = "",acctCodeCr = "",cctrCodeCr = "",invLock = "",holdTranId = "";
Timestamp expDate = null, mfgDate = null;
String siteCodeMfg = "", packCode = "";
try
{
postordact=new PostOrderActivity();
itmDBAccessEJB = new ITMDBAccessEJB();
autoInvOnDesp = distCommon.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn);
/* if(conn==null)
{
connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");
connDriver = null;
conn.setAutoCommit(false);
isLocal=true;
}*/
// Changed by Manish on 28/04/16 for update nowait [start]
// sql = "select confirmed from despatch where desp_id = ?";
......@@ -288,14 +285,48 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","");
return errString;
}
else
{
//else
//{
autoInvOnDesp = distCommon.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn);
varValueTransit = distCommon.getDisparams("999999", "TRANSIT_LOC", conn);
/*sql = "select var_value from disparm where prd_code='999999' and var_name='TRANSIT_LOC'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
varValueTransit = rs.getString("var_value");//location code
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;*/
sql = "select inv_stat from location where loc_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,varValueTransit);
rs = pstmt.executeQuery();
if(rs.next())
{
invStatTransit = rs.getString("inv_stat");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
varValue= distCommon.getDisparams("999999", "GP_NO_REQ", conn);
if("NULLFOUND".equalsIgnoreCase(varValue))
{
varValue = "Y";
}
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...........
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while ( rs.next() )
if ( rs.next() )
{
statusDesp = checkNull(rs.getString("status"));
// tranSer = rs.getString("tran_ser");
......@@ -317,10 +348,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
rs.close();
rs = null;
/**************************For despatch GP NO Generation********************************************************************/
varValue= distCommon.getDisparams("999999", "GP_NO_REQ", conn);
if("NULLFOUND".equalsIgnoreCase(varValue))
{
......@@ -334,7 +363,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1,siteCode);
rs1 = pstmt1.executeQuery();
while(rs1.next())
if(rs1.next())
{
siteCodeExc = checkNull(rs1.getString("site_code__exc"));
}
......@@ -343,11 +372,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt1.close();
pstmt1 = null;
/* 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>";
......@@ -363,20 +387,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
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' ";
pstmt1 = conn.prepareStatement(sql1);
rs1 = pstmt1.executeQuery();
while(rs1.next())
{
varValue = rs1.getString("site_code__exc");
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;*/
if( varValue.contains(siteCodeExc))
{
......@@ -397,7 +407,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt1.setTimestamp(2,gpDate);
pstmt1.setString(3,tranId);
int cnt2 = pstmt1.executeUpdate();
System.out.println("Count value after updating despatch...."+cnt2);
......@@ -410,7 +419,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
//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
errString=postordact.createPORCP(tranId, xtraParams, conn,connCP);
if(errString != null && errString.trim().length()>0)
{
......@@ -419,7 +427,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
exportOrderType = checkNull(distCommon.getDisparams("999999","EXPORT_DESPATCH_ORDER_TYPE",conn));//gf_getenv_dis('999999',"EXPORT_DESPATCH_ORDER_TYPE")
if(exportOrderType != "")
if(exportOrderType != null && !"NULLFOUND".equals(exportOrderType) && exportOrderType.trim().length() > 0)
{
bondTaxGroup = checkNull(distCommon.getDisparams("999999","B17_BOND_TAX_GROUP",conn));
}
......@@ -434,9 +442,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
rs3 = pstmt3.executeQuery();
while ( rs3.next() )
{
if(statusDesp != "X") {
if(statusDesp != "X")
{
lineNo = checkNull(rs3.getString("line_no"));
lineNoSord = checkNull(rs3.getString("line_no__sord"));
expLev = checkNull(rs3.getString("exp_lev"));
......@@ -454,7 +461,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
lockCode = checkNull(rs3.getString("lock_code"));
disparmVal = checkNull(distCommon.getDisparams("999999","QUARNTINE_LOCKCODE",conn));//gf_getenv_dis('999999','QUARNTINE_LOCKCODE')
/* //23-Nov-16 Manoharan
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 = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -473,7 +480,33 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
*/
sql = " select grade ,acct_code__inv,cctr_code__inv, exp_date,mfg_date,site_code__mfg,pack_code, hold_qty "
+" 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);
pstmt.setString(3,locCode);
pstmt.setString(4,lotNo);
pstmt.setString(5,lotSl);
rs = pstmt.executeQuery();
if(rs.next())
{
grade = rs.getString("grade");
acctCodeCr = rs.getString("acct_code__inv");
cctrCodeCr = rs.getString("cctr_code__inv");
expDate = rs.getTimestamp("exp_date");
mfgDate = rs.getTimestamp("mfg_date");
siteCodeMfg = rs.getString("site_code__mfg");
packCode = rs.getString("pack_code");
hldQty = rs.getDouble("hold_qty");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if(hldQty > 0.0)
{
sql = "select count(*) as ll_cnt from inv_hold a, inv_hold_det b , inv_hold_rel_trace c"
......@@ -515,7 +548,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(1,custCodeDlv);
pstmt.setString(2,siteCode);
rs = pstmt.executeQuery();
while(rs.next())
//23-Nov-16 Manoharan
//while(rs.next())
if(rs.next())
{
channelPartner = checkNull(rs.getString("channel_partner"));
disLink = checkNull(rs.getString("dis_link"));
......@@ -533,8 +568,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
disLink = checkNull(rs1.getString("dis_link"));
siteCodeDlv = checkNull(rs1.getString("site_code__ch"));
if(channelPartner == null)
{
channelPartner = "N";
......@@ -551,15 +584,18 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
if(channelPartner == "N")
//23-Nov-16 Manoharan
//if(channelPartner == "N")
if("N".equals(channelPartner))
{
sql = "select lock_level from inv_lock where lock_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,lockCode);
rs = pstmt.executeQuery();
while(rs.next())
//23-Nov-16 Manoharan
//while(rs.next())
if(rs.next())
{
lockLevel = checkNull(rs.getString("lock_level"));
......@@ -568,15 +604,18 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
if(lockLevel == "I")
//23-Nov-16 Manoharan
//if(lockLevel == "I")
if("I".equals(lockLevel))
{
sql = "select hold_flag from item where item_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
while(rs.next())
//23-Nov-16 Manoharan
//while(rs.next())
if(rs.next())
{
holdFlag = checkNull(rs.getString("hold_flag"));
......@@ -585,7 +624,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
if(holdFlag == "Y")
//23-Nov-16 Manoharan
//if(holdFlag == "Y")
if("Y".equals(holdFlag))
{
errString = itmDBAccessEJB.getErrorString("","VTCODE1","","",conn);
return errString;
......@@ -593,15 +634,16 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
}
else if(lockLevel == "L")
//23-Nov-16 Manoharan
//else if(lockLevel == "L")
else if("L".equals(lockLevel))
{
sql = "select hold_flag from item_lot_info where item_code = ? and lot_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
pstmt.setString(2,lotNo);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
holdFlagNew = checkNull(rs.getString("hold_flag"));
}
......@@ -609,8 +651,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
if(holdFlagNew == "Y")
//23-Nov-16 Manoharan
//if(holdFlagNew == "Y")
if("Y".equals(holdFlagNew))
{
errString = itmDBAccessEJB.getErrorString("","VTCODE2","","",conn);
return errString ;
......@@ -625,7 +668,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(1,locCode);
rs = pstmt.executeQuery();
while(rs.next())
//23-Nov-16 Manoharan
//while(rs.next())
if(rs.next())
{
invStat = rs.getString("inv_stat");
}
......@@ -634,8 +679,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
rs.close();
rs = null;
sql = " select count(*) as count1 from sordalloc "
+" where sale_order = ? "
+" and line_no = ? "
......@@ -656,9 +699,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(7,lotSl);
pstmt.setString(8,locCode);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
cnt = rs.getInt("count1");
}
......@@ -674,8 +716,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
else{
isAllocated = "Y";
}
if(isAllocated == "Y")
//23-Nov-16 Manoharan
//if(isAllocated == "Y")
if("Y".equals(isAllocated))
{
sql ="select qty_alloc from sordalloc "
+" where sale_order = ? and line_no = ? and exp_lev = ? and item_code__ord = ? and item_code = ? "
......@@ -691,7 +734,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(7,lotSl);
pstmt.setString(8,locCode);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -716,9 +758,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(6,lotNo);
pstmt.setString(7,lotSl);
pstmt.setString(8,locCode);
pstmt.executeQuery();
// 23-Nov-16 manoharan should update
//pstmt.executeQuery();
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
......@@ -740,9 +782,10 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(8,lotSl);
pstmt.setString(9,locCode);
pstmt.executeQuery();
// 23-Nov-16 manoharan should update
//pstmt.executeQuery();
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
......@@ -769,50 +812,46 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
// CALLING FUNCTION FOR UPDATING STOCK AFTER DESPATCH PICKING GRADE,ACCT_CODE__CR AND CCTR_CODE__CR FROM STOCK
String ordType = "",itemSer = "",acctCodeDr = "",cctrCodeDr = "",acctCodeCr = "",cctrCodeCr = "",invLock = "",holdTranId = "";
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 = ? ";
// 23-Nov-16 manoharan commented and included in previous select
/*
sql = " select grade ,acct_code__inv,cctr_code__inv, exp_date,mfg_date,site_code__mfg,pack_code "
+" from stock where item_code = ? and site_code = ? and loc_code = ? and lot_no = ? and lot_sl = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,itemCode);
pstmt.setString(1,itemCode);
pstmt.setString(2,siteCode);
pstmt.setString(3,locCode);
pstmt.setString(4,lotNo);
pstmt.setString(5,lotSl);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
grade = rs.getString("grade");
acctCodeCr = rs.getString("acct_code__inv");
cctrCodeCr = rs.getString("cctr_code__inv");
expDate = rs.getTimestamp("exp_date");
mfgDate = rs.getTimestamp("mfg_date");
siteCodeMfg = rs.getString("site_code__mfg");
packCode = rs.getString("pack_code");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
*/
// 23/Nov-16 manoharan pending_order included and commented below
// PICKING ORDER TYPE, ITEM SER FROM SORDER
sql = " select order_type, item_ser from sorder "
sql = " select order_type, item_ser, pending_order from sorder "
+" where sale_order = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
ordType = rs.getString("order_type");
itemSer = rs.getString("item_ser");
pendOrder = checkNull(rs.getString("pending_order"));
}
pstmt.close();
pstmt = null;
......@@ -821,7 +860,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
//PICKING ACCT_CODE AND CCTR_CODE COGS. IF CCTR CODE COGS IS BLANK THEN REPLACE WITH CREDIT CCTR CODE AS PER SHIRI
sql = " select acct_code__cogs, cctr_code__cogs from item_acct_detr where item_ser = ? and grp_code = ' '"
+" and item_code = ' ' and tran_type = ? ";
......@@ -829,7 +867,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(1,itemSer);
pstmt.setString(2,ordType);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
acctCodeDr = rs.getString("acct_code__cogs");
cctrCodeDr = rs.getString("cctr_code__cogs");
......@@ -901,21 +939,20 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(6,lotNo);
pstmt.setString(7,lotSl);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
invLock = rs.getString("lock_code");
holdTranId = rs.getString("tran_id");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if(invLock != null && invLock.trim().length() > 0 && availableYN == "N")
// 23-Nov-16 manoharan
//if(invLock != null && invLock.trim().length() > 0 && availableYN == "N")
if(invLock != null && invLock.trim().length() > 0 && "N".equals(availableYN))
{
if(invLock.equals(disparmVal))
{
......@@ -937,42 +974,14 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
errString = stckupd.updateStock(updDesp, xtraParams, conn);
//CALLING UPDATE OF STOCK FOR TRANSIT ENTRY
if(channelPartner == "Y" && disLink == "E")
// 23-Nov-16 manoharan wrong syntax
//if(channelPartner == "Y" && disLink == "E")
if("Y".equalsIgnoreCase(channelPartner) && "E".equalsIgnoreCase(disLink))
{
sql = "select var_value from disparm where prd_code='999999' and var_name='TRANSIT_LOC'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
while(rs.next())
{
varValueTransit = rs.getString("var_value");//location code
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
sql = "select inv_stat from location where loc_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,varValueTransit);
rs = pstmt.executeQuery();
while(rs.next())
{
invStatTransit = rs.getString("inv_stat");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
sql = "select exp_date,mfg_date,site_code__mfg,pack_code,acct_code__inv,cctr_code__inv "
// 23-Nov-16 manoharan included in previous select and commented
/*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 = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
......@@ -982,13 +991,13 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(5,lotSl);
rs = pstmt.executeQuery();
while(rs.next())
{
updDespTransit.put("acct_code_inv", rs.getString("acct_code__inv"));
updDespTransit.put("cctr_code_inv", rs.getString("cctr_code__inv"));
updDespTransit.put("exp_date", rs.getTimestamp("exp_date"));
updDespTransit.put("mfg_date", rs.getTimestamp("mfg_date"));
updDespTransit.put("site_code__mfg", rs.getString("site_code__mfg"));
updDespTransit.put("pack_code", rs.getString("pack_code"));
{*/
updDespTransit.put("acct_code_inv", acctCodeCr);
updDespTransit.put("cctr_code_inv", cctrCodeCr);
updDespTransit.put("exp_date", expDate);
updDespTransit.put("mfg_date", mfgDate);
updDespTransit.put("site_code__mfg", siteCodeMfg);
updDespTransit.put("pack_code", packCode);
updDespTransit.put("inv_stat", invStatTransit);
updDespTransit.put("loc_code",varValueTransit);
updDespTransit.put("tran_type","R");
......@@ -999,11 +1008,12 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
}
/*}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
rs = null;
*/
......@@ -1066,13 +1076,14 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
}//end of transit entry
//Updating sorder status.
stckupd = null;
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'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
rs = pstmt.executeQuery();
while(rs.next())
if(rs.next())
{
OrderQty = rs.getDouble("lc_order_qty");
......@@ -1111,6 +1122,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
//End of updating sorder status.
/* // 23-Nov-16 manoharan commented and included in previous select
sql = " select pending_order from sorder where sale_order = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
......@@ -1123,16 +1135,19 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
if(pendOrder == "I")
*/
// 23-Nov-16 Manoharan
//if(pendOrder == "I")
if("I".equals(pendOrder))
{
sql = "Select (case when ordc_perc is null then 0 else ordc_perc end) as mCancperc "
+" from item where item_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
while(rs.next())
// 23-Nov-16 manoharan
//while(rs.next())
if(rs.next())
{
mCancperc = rs.getDouble("mCancperc");
}
......@@ -1140,6 +1155,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
if(OrderQty > 0.0)
{
......@@ -1203,8 +1219,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
}
}//end of if pending order == "I"
else if(pendOrder == "Y")
// 23-Nov-16 manoharan
//else if(pendOrder == "Y")
else if("Y".equals(pendOrder))
{
sql = "update sorder set status = 'C', status_date = ?, alloc_flag = 'Y', order_status = 'C' where sale_order = ?";
......@@ -1223,7 +1240,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
while(rs.next())
// 23-Nov-16 Manoharan
//while(rs.next())
if(rs.next())
{
eou = rs.getString("ls_eou");
}
......@@ -1231,7 +1250,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = null;
rs.close();
rs = null;
if("Y".equalsIgnoreCase(eou) && (exportOrderType == ordType) && bondTaxGroup!= null && bondTaxGroup.trim().length() > 0)
// 23-Nov-16 Manoharan
//if("Y".equalsIgnoreCase(eou) && (exportOrderType == ordType) && bondTaxGroup!= null && bondTaxGroup.trim().length() > 0)
if("Y".equalsIgnoreCase(eou) && (exportOrderType.trim().equals(ordType.trim())) && bondTaxGroup!= null && bondTaxGroup.trim().length() > 0)
{
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 = ? "
......@@ -1241,7 +1262,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(2,lineNo);
pstmt.setString(3,bondTaxGroup);
rs = pstmt.executeQuery();
while(rs.next())
// 23-Nov-16 Manoharan
//while(rs.next())
if(rs.next())
{
bondTaxAmt = rs.getDouble("tax_amt");
}
......@@ -1306,7 +1329,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt3 = null;
rs3.close();
rs3 = null;
}
//}
System.out.println("ERROR STRING WHILE DESPATCH CONFIRMATION!!!!!!!!!!!!!!"+errString);
......@@ -1333,6 +1356,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
PostOrderActivity pstordact=new PostOrderActivity();
errString=pstordact.gbfCreateFrtDrn(tranId, xtraParams, conn);
}
inv = null;
if(errString.indexOf("CONFSUCCES") > -1 || errString == null || errString.trim().length()==0)
{
if("Y".equalsIgnoreCase(autoInvOnDesp))
......
webitm-dis/ibase/webitm/ejb/dis/DespatchManualIC.java
View file @ 01c8263b
......@@ -1129,7 +1129,10 @@ public class DespatchManualIC extends ValidatorEJB implements DespatchManualICLo
cal.setTimeInMillis(timestamp);
System.out.println("@@@@@@@ ld_desp_date["+ld_desp_date+"]");
li_mth = ld_desp_date.getMonth();
// 02/dec-16 manoharan avoid deprecated
//li_mth = ld_desp_date.getMonth();
li_mth = cal.get(Calendar.MONTH);
System.out.println("@@@@@@@ li_mth["+li_mth+"]");
String year = ""+cal.get(Calendar.YEAR);
......
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