Skip to content

B
business-java
Commit 536cec4b authored by dpawar's avatar dpawar
Browse files
Options

remove lot_no from sql 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94606 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e40fd767
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 43 deletions
webitm-fin/ibase/webitm/ejb/fin/StockRevaluationAdjPrc.java
View file @ 536cec4b
...@@ -17,6 +17,7 @@ import java.sql.SQLException; ...@@ -17,6 +17,7 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
...@@ -87,9 +88,10 @@ public String process(Document dom, Document dom2, String windowName, String xtr ...@@ -87,9 +88,10 @@ public String process(Document dom, Document dom2, String windowName, String xtr
boolean isRecordFound=false; boolean isRecordFound=false;
double quantityOld=0,rateOld=0; double quantityOld=0,rateOld=0;
Set<String> itemSerSet=new HashSet<String>(); Set<String> itemSerSet=new HashSet<String>();
Map<String,String>detail2Map=new HashMap<String,String>();
String siteCode="",itemSerFrm="",itemSerTo="",itemCodeFrm="",itemCodeTo="",errorString="",errCode="",pricelist=""; String siteCode="",itemSerFrm="",itemSerTo="",itemCodeFrm="",itemCodeTo="",errorString="",errCode="",pricelist="";
String sql="",autoConfirm="",priceList="",reasonCode="",userId="",itemCode="",itemSeries="",lotNo="",lotSl=""; String sql="",autoConfirm="",priceList="",reasonCode="",userId="",itemCode="",itemSeries="",lotNo="",lotSl="";
String headerXml="",detail2Xml="",locCode=""; String headerXml="",detail2Xml="",locCode="",accCodeInvOld="",cctrCodeInvOld="";
try{ try{
genericUtility = GenericUtility.getInstance(); genericUtility = GenericUtility.getInstance();
...@@ -312,19 +314,20 @@ public String process(Document dom, Document dom2, String windowName, String xtr ...@@ -312,19 +314,20 @@ public String process(Document dom, Document dom2, String windowName, String xtr
} }
for(String unqItemSer : itemSerSet){ for(String unqItemSer : itemSerSet){
detail2Xml=""; detail2Xml="";
recordProcess++; recordProcess++;
System.out.println("recordProcess1---------->>["+recordProcess+"]"); System.out.println("recordProcess1---------->>["+recordProcess+"]");
lineNo=0; lineNo=0;
if("00".equalsIgnoreCase(itemCodeFrm) && "ZZ".equalsIgnoreCase(itemCodeTo)) if("00".equalsIgnoreCase(itemCodeFrm) && "ZZ".equalsIgnoreCase(itemCodeTo))
{ {
sql="select item_code,quantity,rate,item_ser,lot_no,lot_sl,loc_code from stock " sql="select item_code,quantity,rate,item_ser,lot_no,lot_sl,loc_code,acct_code__inv,"
+ "where site_code = ? and item_ser = ? and lot_no is not null and lot_no <> ' ' "; + "cctr_code__invfrom stock where site_code = ? and item_ser = ?"; // and lot_no is not null and lot_no <> ' ' ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
pstmt.setString(2, unqItemSer); pstmt.setString(2, unqItemSer);
}else{ }else{
sql="select item_code,quantity,rate,item_ser,lot_no,lot_sl,loc_code from stock " sql="select item_code,quantity,rate,item_ser,lot_no,lot_sl,loc_code,acct_code__inv,cctr_code__inv"
+ "where site_code = ? and item_ser = ? and item_code between ? and ? and lot_no is not null and lot_no <> ' ' "; + " from stock where site_code = ? and item_ser = ? and item_code between ? and ? "; //and lot_no is not null and lot_no <> ' ' ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, siteCode);
...@@ -345,9 +348,26 @@ public String process(Document dom, Document dom2, String windowName, String xtr ...@@ -345,9 +348,26 @@ public String process(Document dom, Document dom2, String windowName, String xtr
lotNo=checkNull(rs.getString(5)); lotNo=checkNull(rs.getString(5));
lotNo = lotNo.length() == 0 ? " " : lotNo.trim(); lotNo = lotNo.length() == 0 ? " " : lotNo.trim();
lotSl=checkNull(rs.getString(6)); lotSl=checkNull(rs.getString(6));
lotSl = lotSl.length() == 0 ? " " : lotSl.trim();
locCode=checkNull(rs.getString(7)); locCode=checkNull(rs.getString(7));
detail2Xml=detail2Xml+getDetail2Xml(conn,unqItemSer,siteCode,priceList,itemCode,locCode,lotNo,lotSl,lineNo); accCodeInvOld=checkNull(rs.getString(8));
cctrCodeInvOld=checkNull(rs.getString(9));
cctrCodeInvOld = cctrCodeInvOld.length() == 0 ? " " : cctrCodeInvOld.trim();
detail2Map.put("site_code", siteCode);
detail2Map.put("price_list", priceList);
detail2Map.put("item_ser", unqItemSer);
detail2Map.put("item_code", itemCode);
detail2Map.put("lot_no", lotNo);
detail2Map.put("lot_sl", lotSl);
detail2Map.put("loc_code", locCode);
detail2Map.put("old_rate", Double.toString(rateOld));
detail2Map.put("old_quantity", Double.toString(quantityOld));
detail2Map.put("acct_code__inv", accCodeInvOld);
detail2Map.put("cctr_code__inv", cctrCodeInvOld);
detail2Xml=detail2Xml+getDetail2Xml(conn,detail2Map,lineNo);
detail2Map.clear();
}//end while }//end while
if ( rs != null ){ if ( rs != null ){
rs.close(); rs.close();
...@@ -569,7 +589,8 @@ private String getHeaderXml(Connection conn,String siteCodeL,String unqItemSerL, ...@@ -569,7 +589,8 @@ private String getHeaderXml(Connection conn,String siteCodeL,String unqItemSerL,
} }
private String getDetail2Xml(Connection conn,String itemSer,String siteCode,String priceList,String itemCode,String locCodeL,String lotNo,String lotSl,int lineNo){ private String getDetail2Xml(Connection conn,Map<String,String>detail2MapL,int lineNo){
System.out.println("detail Map---->>["+detail2MapL+"]");
StringBuffer detail2xml=new StringBuffer(); StringBuffer detail2xml=new StringBuffer();
PreparedStatement pstmt1=null; PreparedStatement pstmt1=null;
...@@ -582,19 +603,18 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri ...@@ -582,19 +603,18 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri
detail2xml.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>"); detail2xml.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
detail2xml.append("<tran_id/>"); detail2xml.append("<tran_id/>");
detail2xml.append("<line_no>").append("<![CDATA[").append(lineNo).append("]]></line_no>"); detail2xml.append("<line_no>").append("<![CDATA[").append(lineNo).append("]]></line_no>");
detail2xml.append("<item_code>").append("<![CDATA[").append(itemCode).append("]]></item_code>\r\n"); detail2xml.append("<item_code>").append("<![CDATA[").append(detail2MapL.get("item_code")).append("]]></item_code>\r\n");
detail2xml.append("<loc_code>").append("<![CDATA[").append(locCodeL).append("]]></loc_code>\r\n"); detail2xml.append("<loc_code>").append("<![CDATA[").append(detail2MapL.get("loc_code")).append("]]></loc_code>\r\n");
detail2xml.append("<lot_no>").append("<![CDATA[").append(lotNo).append("]]></lot_no>\r\n"); detail2xml.append("<lot_no>").append("<![CDATA[").append(detail2MapL.get("lot_no")).append("]]></lot_no>\r\n");
detail2xml.append("<lot_sl>").append("<![CDATA[").append(lotSl).append("]]></lot_sl>\r\n"); detail2xml.append("<lot_sl>").append("<![CDATA[").append(detail2MapL.get("lot_sl")).append("]]></lot_sl>\r\n");
quantity=getRecordFromStock(conn, "quantity" ,siteCode, itemCode, locCodeL, lotNo, lotSl); detail2xml.append("<quantity>").append("<![CDATA[").append(detail2MapL.get("old_quantity")).append("]]></quantity>\r\n");
System.out.println("old quantity-------->["+quantity+"]");
detail2xml.append("<quantity>").append("<![CDATA["+quantity+"]]>").append("</quantity>");
oldRate=getRecordFromStock(conn, "rate" ,siteCode, itemCode, locCodeL, lotNo, lotSl); detail2xml.append("<rate__old>").append("<![CDATA[").append(detail2MapL.get("old_rate")).append("]]></rate__old>\r\n");
System.out.println("old rate-------->["+oldRate+"]");
detail2xml.append("<rate__old>").append("<![CDATA["+oldRate+"]]>").append("</rate__old>");
java.util.Date tranDate=new Date(); java.util.Date tranDate=new Date();
newRate=getPriceListRate(priceList, tranDate, itemCode, lotNo, "", conn); newRate=getPriceListRate(detail2MapL.get("price_list"), tranDate, detail2MapL.get("item_code"), detail2MapL.get("lot_no"), "", conn);
System.out.println("PriceList rate------->>["+newRate+"]"); System.out.println("PriceList rate------->>["+newRate+"]");
newRate = newRate == -1 ? 0 : newRate; newRate = newRate == -1 ? 0 : newRate;
/*if(newRate <= 0 ){ /*if(newRate <= 0 ){
...@@ -602,6 +622,7 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri ...@@ -602,6 +622,7 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri
}*/ }*/
detail2xml.append("<rate>").append("<![CDATA["+newRate+"]]>").append("</rate>"); detail2xml.append("<rate>").append("<![CDATA["+newRate+"]]>").append("</rate>");
amountOld= oldRate * quantity; amountOld= oldRate * quantity;
amountNew= newRate * quantity; amountNew= newRate * quantity;
amountDiff=amountNew - amountOld; amountDiff=amountNew - amountOld;
...@@ -614,39 +635,22 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri ...@@ -614,39 +635,22 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri
detail2xml.append("<amount>").append("<![CDATA["+amountNew+"]]>").append("</amount>"); detail2xml.append("<amount>").append("<![CDATA["+amountNew+"]]>").append("</amount>");
detail2xml.append("<amount__diff>").append("<![CDATA["+amountDiff+"]]>").append("</amount__diff>"); detail2xml.append("<amount__diff>").append("<![CDATA["+amountDiff+"]]>").append("</amount__diff>");
acctCctrCode=getAcctCctrCodeFromStock(conn, siteCode, itemCode, locCodeL, lotNo, lotSl); detail2xml.append("<acct_code__inv>").append("<![CDATA[").append(detail2MapL.get("acct_code__inv")).append("]]></acct_code__inv>\r\n");
System.out.println("acctCctrCode----->>["+acctCctrCode+"]"); detail2xml.append("<cctr_code__inv>").append("<![CDATA[").append(detail2MapL.get("cctr_code__inv")).append("]]></cctr_code__inv>\r\n");
String acctCctrCodeL[]=acctCctrCode.split(":");
System.out.println("acctCctrCodeL length----->>["+acctCctrCodeL.length+"]");
acctCctrCodeInvRev=finCommonObj.getFromAcctDetr(itemCode,itemSer,"STKADJ", conn); acctCctrCodeInvRev=finCommonObj.getFromAcctDetr(detail2MapL.get("item_code"),detail2MapL.get("item_ser"),"STKADJ", conn);
System.out.println("acctCctrCodeInvRev----->>["+acctCctrCodeInvRev+"]"); System.out.println("acctCctrCodeInvRev----->>["+acctCctrCodeInvRev+"]");
String acctCctrCodeS[]=acctCctrCodeInvRev.split(","); String acctCctrCodeS[]=acctCctrCodeInvRev.split(",");
System.out.println("acctCctrCodeS length----->>["+acctCctrCodeS.length+"]"); System.out.println("acctCctrCodeS length----->>["+acctCctrCodeS.length+"]");
if (acctCctrCodeL.length ==2 && acctCctrCodeS.length == 2) { if(acctCctrCodeS.length == 2) {
detail2xml.append("<acct_code__inv>").append("<![CDATA[").append(acctCctrCodeL[0].trim()).append("]]></acct_code__inv>\r\n");
detail2xml.append("<cctr_code__inv>").append("<![CDATA[").append(acctCctrCodeL[1].trim()).append("]]></cctr_code__inv>\r\n");
detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[0].trim()).append("]]></acct_code__inrev>\r\n"); detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[0].trim()).append("]]></acct_code__inrev>\r\n");
detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[1].trim()).append("]]></cctr_code__inrev>\r\n"); detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[1].trim()).append("]]></cctr_code__inrev>\r\n");
}else if (acctCctrCodeL.length ==1 && acctCctrCodeS.length == 1) { }else if (acctCctrCodeS.length == 1) {
detail2xml.append("<acct_code__inv>").append("<![CDATA[").append(acctCctrCodeL[0].trim()).append("]]></acct_code__inv>\r\n");
detail2xml.append("<cctr_code__inv>").append("<![CDATA[").append(" ").append("]]></cctr_code__inv>\r\n");
detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[0].trim()).append("]]></acct_code__inrev>\r\n"); detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[0].trim()).append("]]></acct_code__inrev>\r\n");
detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append(" ").append("]]></cctr_code__inrev>\r\n"); detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append(" ").append("]]></cctr_code__inrev>\r\n");
}else if (acctCctrCodeL.length ==1 && acctCctrCodeS.length == 2) { }else{
detail2xml.append("<acct_code__inv>").append("<![CDATA[").append(acctCctrCodeL[0].trim()).append("]]></acct_code__inv>\r\n");
detail2xml.append("<cctr_code__inv>").append("<![CDATA[").append(" ").append("]]></cctr_code__inv>\r\n");
detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[0].trim()).append("]]></acct_code__inrev>\r\n");
detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[1].trim()).append("]]></cctr_code__inrev>\r\n");
}else if (acctCctrCodeL.length ==2 && acctCctrCodeS.length == 1) {
detail2xml.append("<acct_code__inv>").append("<![CDATA[").append(acctCctrCodeL[0].trim()).append("]]></acct_code__inv>\r\n");
detail2xml.append("<cctr_code__inv>").append("<![CDATA[").append(acctCctrCodeL[1].trim()).append("]]></cctr_code__inv>\r\n");
detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[0].trim()).append("]]></acct_code__inrev>\r\n");
detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append(" ").append("]]></cctr_code__inrev>\r\n");
}else{
detail2xml.append("<acct_code__inv>").append("<![CDATA[").append("]]></acct_code__inv>\r\n");
detail2xml.append("<cctr_code__inv>").append("<![CDATA[").append("]]></cctr_code__inv>\r\n");
detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append("]]></acct_code__inrev>\r\n"); detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append("]]></acct_code__inrev>\r\n");
detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append("]]></cctr_code__inrev>\r\n"); detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append("]]></cctr_code__inrev>\r\n");
} }
......
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