Skip to content

B
business-java
Commit 80c58c12 authored by ngadkari's avatar ngadkari
Browse files
Options

change in acct code cr and dr 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@201221 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c7019d0f
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 21 deletions
webitm-dis/ibase/webitm/ejb/dis/POrderAmdIC.java
View file @ 80c58c12
......@@ -152,7 +152,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
String totAmtDetpordertempstr ="",quantitypoamd ="",ratepoamd ="",acctCodeCrporder ="",exchate="";
String acctCodeCrbrow ="", taxpoamd ="";
String discountpoamd ="",varValueprojectType ="";
String rateOld="",qtyOld = "",sumqty ="",totAmtDetPoamdDetbrow1 ="";
String rateOld="",qtyOld = "",sumqty ="",totAmtDetPoamdDetbrow1 ="",invAcctPorcp="",invAcctQc="";
double rateOldamd=0,qtyOldamd=0,sumQtyamd=0,sumQtyamdNew=0,excedAmt=0;
DistCommon distCommon = new DistCommon();
......@@ -926,8 +926,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
System.out.println("@@@@@ acctCodeDr [" + acctCodeDr+ "]");
if (acctCodeDr != null && acctCodeDr.length() > 0)
{
errCode = fincommon.isAcctCode(siteCode,
acctCodeDr, modName, conn);
errCode = fincommon.isAcctCode(siteCode,acctCodeDr, modName, conn);
// errCode = this.isAcctCode(siteCode, acctCodeDr,
// modName);
if (errCode != null && errCode.trim().length() > 0)
......@@ -936,6 +935,16 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
if (errCode == null || errCode.trim().length() == 0) {
errCode = finCommon.isAcctType(acctCodeDr, "", "O",conn);
//----End---------
if (errCode != null && errCode.trim().length() > 0) {
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
else
{
......@@ -950,13 +959,54 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
acctCodeCr = genericUtility.getColumnValue("acct_code__cr", dom);
siteCode = genericUtility.getColumnValue("site_code",dom);
lineNo = checkNull(genericUtility.getColumnValue("line_no", dom));
suppCode = checkNull(genericUtility.getColumnValue("supp_code", dom1));
System.out.println("@@@@@ acctCodeCr [" + acctCodeCr+ "]");
if (acctCodeCr != null && acctCodeCr.length() > 0)
{
System.out.println("@@@@@ acctCodeCr ["+ acctCodeCr.trim() + "]");
// errCode = this.isAcctCode(siteCode, acctCodeCr,
// modName);
errCode = fincommon.isAcctCode(siteCode,acctCodeCr, modName, conn);
if (errCode != null && errCode.trim().length() > 0) {
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else
{
invAcctPorcp = finCommon.getFinparams("999999","INV_ACCT_PORCP", conn);
if (!"ERROR".equalsIgnoreCase(invAcctPorcp)) {
if (invAcctPorcp == null || "NULLFOUND".equalsIgnoreCase(invAcctPorcp ) || invAcctPorcp.trim().length() == 0) {
invAcctPorcp = "N";
}
}
invAcctQc = finCommon.getFinparams("999999","INV_ACCT_QCORDER", conn);
if (!"ERROR".equalsIgnoreCase(invAcctQc)) {
invAcctQc = "N";
}
if ("N".equalsIgnoreCase(invAcctPorcp) || "N".equalsIgnoreCase(invAcctQc)) {
if ("Y".equalsIgnoreCase(invAcctPorcp)) {
errCode = finCommon.isAcctType( acctCodeCr, "", "O", conn);
if (errCode != null && errCode.trim().length() > 0) {
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
} else {
errCode = finCommon.isAcctType(acctCodeCr,suppCode, "S", conn);
if (errCode != null && errCode.trim().length() > 0) {
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
}
if (errCode == null || errCode.trim().length() == 0) {
// added by Priyanka Das for acctcodecr validation
// request id -d15esun002
//sql ="select max(line_no) from porddet where purc_order = ? ";
......@@ -972,8 +1022,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
rs = null;
pstmt.close();
pstmt = null;
if(maxLine > 1)
{
/*if(maxLine > 1)
{*/
NodeList detail2List = dom2.getElementsByTagName("Detail2");
noOfParent = detail2List.getLength();
......@@ -1044,8 +1094,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
System.out.println("childNodeName["+ childNodeName + "]");
if (childNodeName.equalsIgnoreCase("acct_code__cr"))
{
acctCodeCr = checkNull(genericUtility.getColumnValueFromNode("acct_code__cr", detail2List.item(a))).trim();
lineNoTemp = checkNull(genericUtility.getColumnValueFromNode("line_no", detail2List.item(a))).trim();
acctCodeCr = checkNull(genericUtility.getColumnValue("acct_code__cr", dom2)).trim();
lineNoTemp = checkNull(genericUtility.getColumnValue("line_no", dom2)).trim();
//Added By PRiyankaC on 04JAn18[START]
if(acctCodeCr==null || acctCodeCr.trim().length() == 0)
{
......@@ -5480,7 +5530,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next()) {
type = checkNull(rs.getString("pord_type"));
pordType = checkNull(rs.getString("pord_type"));
}
rs.close();
......@@ -5489,7 +5539,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt = null;
}
cctr_dr =fincommon.getAcctDetrTtype(itemCode, itemSer,
"IN",type,siteCode, conn);
"IN",pordType,siteCode, conn);
//commented-by-monika
/*cctr_dr = fincommon.getFromAcctDetr(itemCode,
itemSer, "IN", conn);*/
......@@ -5543,7 +5593,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next()) {
type = checkNull(rs.getString("pord_type"));
pordType = checkNull(rs.getString("pord_type"));
System.out.println("hello product__type:");
}
rs.close();
......@@ -5552,7 +5602,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt = null;
}
cctr_cr =fincommon.getAcctDetrTtype(itemCode, itemSer,
"IN",type,siteCode, conn);
"IN",pordType,siteCode, conn);
/*cctr_dr = fincommon.getFromAcctDetr(itemCode,
itemSer, "IN", conn);*/
......@@ -5728,7 +5778,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
if (indNo == null || indNo.trim().length() == 0) {
//changes-by-monika-17-may-2019
pordType=checkNull(genericUtility.getColumnValue(
"pord_type", dom1));
purcOrder = checkNull(genericUtility.getColumnValue(
"purc_order", dom1));
if(pordType==null || pordType.trim().length() > 0) {
sql = "select pord_type from porder where purc_order = ? ";
......@@ -5736,7 +5789,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next()) {
type = checkNull(rs.getString("pord_type"));
pordType = checkNull(rs.getString("pord_type"));
}
rs.close();
......@@ -5745,7 +5798,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt = null;
}
cctr_dr =fincommon.getAcctDetrTtype(itemCode, itemSer,
"IN",type,siteCode, conn);
"IN",pordType,siteCode, conn);
System.out.println("tuesday:"+cctr_dr);
//COMMENTED BY-Monika
/*cctr_dr = fincommon.getFromAcctDetr(itemCode,
......@@ -5778,7 +5831,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
acct_dr = mcctrArray[0];
cctr_dr = mcctrArray[1];
}
}//end
valueXmlString.append("<acct_code__dr >")
.append("<![CDATA[" + acct_dr + "]]>")
......@@ -5786,7 +5839,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
valueXmlString.append("<cctr_code__dr >")
.append("<![CDATA[" + cctr_dr + "]]>")
.append("</cctr_code__dr>");
} else {
}else {
sql = " Select acct_code, cctr_code from indent where ind_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, indNo);
......@@ -5830,7 +5883,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next()) {
type = checkNull(rs.getString("pord_type"));
pordType = checkNull(rs.getString("pord_type"));
}
rs.close();
......@@ -5839,7 +5892,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
pstmt = null;
}
cctr_cr =fincommon.getAcctDetrTtype(itemCode, itemSer,
"IN",type,siteCode, conn);
"IN",pordType,siteCode, conn);
System.out.println("tuesday:"+cctr_dr);
//COMMENTED BY-Monika
/* cctr_cr = fincommon.getFromAcctDetr(itemCode, itemSer,
......@@ -5875,7 +5928,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
}
//end
}
/*valueXmlString.append("<acct_code__dr >")
.append("<![CDATA[" + acct_dr + "]]>")
......
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