Skip to content

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

Bug fix 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91280 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e17711c9
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 115 deletions
webitm-dis/ibase/webitm/ejb/dis/ChargeBackLoc.java
View file @ d07befec
......@@ -820,6 +820,9 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
if (currentColumn.trim().equals( "cust_code" ))
{
custCode = genericUtility.getColumnValue( "cust_code", dom );
// 15/05/10 manoharan site code should be credit site code
siteCode = genericUtility.getColumnValue( "site_code__cr", dom );
// end 15/05/10 manoharan site code should be credit site code
if( custCode != null && custCode.trim().length() > 0 )
{
sql = "select cust_name from customer "
......@@ -839,7 +842,10 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
sql = "select price_list from site_customer where site_code = ? and cust_code = ?";
pStmt = conn.prepareStatement( sql );
pStmt.setString(1,loginSite.trim());
// 15/05/10 manoharan site code should be credit site code
//pStmt.setString(1,loginSite.trim());
pStmt.setString(1,siteCode.trim());
// end 15/05/10 manoharan site code should be credit site code
pStmt.setString(2,custCode.trim());
rs = pStmt.executeQuery();
if( rs.next() )
......@@ -969,6 +975,44 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
}
valueXmlString.append("<site_cr_descr>").append("<![CDATA[" + ( siteDescr )+ "]]>").append("</site_cr_descr>");
// 15/05/10 manoharan site code should be credit site code
custCode = genericUtility.getColumnValue( "cust_code", dom );
// end 15/05/10 manoharan site code should be credit site code
if( custCode != null && custCode.trim().length() > 0 )
{
sql = "select price_list from site_customer where site_code = ? and cust_code = ?";
pStmt = conn.prepareStatement( sql );
// 15/05/10 manoharan site code should be credit site code
pStmt.setString(1,siteCode.trim());
pStmt.setString(2,custCode.trim());
rs = pStmt.executeQuery();
if( rs.next() )
{
priceList = rs.getString( "price_list" );
}
rs.close();
rs = null;
pStmt.close();
pStmt = null;
if( priceList == null || priceList.trim().length() == 0 )
{
sql = "Select price_list from customer where cust_code = ? ";
pStmt = conn.prepareStatement(sql);
pStmt.setString(1, custCode.trim() );
rs = pStmt.executeQuery();
if( rs.next() )
{
priceList = rs.getString("price_list");
}
rs.close();
rs = null;
pStmt.close();
pStmt = null;
}
valueXmlString.append("<price_list>").append("<![CDATA[" + ( priceList )+ "]]>").append("</price_list>");
}
// end 15/05/10 manoharan site code should be credit site code
}
if (currentColumn.trim().equals( "cust_code__credit" ))
{
......
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ d07befec
......@@ -323,25 +323,23 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String itemCodeOrd = null;
String lineType = null;
String itemRef = null;
String pircleListClg = null, lsLocDescr = null, lsItemcode = null, mdescr = null,
mvarValue = null, mlotSl = null, mcustCode = null,
msiteCode = null, mlotNo = null, mcode = null, lsInvoiceItem = null;
String pircleListClg = null, locDescr = null, mdescr = null, mvarValue = null, mcode = null, lsInvoiceItem = null;
double amount = 0.0, drcrAmount = 0.0, mminShlife = 0.0, mconvRtuom, mVal= 0.0, mNum= 0.0, lcPartQty= 0.0, mquantity= 0.0,
minShelfLife = 0.0, freeQty = 0.0, discount = 0.0, mrateStd= 0.0, mrate= 0.0, lcPhyQty= 0.0, lcNetWt= 0.0, lcGrossWt= 0.0, lcTareWt= 0.0;
double qtyStdUom= 0.0, lcDiscount= 0.0, lcQtyPerArt = 0.0, mshlife = 0.0, effCost = 0.0;
String packCode = null, lsTrantype = null, lsInvoiceId = null, mstkOpt = null;
String packCode = null, lsInvoiceId = null, mstkOpt = null;
String unitRate = null;
String itemStru = null;
String packInstr = null;
String lsCustCode = null, lsChannelPartner = null, lsSiteCode = null, mlocCode = null;
String channelPartner = null, mlocCode = null;
String lsDamagedtype = null, mitemCode = null, lserrCode = null;
String sqlStr = null, mloc = null, lsLocCode = null;
int mdays = 0, mcount = 0, mcount1 = 0 , mlineNoInv = 0;
double mdisc = 0.0;
String mvarName = null, lsSretLocCode = null, lsInvStat = null, locDescr = null, sretLocCode = null;
String mvarName = null, lsSretLocCode = null, lsInvStat = null, sretLocCode = null;
String mstatus = null, lsDespLineNo = null, lsDespId = null, lsIinvoiceId = null, taxCal = null;
String mreasonDescr = null, mreasCode = null, freeItemCode = null, mitem = null;
String lsSitecode = null;
//String siteCode = null;
double priceListRate = 0.0;
double mNum1= 0.0, mNum2= 0.0, mVal1= 0.0, fact= 0.0;
int llLinenotrace = 0;
......@@ -3426,14 +3424,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mtranDate = Timestamp.valueOf(genericUtility.getValidDateString( ( mtranDateStr == null ? getCurrdateInAppFormat() : mtranDateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
String mexpDateStr = genericUtility.getColumnValue( "exp_date", dom );
System.out.println( "mexpDateStr :: " + mexpDateStr );
if( mexpDateStr != null )
{
mexpDate = Timestamp.valueOf(genericUtility.getValidDateString( ( mexpDateStr == null ? getCurrdateInAppFormat() : mexpDateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
else
{
// 20/05/10 manoharan commented as expiry date is already fetched from stock
//if( mexpDateStr != null )
//{
// mexpDate = Timestamp.valueOf(genericUtility.getValidDateString( ( mexpDateStr == null ? getCurrdateInAppFormat() : mexpDateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//}
//else
//{
mexpDate = expDate; //genericUtility.getValidDateString( ( mexpDateStr == null ? : mexpDateStr ), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
//}
String ldtLrdateStr = genericUtility.getColumnValue( "lr_date", dom1 );
......@@ -3456,8 +3455,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
mdays = mdiffDays;
lsCustCode = genericUtility.getColumnValue( "cust_code", dom1 );//dw_header.getitemstring(1,"cust_code")
lsSitecode = genericUtility.getColumnValue( "site_code", dom1 ); //dw_header.getitemstring(1,"site_code")
custCode = genericUtility.getColumnValue( "cust_code", dom1 );//dw_header.getitemstring(1,"cust_code")
siteCode = genericUtility.getColumnValue( "site_code", dom1 ); //dw_header.getitemstring(1,"site_code")
sqlStr = " select channel_partner " // into :ls_channel_partner
+" from site_customer "
......@@ -3465,21 +3464,22 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+" and site_code = ? "; //:ls_sitecode ;
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsCustCode );
pstmt.setString( 2, lsSiteCode );
pstmt.setString( 1, custCode );
pstmt.setString( 2, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
lsChannelPartner = rs.getString( "channel_partner" );
channelPartner = rs.getString( "channel_partner" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( lsChannelPartner == null || lsChannelPartner.trim().length() == 0 )
if( channelPartner == null || channelPartner.trim().length() == 0 )
{
sqlStr = "select channel_partner " //into :ls_channel_partner
+" from customer "
......@@ -3487,13 +3487,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr);
pstmt.setString( 1, lsCustCode );
pstmt.setString( 1, custCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
lsChannelPartner = rs.getString( "channel_partner" );
channelPartner = rs.getString( "channel_partner" );
}
rs.close();
......@@ -3502,7 +3502,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
}
if ( lsChannelPartner != null && !"Y".equals( lsChannelPartner ) )
if ( channelPartner != null && !"Y".equals( channelPartner ) )
{
sqlStr = " select deduct_perc " //into :mdisc
......@@ -3534,7 +3534,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsCustCode );
pstmt.setString( 1, custCode );
rs = pstmt.executeQuery();
......@@ -3618,14 +3618,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( rs.next() )
{
lsLocDescr = rs.getString( "descr" );
locDescr = rs.getString( "descr" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append("<location_descr>").append("<![CDATA[" + lsLocDescr + "]]>").append("</location_descr>");
valueXmlString.append("<location_descr>").append("<![CDATA[" + locDescr + "]]>").append("</location_descr>");
}
else
......@@ -3671,8 +3671,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( !"NULLFOUND".equalsIgnoreCase( lsDamagedtype ) && lsDamagedtype.trim().length() > 0 ) // and len(trim(ls_damagedtype)) > 0 then
{
lsTrantype = genericUtility.getColumnValue( "tran_type", dom ); //dw_header.getitemstring(1,"tran_type")
if( lsDamagedtype != null && lsTrantype != null && lsDamagedtype.trim().equalsIgnoreCase( lsTrantype.trim() ) )
tranType = genericUtility.getColumnValue( "tran_type", dom ); //dw_header.getitemstring(1,"tran_type")
if( lsDamagedtype != null && tranType != null && lsDamagedtype.trim().equalsIgnoreCase( tranType.trim() ) )
{
valueXmlString.append("<status>").append("<![CDATA[" + "D" + "]]>").append("</status>");
// 22/04/10 manoharan to set the loc_code accordingly
......@@ -3830,7 +3830,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
mmfgDate = Timestamp.valueOf(genericUtility.getValidDateString(dtStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
mlotNo = genericUtility.getColumnValue( "lot_no", dom ); // dw_detedit[ii_currformno].getitemstring(1,"lot_no")
lotNo = genericUtility.getColumnValue( "lot_no", dom ); // dw_detedit[ii_currformno].getitemstring(1,"lot_no")
if( mmfgDate != null ) //not isnull(mmfgDate) )
{
......@@ -3842,7 +3842,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mitemCode );
pstmt.setString( 2, mlotNo );
pstmt.setString( 2, lotNo );
rs = pstmt.executeQuery();
mshlife = 0;
if( rs.next() )
......@@ -3914,8 +3914,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
mdiffDays = (int)utilMethods.DaysAfter( ldtLrdate, mexpDate );
mdays = mdiffDays;
lsCustCode = genericUtility.getColumnValue( "cust_code", dom1 ); //dw_header.getitemstring(1,"cust_code")
lsSiteCode = genericUtility.getColumnValue( "site_code", dom1 ); // dw_header.getitemstring(1,"site_code")
custCode = genericUtility.getColumnValue( "cust_code", dom1 ); //dw_header.getitemstring(1,"cust_code")
siteCode = genericUtility.getColumnValue( "site_code", dom1 ); // dw_header.getitemstring(1,"site_code")
sqlStr = " select channel_partner ls_channel_partner " //into :ls_channel_partner
+" from site_customer "
......@@ -3924,12 +3924,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsCustCode );
pstmt.setString( 2, lsSiteCode );
pstmt.setString( 1, custCode );
pstmt.setString( 2, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
lsChannelPartner = rs.getString( "ls_channel_partner" );
channelPartner = rs.getString( "ls_channel_partner" );
}
rs.close();
......@@ -3937,18 +3937,18 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.close();
pstmt = null;
if( lsChannelPartner == null )//isnull(ls_channel_partner) then
if( channelPartner == null )//isnull(ls_channel_partner) then
{
sqlStr = "select channel_partner ls_channel_partner " //into :ls_channel_partner
+" from customer "
+" where cust_code = ? ";//:ls_cust_code;
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsCustCode );
pstmt.setString( 1, custCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
lsChannelPartner = rs.getString( "ls_channel_partner" );
channelPartner = rs.getString( "ls_channel_partner" );
}
rs.close();
......@@ -3957,7 +3957,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
}
if( !"Y".equalsIgnoreCase( lsChannelPartner ) )
if( !"Y".equalsIgnoreCase( channelPartner ) )
{
sqlStr = " select deduct_perc mdisc "
+" from sreturn_norms "
......@@ -4141,14 +4141,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
rs = pstmt.executeQuery();
if( rs.next() )
{
lsLocDescr = rs.getString( "ls_loc_descr" );
locDescr = rs.getString( "ls_loc_descr" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append("<location_descr>").append("<![CDATA[" + lsLocDescr + "]]>").append("</location_descr>");
valueXmlString.append("<location_descr>").append("<![CDATA[" + locDescr + "]]>").append("</location_descr>");
}
}
}
......@@ -4173,14 +4173,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
rs = pstmt.executeQuery();
if( rs.next() )
{
lsLocDescr = rs.getString( "ls_loc_descr" );
locDescr = rs.getString( "ls_loc_descr" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println( "lsLocDescr :4: " + lsLocDescr );
valueXmlString.append("<location_descr>").append("<![CDATA[" + lsLocDescr + "]]>").append("</location_descr>");
System.out.println( "locDescr :4: " + locDescr );
valueXmlString.append("<location_descr>").append("<![CDATA[" + locDescr + "]]>").append("</location_descr>");
}
}
}
......@@ -4401,7 +4401,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
java.sql.Timestamp ldExpDate = Timestamp.valueOf(genericUtility.getValidDateString(ldExpDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
mitemCode = genericUtility.getColumnValue( "item_code", dom );
mlotNo = genericUtility.getColumnValue( "lot_no", dom );
lotNo = genericUtility.getColumnValue( "lot_no", dom );
sqlStr = "select shelf_life mshlife "
+" from item_lot_packsize "
......@@ -4411,7 +4411,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mitemCode );
pstmt.setString( 2, mlotNo );
pstmt.setString( 2, lotNo );
rs = pstmt.executeQuery();
if( rs.next() )
......@@ -4480,13 +4480,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mdiffDays = 0;
}
mdays = mdiffDays;
lsCustCode = genericUtility.getColumnValue("cust_code",dom1);
custCode = genericUtility.getColumnValue("cust_code",dom1);
//genericUtility.getColumnValue( "cust_code", dom1 ); //dw_header.getitemstring(1,"cust_code")
lsSitecode = genericUtility.getColumnValue("site_code",dom1);
siteCode = genericUtility.getColumnValue("site_code",dom1);
//genericUtility.getColumnValue( "site_code", dom1 ); // dw_header.getitemstring(1,"site_code")
System.out.println("lsCustCode [" + lsCustCode+ "]");
System.out.println("lsSitecode [" + lsSitecode+ "]");
if (lsCustCode != null && lsSitecode != null )
System.out.println("custCode [" + custCode+ "]");
System.out.println("siteCode [" + siteCode+ "]");
if (custCode != null && siteCode != null )
{
sqlStr = " select channel_partner ls_channel_partner "
+" from site_customer "
......@@ -4495,13 +4495,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsCustCode );
pstmt.setString( 2, lsSiteCode );
pstmt.setString( 1, custCode );
pstmt.setString( 2, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
lsChannelPartner = rs.getString( "ls_channel_partner" );
channelPartner = rs.getString( "ls_channel_partner" );
}
if( rs != null )
rs.close();
......@@ -4510,7 +4510,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.close();
pstmt = null;
}
if( lsChannelPartner == null && lsCustCode != null)
if( channelPartner == null && custCode != null)
{
sqlStr = " select channel_partner ls_channel_partner "
+" from customer "
......@@ -4518,12 +4518,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsCustCode );
pstmt.setString( 1, custCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
lsChannelPartner = rs.getString( "ls_channel_partner" );
channelPartner = rs.getString( "ls_channel_partner" );
}
if( rs != null )
rs.close();
......@@ -4533,7 +4533,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
}
if( lsChannelPartner != null && !"Y".equalsIgnoreCase( lsChannelPartner ) )
if( channelPartner != null && !"Y".equalsIgnoreCase( channelPartner ) )
{
sqlStr = " select deduct_perc mdisc from sreturn_norms "
+" where days_from <= ? " //:mdays
......@@ -4665,9 +4665,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mitemCode = genericUtility.getColumnValue( "item_code", dom ); // dw_detedit[ii_currformno].GetItemString(1, "item_code")
if( mitemCode == null || mitemCode.trim().length() == 0 )
{
lsItemcode = genericUtility.getColumnValue( currentColumn.trim(), dom );
mcustCode = genericUtility.getColumnValue( "cust_code", dom1 ); //dw_header.getitemstring(1,"cust_code")
if( lsItemcode != null && lsItemcode.trim().length() > 0 )
itemCode = genericUtility.getColumnValue( currentColumn.trim(), dom );
custCode = genericUtility.getColumnValue( "cust_code", dom1 ); //dw_header.getitemstring(1,"cust_code")
if( itemCode != null && itemCode.trim().length() > 0 )
{
sqlStr = " select item_code mitem_code, descr mdescr "
+" from customeritem "
......@@ -4676,8 +4676,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsCustCode );
pstmt.setString( 2, lsItemcode );
pstmt.setString( 1, custCode );
pstmt.setString( 2, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
......@@ -4845,8 +4845,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
ConnDriver connDriver = new ConnDriver();
int cc, xx, initialField = 1, lastField = 1, fldcase = 0,madvperc, liLineNo;
String fldname = "", mVal = null, mVal1 = null, fldnm = null, ItemLocty = null, LocTy= null;
String lsItemCode = null, mcustcode = null, mstan = null, mstan1 = null, mreasCode = null, msiteCodeMfg = null, lsRefSer = null, lsRefNo = null;
String mcode = null, mcustCode = null, msiteCode = null, mactive = null, mitemSerHdr = null, lsTranId = null;
String itemCode = null, custCode = null, mstan = null, mstan1 = null, mreasCode = null, siteCodeMfg = null, lsRefSer = null, lsRefNo = null;
String mcode = null, siteCode = null, mactive = null, mitemSerHdr = null, lsTranId = null;
String mschemeCd = null, msiteCd = null, mstateCd = null, mtype = null, mcurrCode = null, lsStatus = null, lsSordNo = null, lsLineNoSord = null;
String lsFlag = null, lsSer = null, lsCust = null, lsInvoiceId = null, lsLotNo = null, lsFullRet = null, lsLotSl = null, lsPricelist = null;
java.sql.Timestamp mdate1 = null, mdate2 = null, mtrandate = null, morderDt = null, mdate = null, mexpDate = null, mchkDate = null, ldTaxdate = null, ldInvoiceDate = null;
......@@ -4858,14 +4858,14 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
long llCurLineno;
double mminShlife = 0.0;
String mitemCode = null, lsOthSer = null, lsTrackShelfLife = null, lsSuppSour = null,lsItemSerCrpolicy = null, lsItemSerCrpolicyHdr = null,lsInvoiceLn = null;
String blackListedYn = null,lsStopBusiness = null,lsItemser = null,lsRetopt = null,lsSiteCode = null,lsLoccode = null, lsSql = null, lsReturnConfirm = null;
String blackListedYn = null,lsStopBusiness = null,lsItemser = null,lsRetopt = null,lsLoccode = null, lsSql = null, lsReturnConfirm = null;
String lsInvoiceItem = null,lsItemParnt = null,lsItemParntInv = null,lsItemSer = null,lsAdjMiscCrn = null;
String lsRetRef = null,lsRetOpt = null,lsCustCode = null,sFieldNo = "0", lsAvilable = null, lsQcreqd = null, lsSretinvqty = null, lsCurtranId = null;
String lsRetRef = null,lsRetOpt = null, sFieldNo = "0", lsAvilable = null, lsQcreqd = null, lsSretinvqty = null, lsCurtranId = null;
long llCnt, llNoInvtrace, llRowcnt,llRow,llCurlineNoInvtrac;
double lcVarperc = 0.0, lcPhysicalqty = 0.0, lcStkqty = 0.0;
double mminShelfLife = 0.0;
String strSch = null;
String siteCode = null;
//String siteCode = null;
DistCommon distCommon = null;
distCommon = new DistCommon();
String sqlStr = null;
......@@ -4906,9 +4906,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
String mdateStr = genericUtility.getColumnValue( "tran_date", dom );// dw_edit.getitemdatetime(1,fldname)
mdate1 = Timestamp.valueOf(genericUtility.getValidDateString( mdateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");//getDateInAppFormat( mdateStr );
msiteCode = genericUtility.getColumnValue( "site_code", dom ); //dw_edit.getitemstring(1,"site_code")
siteCode = genericUtility.getColumnValue( "site_code", dom ); //dw_edit.getitemstring(1,"site_code")
lsInvoiceId = genericUtility.getColumnValue( "invoice_id", dom ); //dw_edit.getitemstring(1,"invoice_id")
errCode = SysCommon.nfCheckPeriod( "SAL", mdate1, msiteCode, conn );
errCode = SysCommon.nfCheckPeriod( "SAL", mdate1, siteCode, conn );
if( errCode != null && errCode.trim().length() > 0 )
{
......@@ -4958,7 +4958,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mVal = genericUtility.getColumnValue( childNodeName.trim(), dom ); //dw_edit.GetItemString(dw_edit.GetRow(),fldname)
System.out.println( "mVal :: " + mVal + " :childNodeName: " + childNodeName );
msiteCode = genericUtility.getColumnValue( "site_code", dom ); //dw_edit.getitemstring(1,"site_code")
siteCode = genericUtility.getColumnValue( "site_code", dom ); //dw_edit.getitemstring(1,"site_code")
lsItemser = genericUtility.getColumnValue( "item_ser", dom ); //dw_edit.getItemString(1,"item_ser")
sqlStr = " select black_listed black_listed_yn "
......@@ -4990,10 +4990,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
errFields.add( childNodeName.toLowerCase() );
}
System.out.println( "msiteCode :: " + msiteCode );
System.out.println( "siteCode :: " + siteCode );
System.out.println( "mVal :: " + mVal );
System.out.println( "conn :: " + (conn == null) );
errCode = isCustomer( msiteCode, mVal, "SAL", conn );
errCode = isCustomer( siteCode, mVal, "SAL", conn );
if( errCode != null && errCode.trim().length() > 0 )
{
errList.add( errCode );
......@@ -5318,7 +5318,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
lsRetOpt = getAbsString( genericUtility.getColumnValue( "ret_opt", dom ) );
if( "D".equalsIgnoreCase( lsRetOpt ) )
{
lsCustCode = genericUtility.getColumnValue( "cust_code", dom1 );
custCode = genericUtility.getColumnValue( "cust_code", dom1 );
sqlStr = " Select count(*) cnt from sreturn "
+" where tran_id = ? "
......@@ -5328,7 +5328,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mVal );
pstmt.setString( 2, lsCustCode );
pstmt.setString( 2, custCode );
rs = pstmt.executeQuery();
if( rs.next() )
......@@ -5458,7 +5458,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
mVal = genericUtility.getColumnValue( "invoice_id", dom );
if ( mVal != null && mVal.trim().length() > 0 && !"null".equalsIgnoreCase( mVal.trim() ) )
{
mcustCode = genericUtility.getColumnValue( "cust_code", dom1 );
custCode = genericUtility.getColumnValue( "cust_code", dom1 );
sqlStr = " select count(*) ll_count "
+" from invoice "
+" where invoice_id = ? " //:mVal
......@@ -5466,7 +5466,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mVal );
pstmt.setString( 2, mcustCode );
pstmt.setString( 2, custCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -5529,18 +5529,18 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
mVal = genericUtility.getColumnValue( "item_code", dom );
msiteCode = genericUtility.getColumnValue( "site_code", dom1 );
siteCode = genericUtility.getColumnValue( "site_code", dom1 );
String mtrandateStr = genericUtility.getColumnValue( "tran_date", dom1 );
mtrandate = Timestamp.valueOf(genericUtility.getValidDateString( mtrandateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
mcustCode = genericUtility.getColumnValue( "cust_code", dom1 );
errCode = isItem( msiteCode, mVal, "SAL", conn );
custCode = genericUtility.getColumnValue( "cust_code", dom1 );
errCode = isItem( siteCode, mVal, "SAL", conn );
//errCode = i_nvo_gbf_func.gbf_item(msite_code,mVal,transer)
if( errCode != null && errCode.trim().length() > 0 )
{
errList.add( errCode );
errFields.add( childNodeName.toLowerCase() );
}
mVal1 = distCommon.getItemSer( mVal, msiteCode, mtrandate, mcustCode, "C", conn );
mVal1 = distCommon.getItemSer( mVal, siteCode, mtrandate, custCode, "C", conn );
//errCode = f_get_token(mval1,"~t")
mitemSerHdr = genericUtility.getColumnValue( "item_ser", dom1 );// dw_header.getitemstring(1,"item_ser")
mitemSerHdr = mitemSerHdr == null ? "" : mitemSerHdr.trim();
......@@ -5620,7 +5620,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}//len(trim(merrCode)) = 0
lsInvoiceId = genericUtility.getColumnValue( "invoice_id", dom1 );
lsItemCode = genericUtility.getColumnValue( "item_code", dom ); //dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(),"item_code")
itemCode = genericUtility.getColumnValue( "item_code", dom ); //dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(),"item_code")
String mlineNoStr = genericUtility.getColumnValue( "line_no__inv", dom );//dw_detedit[ii_currformno].GetItemnumber(dw_detedit[ii_currformno].GetRow(),"line_no__inv")
mlineNo = Integer.parseInt( getNumString( mlineNoStr ) );
lsFlag = genericUtility.getColumnValue( "ret_rep_flag", dom );// dw_detedit[ii_currformno].GetItemString(dw_detedit[ii_currformno].GetRow(),"ret_rep_flag")
......@@ -5658,7 +5658,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+" from item "
+" where item_code = ? ";// :ls_item_code;
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsItemCode );
pstmt.setString( 1, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -5703,7 +5703,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String lcRateStr = genericUtility.getColumnValue( childNodeName.toLowerCase(), dom );
lcRate = Double.parseDouble( lcRateStr == null || lcRateStr.trim().length() == 0 ? "0" : lcRateStr.trim() );
lsInvoiceId = genericUtility.getColumnValue( "invoice_id", dom ); //dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(),"invoice_id")
lsItemCode = genericUtility.getColumnValue( "item_code", dom ); //dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(),"item_code")
itemCode = genericUtility.getColumnValue( "item_code", dom ); //dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(),"item_code")
lsLotNo = genericUtility.getColumnValue( "lot_no", dom ); //dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(),"lot_no")
lsLotSl = genericUtility.getColumnValue( "lot_sl", dom ); //dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(),"lot_sl")
lsPricelist = genericUtility.getColumnValue( "price_list", dom1 );//dw_header.GetItemString(dw_header.GetRow(),"price_list")
......@@ -5715,8 +5715,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
//lcRateInv = i_nvo_gbf_func.gbf_pick_rate(ls_pricelist,ld_taxdate ,ls_item_code,ls_lot_no,'',lc_qtystd)
lsLotNo = lsLotNo == null ? "" : lsLotNo;
lsItemCode = lsItemCode == null ? "" : lsItemCode;
lcRateInv = distCommon.pickRate(lsPricelist,ldTaxdateStr,lsItemCode,lsLotNo,"D",lcQtystd, conn );
itemCode = itemCode == null ? "" : itemCode;
lcRateInv = distCommon.pickRate(lsPricelist,ldTaxdateStr,itemCode,lsLotNo,"D",lcQtystd, conn );
}
if( lcRate < 0 )
{
......@@ -5750,7 +5750,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsInvoiceId );
pstmt.setString( 2, lsItemCode );
pstmt.setString( 2, itemCode );
pstmt.setString( 3, lsLotNo );
pstmt.setString( 4, lsLotSl );
rs = pstmt.executeQuery();
......@@ -6075,13 +6075,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( childNodeName.equalsIgnoreCase( "site_code__mfg" ) )
{
msiteCodeMfg = genericUtility.getColumnValue( "site_code__mfg", dom );
lsItemCode = genericUtility.getColumnValue( "item_code", dom );//dw_detedit[ii_currformno].GetItemString(dw_detedit[ii_currformno].GetRow(),"item_code")
System.out.println( "lsItemCode :: " + lsItemCode );
siteCodeMfg = genericUtility.getColumnValue( "site_code__mfg", dom );
itemCode = genericUtility.getColumnValue( "item_code", dom );//dw_detedit[ii_currformno].GetItemString(dw_detedit[ii_currformno].GetRow(),"item_code")
System.out.println( "itemCode :: " + itemCode );
sqlStr = " select ( case when supp_sour is null then 'M' else supp_sour end ) ls_supp_sour "
+" from item where item_code = ? ";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsItemCode );
pstmt.setString( 1, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -6109,10 +6109,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = null;
System.out.println( "lsSuppSour :: " + lsSuppSour );
System.out.println( "msiteCodeMfg :: " + msiteCodeMfg );
System.out.println( "siteCodeMfg :: " + siteCodeMfg );
if( "M".equalsIgnoreCase( lsSuppSour ) )
{
if( msiteCodeMfg == null || msiteCodeMfg.trim().length() == 0 || "null".equalsIgnoreCase( msiteCodeMfg.trim() ) )
if( siteCodeMfg == null || siteCodeMfg.trim().length() == 0 || "null".equalsIgnoreCase( siteCodeMfg.trim() ) )
{
errCode = "VTSITEMFG1";
//errString = getErrorString( childNodeName, errCode, userId );
......@@ -6126,13 +6126,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
String mdateStr = genericUtility.getColumnValue( "mfg_date", dom );
lsItemCode = genericUtility.getColumnValue( "item_code", dom );
itemCode = genericUtility.getColumnValue( "item_code", dom );
sqlStr = " select ( case when track_shelf_life is null then 'N' else track_shelf_life end ) ls_track_shelf_life "
+" from item where item_code = ? "; //:ls_item_code;
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsItemCode );
pstmt.setString( 1, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -6176,12 +6176,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{
String mdateStr = genericUtility.getColumnValue( "exp_date", dom );
lsItemCode = genericUtility.getColumnValue( "item_code", dom );
itemCode = genericUtility.getColumnValue( "item_code", dom );
sqlStr = " select ( case when track_shelf_life is null then 'N' else track_shelf_life end ) ls_track_shelf_life "
+" from item where item_code = ? "; //:ls_item_code;
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsItemCode );
pstmt.setString( 1, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -6298,7 +6298,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( childNodeName.equalsIgnoreCase( "quantity__stduom" ) )
{
ldCurrQty = 0;
lsItemCode = genericUtility.getColumnValue( "item_code", dom ); //dw_detedit[ii_currformno].getitemstring(1,"item_code")
itemCode = genericUtility.getColumnValue( "item_code", dom ); //dw_detedit[ii_currformno].getitemstring(1,"item_code")
lsInvoiceId = genericUtility.getColumnValue( "invoice_id", dom );//dw_detedit[ii_currformno].getitemstring(1,"invoice_id")
lsFullRet = genericUtility.getColumnValue( "full_ret", dom );//dw_detedit[ii_currformno].getitemstring(1,"full_ret")
lsLotNo = genericUtility.getColumnValue( "lot_no", dom );//dw_detedit[ii_currformno].getitemstring(1,"lot_no")
......@@ -6571,7 +6571,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( childNodeName.equalsIgnoreCase( "loc_code" ) )
{
mVal = genericUtility.getColumnValue( "loc_code", dom );
lsItemCode = genericUtility.getColumnValue( "item_code", dom );
itemCode = genericUtility.getColumnValue( "item_code", dom );
if( mVal != null && mVal.trim().length() > 0 && !"null".equalsIgnoreCase( mVal.trim() ) )
{
......@@ -6611,7 +6611,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
//itemCode = genericUtility.getColumnValue( "item_code", dom );
sqlStr = "select loc_type from item where item_code = ? ";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsItemCode );
pstmt.setString( 1, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -6695,8 +6695,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
if( lsFlag != null && "P".equalsIgnoreCase( lsFlag ) )
{
lsItemCode = genericUtility.getColumnValue( "item_code", dom );
lsSiteCode = genericUtility.getColumnValue( "site_code", dom1 ); //dw_edit.getitemstring(dw_edit.getrow(), "site_code")
itemCode = genericUtility.getColumnValue( "item_code", dom );
siteCode = genericUtility.getColumnValue( "site_code", dom1 ); //dw_edit.getitemstring(dw_edit.getrow(), "site_code")
lsLotNo = genericUtility.getColumnValue( "lot_no", dom );//dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(), "lot_no")
lsLotSl = genericUtility.getColumnValue( "lot_sl", dom );//dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(), "lot_sl")
lsLoccode = genericUtility.getColumnValue( "loc_code", dom );//dw_detedit[ii_currformno].getitemstring(dw_detedit[ii_currformno].getrow(), "loc_code")
......@@ -6717,8 +6717,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+" And a.lot_sl = ? " //:ls_lot_sl
+" And b.available = 'Y' ";
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsItemCode );
pstmt.setString( 2, lsSiteCode );
pstmt.setString( 1, itemCode );
pstmt.setString( 2, siteCode );
pstmt.setString( 3, lsLoccode );
pstmt.setString( 4, lsLotNo );
pstmt.setString( 5, lsLotSl );
......@@ -6768,7 +6768,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
+" Where item_code = ? ";//:ls_item_code;
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsItemCode );
pstmt.setString( 1, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -6953,17 +6953,17 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
}
else if( childNodeName.equalsIgnoreCase( "cust_item__ref" ) )
{
lsItemCode = genericUtility.getColumnValue( "cust_item__ref", dom );
mcustcode = genericUtility.getColumnValue( "cust_code", dom1 );
if( lsItemCode != null && lsItemCode.trim().length() > 0 && !"null".equals(lsItemCode))
itemCode = genericUtility.getColumnValue( "cust_item__ref", dom );
custCode = genericUtility.getColumnValue( "cust_code", dom1 );
if( itemCode != null && itemCode.trim().length() > 0 && !"null".equals(itemCode))
{
sqlStr = " select count(*) mitem_cnt from customeritem "
+" where cust_code = ? " //:mcustcode
+" where cust_code = ? " //:custCode
+" and item_code__ref = ? "; //:ls_item_code ;
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, mcustcode );
pstmt.setString( 2, lsItemCode );
pstmt.setString( 1, custCode );
pstmt.setString( 2, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -7011,7 +7011,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
lsRefSer = genericUtility.getColumnValue( "ref_ser", dom ); //dw_detedit[ii_currformno].GetItemString(dw_detedit[ii_currformno].GetRow(),"ref_ser")
lsRefNo = genericUtility.getColumnValue( "ref_no", dom ); //dw_detedit[ii_currformno].GetItemString(dw_detedit[ii_currformno].GetRow(),"ref_no")
lsItemSer = genericUtility.getColumnValue( "item_ser", dom1 );// dw_header.getitemString(dw_header.getrow(),"ITEM_SER")
lsCustCode = genericUtility.getColumnValue( "cust_code", dom1 );//dw_header.getitemString(dw_header.getrow(),"cust_code")
custCode = genericUtility.getColumnValue( "cust_code", dom1 );//dw_header.getitemString(dw_header.getrow(),"cust_code")
lsAdjMiscCrn = genericUtility.getColumnValue( "adj_misc_crn", dom1 ); //dw_header.getitemString(dw_header.getrow(),"adj_misc_crn")
if( "MC".equalsIgnoreCase( lsAdjMiscCrn ) )
......@@ -7024,7 +7024,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt = conn.prepareStatement( sqlStr );
pstmt.setString( 1, lsRefSer );
pstmt.setString( 2, lsRefNo );
pstmt.setString( 3, lsCustCode );
pstmt.setString( 3, custCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -7062,7 +7062,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
pstmt.setString( 1, lsRefSer );
pstmt.setString( 2, lsRefNo );
pstmt.setString( 3, lsItemSer );
pstmt.setString( 4, lsCustCode );
pstmt.setString( 4, custCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......
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