Skip to content

B
business-java
Commit ed2595c9 authored by cshah's avatar cshah
Browse files
Options

DI1HSUN011 :siteCodeCh from site_customer is added for op_stock field 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91684 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1423c780
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 14 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStock.java
View file @ ed2595c9
......@@ -900,6 +900,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
ResultSet rs1 = null;
String custCode = null,rSiteCode = null, locCode = null, lotNo = null, lotSl = null, retRepFlag = null;
java.sql.Timestamp preFromDate = null, preToDate = null;
String siteCodeCh="";
try
{
ibase.webitm.utility.GenericUtility genericUtility = ibase.webitm.utility.GenericUtility.getInstance();
......@@ -1105,7 +1106,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
{
selQueryBuff = new StringBuffer();
selQueryBuff.append("SELECT ITEM_SER FROM CUSTOMER_SERIES ");
selQueryBuff.append("WHERE CUST_CODE = '").append(columnValue);
selQueryBuff.append("WHERE CUST_CODE = '").append(columnValue).append("'");
//selQueryBuff.append("' AND ROWNUM = 1");
stmt = conn.createStatement();
rs = stmt.executeQuery(selQueryBuff.toString());
......@@ -1504,7 +1505,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
tranDate = getColumnValue("tran_date" , dom1 );
tranIdLast = getColumnValue("tran_id__last" ,dom1);
System.out.println("itemCode [" +itemCode+ "]cust_code["+custCode+"]siteCode["+siteCode+"]tranDate["+tranDate+"]tranIdLast["+tranIdLast+"]");
selQuery = "SELECT DESCR, UNIT, LOC_TYPE, ITEM_SER FROM ITEM WHERE ITEM_CODE = '"+itemCode+"'";
stmt = conn.createStatement();
System.out.println("selQuery [" +selQuery+ "]");
......@@ -1721,6 +1722,38 @@ public class CustStock extends ValidatorEJB //implements SessionBean
prdCode = getColumnValue("prd_code" , dom1 );
itemCode = columnValue;
//chandni siteCodeCh 09/Apr/12
System.out.println("hdr.siteCode::"+siteCode+"hdr.custCode::"+custCode);
selQuery =" select site_code__ch from site_customer where site_code ='"+siteCode+"' and cust_code ='"+custCode+"' and channel_partner = 'Y' " ;
stmt = conn.createStatement();
System.out.println("selQuery [" +selQuery+ "]");
rs = stmt.executeQuery(selQuery);
if (rs.next())
{
siteCodeCh = rs.getString("site_code__ch");
System.out.println("siteCodeCh 1 ["+siteCodeCh+"]");
if ("null".equalsIgnoreCase(siteCodeCh))
{
siteCodeCh = siteCode ;
System.out.println("siteCodeCh 2 ["+siteCodeCh+"]");
}
}
else
{
siteCodeCh = siteCode;
System.out.println("siteCodeCh 3 ["+siteCodeCh+"]");
}
rs.close();
rs = null;
if (stmt != null)
{
stmt.close();
stmt = null;
}
System.out.println("siteCodeCh 4 ["+siteCodeCh+"]");
//chandni
selQuery = "SELECT ITEM_SER, DESCR, UNIT, CASE WHEN LOC_TYPE__PARENT IS NULL THEN LOC_TYPE ELSE LOC_TYPE__PARENT END LOC_TYPE FROM ITEM WHERE ITEM_CODE = ? ";
pstmt = conn.prepareStatement(selQuery);
pstmt.setString(1,itemCode);
......@@ -1759,7 +1792,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean
pstmt = conn.prepareStatement(selQuery);
pstmt.setString(1,custCode);
pstmt.setString(2,siteCode);
// pstmt.setString(2,siteCode);
pstmt.setString(2,siteCodeCh); //Added by Chandni 11/Apr/2012
pstmt.setTimestamp(3,tsprevDate);
pstmt.setString(4,itemCode);
rs = pstmt.executeQuery();
......
webitm-dis/ibase/webitm/ejb/dis/CustStockItem.java
View file @ ed2595c9
......@@ -1140,6 +1140,8 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
java.sql.Timestamp preFromDate = null, preToDate = null;
java.sql.Timestamp invFromDate = null, invToDate = null;
ibase.webitm.ejb.sys.UtilMethods utilMethods = null;
String siteCodeCh ="";
try
{
ibase.webitm.utility.GenericUtility genericUtility = ibase.webitm.utility.GenericUtility.getInstance();
......@@ -1852,7 +1854,7 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
}
siteCode = genericUtility.getColumnValue("site_code" , dom1);
tranDate = genericUtility.getColumnValue("tran_date" , dom1 );
tranIdLast = genericUtility.getColumnValue("tran_id__last" ,dom1);
tranIdLast = genericUtility.getColumnValue("tran_id__last" ,dom1);
//System.out.println("itemCode [" +itemCode+ "]cust_code["+custCode+"]siteCode["+siteCode+"]tranDate["+tranDate+"]tranIdLast["+tranIdLast+"]");
//for dynamic binding on 190309
......@@ -2002,7 +2004,47 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
tranIdLast = genericUtility.getColumnValue("tran_id__last" ,dom1);
prdCode = genericUtility.getColumnValue("prd_code" , dom1 );
tranId = genericUtility.getColumnValue("tran_id" , dom1);
//chandni siteCodeCh 09/Apr/12
System.out.println("hdr.siteCode::"+siteCode+"hdr.custCode::"+custCode);
selQuery =" select site_code__ch from site_customer where site_code = ? and cust_code = ? and channel_partner = 'Y' " ;
stmt = conn.prepareStatement(selQuery);
stmt.setString(1,siteCode);
stmt.setString(2,custCode);
System.out.println("selQuery [" +selQuery+ "]");
rs = stmt.executeQuery();
if (rs.next())
{
siteCodeCh = rs.getString("site_code__ch");
System.out.println("siteCodeCh 1 ["+siteCodeCh+"]");
if ("null".equalsIgnoreCase(siteCodeCh))
{
siteCodeCh = siteCode ;
System.out.println("siteCodeCh 2 ["+siteCodeCh+"]");
}
}
else
{
siteCodeCh = siteCode;
System.out.println("siteCodeCh 3 ["+siteCodeCh+"]");
}
rs.close();
rs = null;
if (stmt != null)
{
stmt.close();
stmt = null;
}
System.out.println("siteCodeCh 4 ["+siteCodeCh+"]");
//chandni
itemCode = columnValue;
if (tranIdLast == null || tranIdLast.trim().length() == 0)
{
tranIdLast = " ";
......@@ -2028,7 +2070,6 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
pstmt.close();
rs = null;
pstmt = null;
//
if ("S".equals(stockMode.trim()) || "A".equals(stockMode.trim()) || "C".equals(stockMode.trim()) )
{
String fromDate = genericUtility.getColumnValue("from_date" , dom1 );
......@@ -2048,7 +2089,8 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
pstmt = conn.prepareStatement(selQuery);
pstmt.setString(1,custCode);
pstmt.setString(2,siteCode);
//pstmt.setString(2,siteCode); //commented by chandni
pstmt.setString(2,siteCodeCh); // added by chandni Shah 11/Apr/12
pstmt.setTimestamp(3,tsprevDate);
pstmt.setString(4,itemCode);
rs = pstmt.executeQuery();
......@@ -2188,7 +2230,7 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
// added site_code condition by chandni 21-mar-2012
selQuery = "SELECT SUM(QUANTITY__STDUOM) PURC_RCP FROM INVDET "
+ " where invoice_id in "
+ " (select invoice_id from invoice where cust_code = ? and site_code =? "
+ " (select invoice_id from invoice where cust_code = ? and site_code = ? "
+ " and tran_date between ? and ? ) "
+ " and item_code = ? ";
......
webitm-scmet/ibase/webitm/ejb/dis/CustStock.java
View file @ ed2595c9
......@@ -900,6 +900,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
ResultSet rs1 = null;
String custCode = null,rSiteCode = null, locCode = null, lotNo = null, lotSl = null, retRepFlag = null;
java.sql.Timestamp preFromDate = null, preToDate = null;
String siteCodeCh="";
try
{
ibase.webitm.utility.GenericUtility genericUtility = ibase.webitm.utility.GenericUtility.getInstance();
......@@ -1105,7 +1106,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
{
selQueryBuff = new StringBuffer();
selQueryBuff.append("SELECT ITEM_SER FROM CUSTOMER_SERIES ");
selQueryBuff.append("WHERE CUST_CODE = '").append(columnValue);
selQueryBuff.append("WHERE CUST_CODE = '").append(columnValue).append("'");
//selQueryBuff.append("' AND ROWNUM = 1");
stmt = conn.createStatement();
rs = stmt.executeQuery(selQueryBuff.toString());
......@@ -1504,7 +1505,7 @@ public class CustStock extends ValidatorEJB //implements SessionBean
tranDate = getColumnValue("tran_date" , dom1 );
tranIdLast = getColumnValue("tran_id__last" ,dom1);
System.out.println("itemCode [" +itemCode+ "]cust_code["+custCode+"]siteCode["+siteCode+"]tranDate["+tranDate+"]tranIdLast["+tranIdLast+"]");
selQuery = "SELECT DESCR, UNIT, LOC_TYPE, ITEM_SER FROM ITEM WHERE ITEM_CODE = '"+itemCode+"'";
stmt = conn.createStatement();
System.out.println("selQuery [" +selQuery+ "]");
......@@ -1721,6 +1722,38 @@ public class CustStock extends ValidatorEJB //implements SessionBean
prdCode = getColumnValue("prd_code" , dom1 );
itemCode = columnValue;
//chandni siteCodeCh 09/Apr/12
System.out.println("hdr.siteCode::"+siteCode+"hdr.custCode::"+custCode);
selQuery =" select site_code__ch from site_customer where site_code ='"+siteCode+"' and cust_code ='"+custCode+"' and channel_partner = 'Y' " ;
stmt = conn.createStatement();
System.out.println("selQuery [" +selQuery+ "]");
rs = stmt.executeQuery(selQuery);
if (rs.next())
{
siteCodeCh = rs.getString("site_code__ch");
System.out.println("siteCodeCh 1 ["+siteCodeCh+"]");
if ("null".equalsIgnoreCase(siteCodeCh))
{
siteCodeCh = siteCode ;
System.out.println("siteCodeCh 2 ["+siteCodeCh+"]");
}
}
else
{
siteCodeCh = siteCode;
System.out.println("siteCodeCh 3 ["+siteCodeCh+"]");
}
rs.close();
rs = null;
if (stmt != null)
{
stmt.close();
stmt = null;
}
System.out.println("siteCodeCh 4 ["+siteCodeCh+"]");
//chandni
selQuery = "SELECT ITEM_SER, DESCR, UNIT, CASE WHEN LOC_TYPE__PARENT IS NULL THEN LOC_TYPE ELSE LOC_TYPE__PARENT END LOC_TYPE FROM ITEM WHERE ITEM_CODE = ? ";
pstmt = conn.prepareStatement(selQuery);
pstmt.setString(1,itemCode);
......@@ -1759,7 +1792,8 @@ public class CustStock extends ValidatorEJB //implements SessionBean
pstmt = conn.prepareStatement(selQuery);
pstmt.setString(1,custCode);
pstmt.setString(2,siteCode);
// pstmt.setString(2,siteCode);
pstmt.setString(2,siteCodeCh); //Added by Chandni 11/Apr/2012
pstmt.setTimestamp(3,tsprevDate);
pstmt.setString(4,itemCode);
rs = pstmt.executeQuery();
......
webitm-scmet/ibase/webitm/ejb/dis/CustStockItem.java
View file @ ed2595c9
......@@ -1140,6 +1140,8 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
java.sql.Timestamp preFromDate = null, preToDate = null;
java.sql.Timestamp invFromDate = null, invToDate = null;
ibase.webitm.ejb.sys.UtilMethods utilMethods = null;
String siteCodeCh ="";
try
{
ibase.webitm.utility.GenericUtility genericUtility = ibase.webitm.utility.GenericUtility.getInstance();
......@@ -1852,7 +1854,7 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
}
siteCode = genericUtility.getColumnValue("site_code" , dom1);
tranDate = genericUtility.getColumnValue("tran_date" , dom1 );
tranIdLast = genericUtility.getColumnValue("tran_id__last" ,dom1);
tranIdLast = genericUtility.getColumnValue("tran_id__last" ,dom1);
//System.out.println("itemCode [" +itemCode+ "]cust_code["+custCode+"]siteCode["+siteCode+"]tranDate["+tranDate+"]tranIdLast["+tranIdLast+"]");
//for dynamic binding on 190309
......@@ -2002,7 +2004,47 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
tranIdLast = genericUtility.getColumnValue("tran_id__last" ,dom1);
prdCode = genericUtility.getColumnValue("prd_code" , dom1 );
tranId = genericUtility.getColumnValue("tran_id" , dom1);
//chandni siteCodeCh 09/Apr/12
System.out.println("hdr.siteCode::"+siteCode+"hdr.custCode::"+custCode);
selQuery =" select site_code__ch from site_customer where site_code = ? and cust_code = ? and channel_partner = 'Y' " ;
stmt = conn.prepareStatement(selQuery);
stmt.setString(1,siteCode);
stmt.setString(2,custCode);
System.out.println("selQuery [" +selQuery+ "]");
rs = stmt.executeQuery();
if (rs.next())
{
siteCodeCh = rs.getString("site_code__ch");
System.out.println("siteCodeCh 1 ["+siteCodeCh+"]");
if ("null".equalsIgnoreCase(siteCodeCh))
{
siteCodeCh = siteCode ;
System.out.println("siteCodeCh 2 ["+siteCodeCh+"]");
}
}
else
{
siteCodeCh = siteCode;
System.out.println("siteCodeCh 3 ["+siteCodeCh+"]");
}
rs.close();
rs = null;
if (stmt != null)
{
stmt.close();
stmt = null;
}
System.out.println("siteCodeCh 4 ["+siteCodeCh+"]");
//chandni
itemCode = columnValue;
if (tranIdLast == null || tranIdLast.trim().length() == 0)
{
tranIdLast = " ";
......@@ -2028,7 +2070,6 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
pstmt.close();
rs = null;
pstmt = null;
//
if ("S".equals(stockMode.trim()) || "A".equals(stockMode.trim()) || "C".equals(stockMode.trim()) )
{
String fromDate = genericUtility.getColumnValue("from_date" , dom1 );
......@@ -2048,7 +2089,8 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
pstmt = conn.prepareStatement(selQuery);
pstmt.setString(1,custCode);
pstmt.setString(2,siteCode);
//pstmt.setString(2,siteCode); //commented by chandni
pstmt.setString(2,siteCodeCh); // added by chandni Shah 11/Apr/12
pstmt.setTimestamp(3,tsprevDate);
pstmt.setString(4,itemCode);
rs = pstmt.executeQuery();
......@@ -2188,7 +2230,7 @@ public class CustStockItem extends ValidatorEJB //implements SessionBean
// added site_code condition by chandni 21-mar-2012
selQuery = "SELECT SUM(QUANTITY__STDUOM) PURC_RCP FROM INVDET "
+ " where invoice_id in "
+ " (select invoice_id from invoice where cust_code = ? and site_code =? "
+ " (select invoice_id from invoice where cust_code = ? and site_code = ? "
+ " and tran_date between ? and ? ) "
+ " and item_code = ? ";
......
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