Skip to content

B
business-java
Commit 2cb53d04 authored by smane's avatar smane
Browse files
Options

Min rate history key : in sales return also while picking lowest rate it consider cust_code__bill. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97163 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 017ece18
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 6 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 2cb53d04
...@@ -84,6 +84,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -84,6 +84,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
Document dom2 = null; Document dom2 = null;
try try
{ {
System.out.println(">>>>>>>>>>>>>>>In wfValData 23/01/15:");
System.out.println("Val xmlString :: " + xmlString ); System.out.println("Val xmlString :: " + xmlString );
System.out.println("Val xmlString1 :: " + xmlString1 ); System.out.println("Val xmlString1 :: " + xmlString1 );
System.out.println("Val xmlString2 :: " + xmlString2 ); System.out.println("Val xmlString2 :: " + xmlString2 );
...@@ -112,6 +113,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -112,6 +113,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} }
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException
{ {
System.out.println(">>>>>>>>>>>>>>>IN String itemChanged currentColumn:"+currentColumn);
System.out.println("Val xmlString*** :: " + xmlString ); System.out.println("Val xmlString*** :: " + xmlString );
System.out.println("Val xmlString1******* :: " + xmlString1 ); System.out.println("Val xmlString1******* :: " + xmlString1 );
System.out.println("Val xmlString2 ****:: " + xmlString2 ); System.out.println("Val xmlString2 ****:: " + xmlString2 );
...@@ -370,6 +372,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -370,6 +372,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
//System.out.println(".....call item change ...."); //System.out.println(".....call item change ....");
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver=null; connDriver=null;
System.out.println(">>>>>>>>>>>In IC currentFormNo:"+currentFormNo);
switch( currentFormNo ) switch( currentFormNo )
{ {
case 1 : case 1 :
...@@ -1371,7 +1374,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -1371,7 +1374,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
case 2: case 2:
System.out.println(">>>>>>>>>>>In IC case 2 currentFormNo:"+currentFormNo);
parentNodeList = dom1.getElementsByTagName("Detail1"); parentNodeList = dom1.getElementsByTagName("Detail1");
parentNode = parentNodeList.item(0); parentNode = parentNodeList.item(0);
winName = getObjName(parentNode); winName = getObjName(parentNode);
...@@ -1770,6 +1773,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -1770,6 +1773,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} // end itm_defaultedit } // end itm_defaultedit
else if(currentColumn.trim().equalsIgnoreCase("item_code")) else if(currentColumn.trim().equalsIgnoreCase("item_code"))
{ {
System.out.println(">>>>>>>>>>>In item_code ic update flag:"+getCurrentUpdateFlag( dom.getElementsByTagName("Detail2").item( 0 ) ));
if( !"D".equalsIgnoreCase( getCurrentUpdateFlag( dom.getElementsByTagName("Detail2").item( 0 ) ) ) ) if( !"D".equalsIgnoreCase( getCurrentUpdateFlag( dom.getElementsByTagName("Detail2").item( 0 ) ) ) )
{ {
//System.out.println( "item_code itemchange !!!" ); //System.out.println( "item_code itemchange !!!" );
...@@ -2141,6 +2145,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -2141,6 +2145,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
valueXmlString.append(reStr); valueXmlString.append(reStr);
} }
} }
System.out.println(">>>>>>>>>>>In item_code before minRateBuff:");
StringBuffer minRateBuff = getMinRate(dom, dom1, "item_code", valueXmlString, conn); StringBuffer minRateBuff = getMinRate(dom, dom1, "item_code", valueXmlString, conn);
System.out.println( "minRateBuff1 :: " + minRateBuff.toString() ); System.out.println( "minRateBuff1 :: " + minRateBuff.toString() );
valueXmlString = minRateBuff; valueXmlString = minRateBuff;
...@@ -2989,6 +2994,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -2989,6 +2994,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} // end of line_no__invtrace } // end of line_no__invtrace
else if (currentColumn.trim().equals("lot_no") ) else if (currentColumn.trim().equals("lot_no") )
{ {
System.out.println(">>>>>>>>>>In IC lot_no:");
priceList = genericUtility.getColumnValue("price_list", dom1); priceList = genericUtility.getColumnValue("price_list", dom1);
priceListClg = genericUtility.getColumnValue("price_list__clg", dom1); priceListClg = genericUtility.getColumnValue("price_list__clg", dom1);
fullRet = genericUtility.getColumnValue("full_ret", dom1); fullRet = genericUtility.getColumnValue("full_ret", dom1);
...@@ -3306,6 +3312,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3306,6 +3312,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
System.out.println( "retReplFlag :2 : " + retReplFlag ); System.out.println( "retReplFlag :2 : " + retReplFlag );
if (retReplFlag != null && retReplFlag.equals("R")) if (retReplFlag != null && retReplFlag.equals("R"))
{ {
System.out.println(">>>>>>>>>>>>>In lot_no before getMinRate @ 3313:");
StringBuffer minRateBuff = getMinRate( dom, dom1, "lot_no", valueXmlString, conn); StringBuffer minRateBuff = getMinRate( dom, dom1, "lot_no", valueXmlString, conn);
System.out.println( "minRateBuff2 :: " + minRateBuff.toString() ); System.out.println( "minRateBuff2 :: " + minRateBuff.toString() );
//valueXmlString = minRateBuff; //valueXmlString = minRateBuff;
...@@ -3415,7 +3422,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3415,7 +3422,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
System.out.println("<<<<<<<<<<DISCOUNT>>>>>>>>>>= "+ discount); System.out.println("<<<<<<<<<<DISCOUNT>>>>>>>>>>= "+ discount);
valueXmlString.append("<discount>").append("<![CDATA[" + discount + "]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA[" + discount + "]]>").append("</discount>");
setNodeValue( dom, "discount", discount ); setNodeValue( dom, "discount", discount );
System.out.println(">>>>>>>>>>>>>In lot_no before getMinRate @ 3421:");
StringBuffer minRateBuff = getMinRate( dom, dom1, currentColumn.trim(), valueXmlString, conn ); StringBuffer minRateBuff = getMinRate( dom, dom1, currentColumn.trim(), valueXmlString, conn );
System.out.println( "minRateBuff2 :: " + minRateBuff.toString() ); System.out.println( "minRateBuff2 :: " + minRateBuff.toString() );
valueXmlString = minRateBuff; valueXmlString = minRateBuff;
...@@ -7994,7 +8001,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -7994,7 +8001,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
ResultSet rs = null; ResultSet rs = null;
try try
{ {
System.out.println(">>>>>>>>>>>>>In getMinRate currCol:"+currCol);
System.out.println(">>>>>>>>>>>>>In getMinRate sBuff:"+sBuff);
invoiceId = genericUtility.getColumnValue("invoice_id",dom1); invoiceId = genericUtility.getColumnValue("invoice_id",dom1);
System.out.println( "invoiceId :: " + invoiceId ); System.out.println( "invoiceId :: " + invoiceId );
if (invoiceId != null && invoiceId.trim().length() > 0 ) if (invoiceId != null && invoiceId.trim().length() > 0 )
...@@ -8062,7 +8070,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8062,7 +8070,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{ {
colCount = -1; colCount = -1;
schemeKey = "SCHEME_HIST_KEY" + ctr ; schemeKey = "SCHEME_HIST_KEY" + ctr ;
System.out.println(">>>>>>>>>In for loop schemeKey:"+schemeKey);
varValue = distCommon.getDisparams("999999",schemeKey,conn); varValue = distCommon.getDisparams("999999",schemeKey,conn);
System.out.println(">>>>>>>>>In for loop afer schemeKey varValue:"+varValue);
if ("NULLFOUND".equals( varValue )) if ("NULLFOUND".equals( varValue ))
{ {
System.out.println( "return 3"); System.out.println( "return 3");
...@@ -8097,14 +8107,20 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8097,14 +8107,20 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
for (int colCtr = 0; colCtr <= colCount; colCtr++) for (int colCtr = 0; colCtr <= colCount; colCtr++)
{ {
colName = col[colCtr]; colName = col[colCtr];
System.out.println(">>>>>>>>>>>colName for getting value:"+colName);
if ( "site_code".equalsIgnoreCase(colName.trim()) || "invoice_id".equalsIgnoreCase(colName.trim()) || "cust_code".equalsIgnoreCase(colName.trim()) ) if ( "site_code".equalsIgnoreCase(colName.trim()) || "invoice_id".equalsIgnoreCase(colName.trim()) || "cust_code".equalsIgnoreCase(colName.trim()) )
{ {
docValue = genericUtility.getColumnValue(colName.trim(),dom1); docValue = genericUtility.getColumnValue(colName.trim(),dom1);
} }
else if("cust_code__bill".equalsIgnoreCase(colName.trim())) //condition added by sagar on 23/01/15
{
docValue = genericUtility.getColumnValue(colName.trim(),dom1);
}
else else
{ {
docValue = genericUtility.getColumnValue(colName.trim(),dom); docValue = genericUtility.getColumnValue(colName.trim(),dom);
} }
System.out.println(">>>>>>>>>>>In for loop docValue:"+docValue);
if (docKey != null && docKey.trim().length() > 0) if (docKey != null && docKey.trim().length() > 0)
{ {
docKey = docKey + "," + ( docValue == null || docValue.trim().length() == 0 ? "" : docValue.trim() ); // 13/05/10 manoharan docValue trim() added docKey = docKey + "," + ( docValue == null || docValue.trim().length() == 0 ? "" : docValue.trim() ); // 13/05/10 manoharan docValue trim() added
...@@ -8114,6 +8130,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8114,6 +8130,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
docKey = docValue; docKey = docValue;
} }
} }
System.out.println(">>>>>>>>>>final docKey:"+docKey);
sql = " select eff_cost from min_rate_history where doc_key = ?" ; sql = " select eff_cost from min_rate_history where doc_key = ?" ;
pstmt= conn.prepareStatement(sql); pstmt= conn.prepareStatement(sql);
pstmt.setString(1,docKey); pstmt.setString(1,docKey);
...@@ -8128,15 +8145,18 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8128,15 +8145,18 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
rs = null; rs = null;
if (minRate > 0) if (minRate > 0)
{ {
System.out.println(">>>>>>>>>>Break if (minRate > 0) @ ctr Pos:"+ctr);
break; break;
} }
} }
System.out.println(">>>>>>>>after for loop minRate:"+minRate);
if (minRate == 0) if (minRate == 0)
{ {
tranDate = tranDate == null ? ( genericUtility.getValidDateString( new Timestamp( System.currentTimeMillis() ).toString(), genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat() ) ).toString() : tranDate; tranDate = tranDate == null ? ( genericUtility.getValidDateString( new Timestamp( System.currentTimeMillis() ).toString(), genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat() ) ).toString() : tranDate;
itemCode = itemCode == null ? "" : itemCode; itemCode = itemCode == null ? "" : itemCode;
lotNo = lotNo == null ? "" : lotNo; lotNo = lotNo == null ? "" : lotNo;
minRate = distCommon.pickRate(priceList,tranDate,itemCode,lotNo,"D",qtyStdUom, conn); minRate = distCommon.pickRate(priceList,tranDate,itemCode,lotNo,"D",qtyStdUom, conn);
System.out.println(">>>>>>>>>>minRate==0 then:"+minRate);
} }
ArrayList convList = null; ArrayList convList = null;
...@@ -8165,7 +8185,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -8165,7 +8185,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
throw new ITMException( e ); throw new ITMException( e );
} }
System.out.println( "return 4"); System.out.println( "return 4");
System.out.println( "sBuff :: " + sBuff.toString() ); System.out.println( ">>> final return sBuff :: " + sBuff.toString() );
return sBuff ; return sBuff ;
} }
private double itemValue2Quantity(String siteCode, String itemCode, String priceList, double netAmt, Connection conn) throws Exception private double itemValue2Quantity(String siteCode, String itemCode, String priceList, double netAmt, Connection conn) throws Exception
......
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