Skip to content

B
business-java
Commit 7f9d99c5 authored by mmhatre's avatar mmhatre
Browse files
Options

 Sordertype master to add a flag pricing_basis for price list of sold to,/... 

 Sordertype master to add a flag pricing_basis for price list of sold to,/ bill to/dlv to customer to be set in sales order and sales order form based on that pricelist. If the value is not defined it should do based on sold to

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209070 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 48ffa261
Show whitespace changes
Inline Side-by-side
Showing with 214 additions and 9 deletions
webitm-dis/src/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 7f9d99c5
......@@ -4631,7 +4631,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
double mExcRate = 0.0, lcStdrate = 0.00, lsCommPerc = 0.00;
int cnt = 0, ll_schcnt = 0, cnt1 = 0;
boolean rootFlag = true;
String priceLst="",custCodeBilPl=""; //added by manish mhatre on 24-sep-2019
String priceBasis=""; //added by manish mhatre on 24-sep-2019
int pos = 0;
String reStr = "";
......@@ -4726,6 +4727,48 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
}
}
}
//added by manish mhatre on 24-sep-2019
//start manish
sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsOrderType);
rs=pstmt.executeQuery();
if(rs.next())
{
priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if((priceBasis.length()>0))
{
sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsCustCode);
rs=pstmt.executeQuery();
if(rs.next())
{
custCodeBilPl = rs.getString("CUST_CODE__BIL");
custCodeDlv = rs.getString("CUST_CODE__DLV");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(("B").equalsIgnoreCase(priceBasis))
{
lsCustCode=custCodeBilPl;
}
if(("D").equalsIgnoreCase(priceBasis))
{
lsCustCode=custCodeDlv;
}
}
//end manish
if (lbOrdFlag) {
sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?";
......@@ -4794,7 +4837,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</price_list__clg>");
//Modified by Anjali R. on [17/10/2018][Set actual price list value][End]
}
lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
valueXmlString.append("<site_code__ship>").append("<![CDATA[" + lsSiteCode + "]]>")
.append("</site_code__ship>");
}
......@@ -5206,6 +5249,51 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
}
}
}
//added by manish mhatre on 24-sep-2019
//start manish
sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsOrderType);
rs=pstmt.executeQuery();
if(rs.next())
{
priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if((priceBasis.length()>0))
{
sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsCustCode);
rs=pstmt.executeQuery();
if(rs.next())
{
custCodeBilPl = rs.getString("CUST_CODE__BIL");
custCodeDlv = rs.getString("CUST_CODE__DLV");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(("B").equalsIgnoreCase(priceBasis))
{
lsCustCode=custCodeBilPl;
lsCustCodeDlv=custCodeBilPl;
}
if(("D").equalsIgnoreCase(priceBasis))
{
lsCustCode=custCodeDlv;
lsCustCodeDlv=custCodeDlv;
}
}
//end manish
if (lbOrdFlag) {
sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?";
pstmt = conn.prepareStatement(sql);
......@@ -5328,6 +5416,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</price_list__clg>");
setNodeValue(dom, "price_list__clg", getAbsString(lsPlistClg));
}
lsCustCodeDlv=checkNull(genericUtility.getColumnValue("cust_code__dlv", dom)); //added by manish mhatre on 04-oct-2019
lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
lsTypeAllowCrLmtList = distCommon.getDisparams("999999", "TYPE_ALLOW_CR_LMT", conn);
if (lsTypeAllowCrLmtList == null || lsTypeAllowCrLmtList.trim().length() == 0
|| lsTypeAllowCrLmtList.equalsIgnoreCase("NULLFOUND")) {
......@@ -7395,7 +7486,6 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom));
lsDisIndOrdtypeList = distCommon.getDisparams("999999", "IND_ORD_TYPE", conn);
boolean lbOrdFlag = false;
String lsDisIndOrdtypeListArr[] = lsDisIndOrdtypeList.split(",");
......@@ -7406,6 +7496,73 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
}
}
}
//added by manish mhatre on 24-sep-2019
//start manish
sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsOrderType);
rs=pstmt.executeQuery();
if(rs.next())
{
priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if((priceBasis.length()>0))
{
sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsCustCode);
rs=pstmt.executeQuery();
if(rs.next())
{
custCodeBilPl = rs.getString("CUST_CODE__BIL");
custCodeDlv = rs.getString("CUST_CODE__DLV");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(("B").equalsIgnoreCase(priceBasis))
{
lsCustCode=custCodeBilPl;
}
if(("D").equalsIgnoreCase(priceBasis))
{
lsCustCode=custCodeDlv;
}
sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
pstmt.setString(2, lsOrderType);
rs = pstmt.executeQuery();
if (rs.next()) {
lsPriceList = checkNull(rs.getString("price_list"));
lsPlistClg = checkNull(rs.getString("price_list__clg"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (lsPriceList == null || lsPriceList.trim().length() == 0) {
Timestamp orderDate = Timestamp.valueOf(
genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1),
genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())
+ " 00:00:00.0");
lsPriceList = getPriceListOrderType(orderDate, dom, dom1, dom2, conn);
}
if (lsPriceList == null || lsPriceList.trim().length() == 0) {
lsPriceList = priceListSite(lsSiteCode, lsCustCode, conn);
}
}
//end manish
if (lbOrdFlag) {
......@@ -7587,6 +7744,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<price_list__clg>").append("<![CDATA[" + lsPlistClg + "]]>")
.append("</price_list__clg>");
}
lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
} else if (currentColumn.trim().equalsIgnoreCase("cust_code__notify")) {
valueXmlString.append(
itmCustCodeNotify(valueXmlString, dom, dom1, dom2, editFlag, xtraParams, objContext, conn));
......@@ -8120,6 +8279,52 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
//end manish // Start added by chandrashekar
// 10-aug-2016
//lsOrderType=checkNull(genericUtility.getColumnValue("order_type",dom));
//added by manish mhatre on 24-sep-2019
//start manish
sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsOrderType);
rs=pstmt.executeQuery();
if(rs.next())
{
priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if((priceBasis.length()>0))
{
sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,lsCustCode);
rs=pstmt.executeQuery();
if(rs.next())
{
custCodeBilPl = rs.getString("CUST_CODE__BIL");
custCodeDlv = rs.getString("CUST_CODE__DLV");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(("B").equalsIgnoreCase(priceBasis)) {
lsCustCode=custCodeBilPl;
custCode=custCodeBilPl;
}
if(("D").equalsIgnoreCase(priceBasis))
{
lsCustCode=custCodeDlv;
custCode=custCodeDlv;
}
}
//end manish
sql = "SELECT price_list, price_list__clg FROM cust_plist WHERE cust_code = ? AND order_type =?";
pstmt = conn.prepareStatement(sql);
......@@ -8218,9 +8423,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
lsTaxclasshdr = checkNull(genericUtility.getColumnValue("tax_class", dom));
lsTaxchaphdr = checkNull(genericUtility.getColumnValue("tax_chap", dom));
lsTaxenvhdr = checkNull(genericUtility.getColumnValue("tax_env", dom));
lsSiteCodeShip = checkNull(genericUtility.getColumnValue("site_code__ship", dom));
lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
custCode=checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
sql = "select stan_code from site where site_code =?";
pstmt = conn.prepareStatement(sql);
......
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