Skip to content

B
business-java
Commit 51b8db3a authored by arawankar's avatar arawankar
Browse files
Options

Changes made in InvAcct.java and FinCommon.java 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@175083 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ccc7fd39
Show whitespace changes
Inline Side-by-side
Showing with 434 additions and 2 deletions
webitm-fin/ibase/webitm/ejb/fin/FinCommon.java
View file @ 51b8db3a
......@@ -8058,7 +8058,8 @@ public class FinCommon
}
}
//end Changes By sAkhtar on 28 june 2010
else if(purpose.equalsIgnoreCase("DEPRWB")) // ACCOUNT CODE DEPR WRITTEN BACK FOR FIXED ASSET
//Modified by Anjali R. on[1/12/2017][Condition closed inside another purpose condition][Start]
/*else if(purpose.equalsIgnoreCase("DEPRWB")) // ACCOUNT CODE DEPR WRITTEN BACK FOR FIXED ASSET
{
sql = " SELECT ACCT_CODE__DEPR_WB,CCTR_CODE__DEPR_WB FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = '" + itemSer + "' AND TRAN_TYPE = '" + tranType + "'";
......@@ -8485,6 +8486,434 @@ public class FinCommon
}
}
}
}*/
}
else if(purpose.equalsIgnoreCase("DEPRWB")) // ACCOUNT CODE DEPR WRITTEN BACK FOR FIXED ASSET
{
sql = " SELECT ACCT_CODE__DEPR_WB,CCTR_CODE__DEPR_WB FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = '" + itemSer + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__DEPR_WB,CCTR_CODE__DEPR_WB FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__DEPR_WB,CCTR_CODE__DEPR_WB FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
if (itemSer == null || itemSer.trim().length() == 0)
{
sql = "SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = '" + itemCode + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
itemSerN = rs.getString(1);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
else
{
itemSerN = itemSer;
}
sql = " SELECT ACCT_CODE__DEPR_WB,CCTR_CODE__DEPR_WB FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__DEPR_WB,CCTR_CODE__DEPR_WB FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__DEPR_WB,CCTR_CODE__DEPR_WB FROM ITEMSER WHERE ITEM_SER = '" + itemSerN + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
}
}
}
}
else if(purpose.equalsIgnoreCase("FRECOST")) // ACCOUNT CODE FOR AP CODE FOR FREIGHT COST
{
sql = " SELECT ACCT_CODE__FRE,CCTR_CODE__FRE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = '" + itemSer + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__FRE,CCTR_CODE__FRE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__FRE,CCTR_CODE__FRE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
if (itemSer == null || itemSer.trim().length() == 0)
{
sql = "SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = '" + itemCode + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
itemSerN = rs.getString(1);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
else
{
itemSerN = itemSer;
}
sql = " SELECT ACCT_CODE__FRE,CCTR_CODE__FRE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__FRE,CCTR_CODE__FRE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__FRE,CCTR_CODE__FRE FROM ITEMSER WHERE ITEM_SER = '" + itemSerN + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
}
}
}
}
else if(purpose.equalsIgnoreCase("CLECOST")) // ACCOUNT CODE FOR AP CODE FOR CLEARING COST
{
sql = " SELECT ACCT_CODE__CLE,CCTR_CODE__CLE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = '" + itemSer + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__CLE,CCTR_CODE__CLE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__CLE,CCTR_CODE__CLE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
if (itemSer == null || itemSer.trim().length() == 0)
{
sql = "SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = '" + itemCode + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
itemSerN = rs.getString(1);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
else
{
itemSerN = itemSer;
}
sql = " SELECT ACCT_CODE__CLE,CCTR_CODE__CLE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__CLE,CCTR_CODE__CLE FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__CLE,CCTR_CODE__CLE FROM ITEMSER WHERE ITEM_SER = '" + itemSerN + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
}
}
}
}
else if(purpose.equalsIgnoreCase("INSCOST")) // ACCOUNT CODE DEPR FOR FIXED ASSET
{
sql = " SELECT ACCT_CODE__INS,CCTR_CODE__INS FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = '" + itemSer + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__INS,CCTR_CODE__INS FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__INS,CCTR_CODE__INS FROM ITEM_ACCT_DETR WHERE ITEM_CODE = '" + itemCode + "' "
+ " AND ITEM_SER = ' ' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
if (itemSer == null || itemSer.trim().length() == 0)
{
sql = "SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = '" + itemCode + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
itemSerN = rs.getString(1);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
else
{
itemSerN = itemSer;
}
sql = " SELECT ACCT_CODE__INS,CCTR_CODE__INS FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = '" + tranType + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__INS,CCTR_CODE__INS FROM ITEM_ACCT_DETR WHERE ITEM_CODE = ' ' "
+ " AND ITEM_SER = '" + itemSerN + "' AND TRAN_TYPE = ' '";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if (acctCode == null || acctCode.trim().length() == 0)
{
sql = " SELECT ACCT_CODE__INS,CCTR_CODE__INS FROM ITEMSER WHERE ITEM_SER = '" + itemSerN + "'";
pstmt = conn.prepareStatement(sql);
System.out.println("sql ::: " + sql);
rs = pstmt.executeQuery();
if (rs.next())
{
acctCode = rs.getString(1);
cctrCode = rs.getString(2);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
}
}
}
}
//Added by wasim on 31-MAY-2017 for Purpose SRET (Sales Return) [START]
......
webitm-fin/ibase/webitm/ejb/fin/InvAcct.java
View file @ 51b8db3a
......@@ -1231,7 +1231,10 @@ public class InvAcct
if (addAmtHdr != 0)
{
for ( int i = 1; i < 4; i++)
//Modified by Anjali R. on[1/12/2017][As instructed by Piyush sir][Start]
//for ( int i = 1; i < 4; i++)
for ( int i = 1; i < 5; i++)
//Modified by Anjali R. on[1/12/2017][As instructed by Piyush sir][End]
{
System.out.println("PORCP DATA ["+poRcpMap.toString()+"]");
......
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