Skip to content

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

issue fixes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94559 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b8bb1ed2
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 14 deletions
webitm-fin/ibase/webitm/ejb/fin/StockRevaluationAdjPrc.java
View file @ fde51afc
......@@ -281,7 +281,7 @@ public String process(Document dom, Document dom2, String windowName, String xtr
serCount++;
lineNo=0;
sql="select item_code,quantity,rate,item_ser,lot_no,lot_sl,loc_code from stock "
+ "where site_code = ? and item_ser = ? and item_code between ? and ?";
+ "where site_code = ? and item_ser = ? and item_code between ? and ? and quantity > 0 and lot_no is not null and lot_no <> ' ' ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
......@@ -300,6 +300,7 @@ public String process(Document dom, Document dom2, String windowName, String xtr
rateOld=rs.getDouble(3);
itemSeries=checkNull(rs.getString(4));
lotNo=checkNull(rs.getString(5));
lotNo = lotNo.length() == 0 ? " " : lotNo.trim();
lotSl=checkNull(rs.getString(6));
locCode=checkNull(rs.getString(7));
detail2Xml=detail2Xml+getDetail2Xml(conn,unqItemSer,siteCode,priceList,itemCode,locCode,lotNo,lotSl,lineNo);
......@@ -335,8 +336,8 @@ public String process(Document dom, Document dom2, String windowName, String xtr
}
}else{
conn.rollback();
errCode = "VTERROR";//process fail (not save record)
errorString = vdt.getErrorString("",errCode,userId);
/*errCode = "VTERROR";//process fail (not save record)
errorString = vdt.getErrorString("",errCode,userId);*/
return errorString;
}
......@@ -377,15 +378,14 @@ public String process(Document dom, Document dom2, String windowName, String xtr
if(isError){
System.out.println("isError true................");
conn.rollback();
errCode = "VTERROR";// Process fail
/*errCode = "VTERROR";// Process fail
errorString = vdt.getErrorString("",errCode,userId);
return errorString;
return errorString;*/
}
if(conn!=null){
conn.close();
conn=null;
}
}
catch(Exception e){
......@@ -469,8 +469,18 @@ private String getHeaderXml(Connection conn,String siteCodeL,String unqItemSerL,
GenericUtility genutility=null;
SimpleDateFormat sdf=null;
java.sql.Timestamp currDate = null;
String currAppdate ="";
String currAppdate ="", tranType = "";
String sql = "select fld_value from gencodes where mod_name = 'W_STOCKVALADJTRAN' AND fld_name = 'TRAN_TYPE'";
PreparedStatement pst = conn.prepareStatement(sql);
ResultSet rs = pst.executeQuery();
while (rs.next()) {
tranType = checkNull(rs.getString(1));
}
pst.close();
pst = null;
rs.close();
rs = null;
genutility=GenericUtility.getInstance();
sdf=new SimpleDateFormat(genutility.getApplDateFormat());
......@@ -502,7 +512,7 @@ private String getHeaderXml(Connection conn,String siteCodeL,String unqItemSerL,
xmlBuffer.append("<tran_id/>");
xmlBuffer.append("<tran_date>").append("<![CDATA[").append(currAppdate).append("]]></tran_date>\r\n");
xmlBuffer.append("<tran_type>").append("<![CDATA[").append("").append("]]></tran_type>\r\n");
xmlBuffer.append("<tran_type>").append("<![CDATA[").append(tranType).append("]]></tran_type>\r\n");
xmlBuffer.append("<eff_date>").append("<![CDATA[").append(currAppdate).append("]]></eff_date>\r\n");
xmlBuffer.append("<site_code>").append("<![CDATA[").append(siteCodeL).append("]]></site_code>\r\n");
xmlBuffer.append("<item_ser>").append("<![CDATA[").append(unqItemSerL).append("]]></item_ser>\r\n");
......@@ -545,6 +555,7 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri
detail2xml.append("<rate__old>").append("<![CDATA["+oldRate+"]]>").append("</rate__old>");
java.util.Date tranDate=new Date();
newRate=getPriceListRate(priceList, tranDate, itemCode, lotNo, "", conn);
newRate = newRate == -1 ? 0 : newRate;
detail2xml.append("<rate>").append("<![CDATA["+newRate+"]]>").append("</rate>");
amountOld= oldRate * quantity;
......@@ -559,18 +570,23 @@ private String getDetail2Xml(Connection conn,String itemSer,String siteCode,Stri
detail2xml.append("<amount>").append("<![CDATA["+amountNew+"]]>").append("</amount>");
detail2xml.append("<amount__diff>").append("<![CDATA["+amountDiff+"]]>").append("</amount__diff>");
acctCctrCode=getAcctCctrCodeFromStock(conn, siteCode, itemCode, locCodeL, lotNo, lotSl);
System.out.println("acctCctrCode----->>["+acctCctrCode+"]");
String acctCctrCodeL[]=acctCctrCode.split(":");
acctCctrCodeInvRev=finCommonObj.getFromAcctDetr(itemCode,itemSer,"STKADJ", conn);
System.out.println("acctCctrCodeInvRev----->>["+acctCctrCodeInvRev+"]");
String acctCctrCodeS[]=acctCctrCodeInvRev.split(",");
detail2xml.append("<acct_code__inv>").append("<![CDATA[").append(acctCctrCodeL[0]).append("]]></acct_code__inv>\r\n");
detail2xml.append("<cctr_code__inv>").append("<![CDATA[").append(acctCctrCodeL[1]).append("]]></cctr_code__inv>\r\n");
detail2xml.append("<acct_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[0]).append("]]></acct_code__inrev>\r\n");
detail2xml.append("<cctr_code__inrev>").append("<![CDATA[").append(acctCctrCodeS[1]).append("]]></cctr_code__inrev>\r\n");
if (acctCctrCodeL.length > 0 && acctCctrCodeS.length > 0) {
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(acctCctrCodeS[1].trim()).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("<cctr_code__inrev>").append("<![CDATA[").append("]]></cctr_code__inrev>\r\n");
}
detail2xml.append("</Detail2>");
......
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