Skip to content

B
business-java
Commit 35db7f4c authored by mmhatre's avatar mmhatre
Browse files
Options

changes added 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209807 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c63d9629
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 202 deletions
webitm-dis/src/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 35db7f4c
...@@ -4751,48 +4751,48 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4751,48 +4751,48 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
} }
} }
// //added by manish mhatre on 24-sep-2019 //added by manish mhatre on 24-sep-2019
// //start manish //start manish
// sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? "; sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsOrderType); pstmt.setString(1,lsOrderType);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS")); priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if((priceBasis.length()>0)) if((priceBasis.length()>0))
// { {
// sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? "; sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsCustCode); pstmt.setString(1,lsCustCode);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// custCodeBilPl = rs.getString("CUST_CODE__BIL"); custCodeBilPl = rs.getString("CUST_CODE__BIL");
// custCodeDlv = rs.getString("CUST_CODE__DLV"); custCodeDlv = rs.getString("CUST_CODE__DLV");
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if(("B").equalsIgnoreCase(priceBasis)) if(("B").equalsIgnoreCase(priceBasis))
// { {
// lsCustCode=custCodeBilPl; lsCustCode=custCodeBilPl;
// } }
// if(("D").equalsIgnoreCase(priceBasis)) if(("D").equalsIgnoreCase(priceBasis))
// { {
// lsCustCode=custCodeDlv; lsCustCode=custCodeDlv;
// } }
// } }
//
// //end manish //end manish
if (lbOrdFlag) { if (lbOrdFlag) {
sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?"; sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?";
...@@ -4861,7 +4861,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4861,7 +4861,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</price_list__clg>"); .append("</price_list__clg>");
//Modified by Anjali R. on [17/10/2018][Set actual price list value][End] //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 lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
valueXmlString.append("<site_code__ship>").append("<![CDATA[" + lsSiteCode + "]]>") valueXmlString.append("<site_code__ship>").append("<![CDATA[" + lsSiteCode + "]]>")
.append("</site_code__ship>"); .append("</site_code__ship>");
} }
...@@ -5275,49 +5275,49 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5275,49 +5275,49 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
} }
// //added by manish mhatre on 24-sep-2019 //added by manish mhatre on 24-sep-2019
// //start manish //start manish
// sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? "; sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsOrderType); pstmt.setString(1,lsOrderType);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS")); priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if((priceBasis.length()>0)) if((priceBasis.length()>0))
// { {
// sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? "; sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsCustCode); pstmt.setString(1,lsCustCode);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// custCodeBilPl = rs.getString("CUST_CODE__BIL"); custCodeBilPl = rs.getString("CUST_CODE__BIL");
// custCodeDlv = rs.getString("CUST_CODE__DLV"); custCodeDlv = rs.getString("CUST_CODE__DLV");
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if(("B").equalsIgnoreCase(priceBasis)) if(("B").equalsIgnoreCase(priceBasis))
// { {
// lsCustCode=custCodeBilPl; lsCustCode=custCodeBilPl;
// lsCustCodeDlv=custCodeBilPl; lsCustCodeDlv=custCodeBilPl;
// } }
// if(("D").equalsIgnoreCase(priceBasis)) if(("D").equalsIgnoreCase(priceBasis))
// { {
// lsCustCode=custCodeDlv; lsCustCode=custCodeDlv;
// lsCustCodeDlv=custCodeDlv; lsCustCodeDlv=custCodeDlv;
// } }
// } }
// //end manish //end manish
if (lbOrdFlag) { if (lbOrdFlag) {
sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?"; sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?";
...@@ -5441,8 +5441,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5441,8 +5441,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</price_list__clg>"); .append("</price_list__clg>");
setNodeValue(dom, "price_list__clg", getAbsString(lsPlistClg)); setNodeValue(dom, "price_list__clg", getAbsString(lsPlistClg));
} }
// lsCustCodeDlv=checkNull(genericUtility.getColumnValue("cust_code__dlv", dom)); //added by manish mhatre on 04-oct-2019 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 lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
lsTypeAllowCrLmtList = distCommon.getDisparams("999999", "TYPE_ALLOW_CR_LMT", conn); lsTypeAllowCrLmtList = distCommon.getDisparams("999999", "TYPE_ALLOW_CR_LMT", conn);
if (lsTypeAllowCrLmtList == null || lsTypeAllowCrLmtList.trim().length() == 0 if (lsTypeAllowCrLmtList == null || lsTypeAllowCrLmtList.trim().length() == 0
...@@ -7521,73 +7521,73 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -7521,73 +7521,73 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
} }
} }
// //added by manish mhatre on 24-sep-2019 //added by manish mhatre on 24-sep-2019
// //start manish //start manish
// sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? "; sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsOrderType); pstmt.setString(1,lsOrderType);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS")); priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if((priceBasis.length()>0)) if((priceBasis.length()>0))
// { {
// sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? "; sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsCustCode); pstmt.setString(1,lsCustCode);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// custCodeBilPl = rs.getString("CUST_CODE__BIL"); custCodeBilPl = rs.getString("CUST_CODE__BIL");
// custCodeDlv = rs.getString("CUST_CODE__DLV"); custCodeDlv = rs.getString("CUST_CODE__DLV");
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if(("B").equalsIgnoreCase(priceBasis)) if(("B").equalsIgnoreCase(priceBasis))
// { {
// lsCustCode=custCodeBilPl; lsCustCode=custCodeBilPl;
// } }
// if(("D").equalsIgnoreCase(priceBasis)) if(("D").equalsIgnoreCase(priceBasis))
// { {
// lsCustCode=custCodeDlv; lsCustCode=custCodeDlv;
// } }
//
// sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?"; sql = "SELECT price_list,price_list__clg FROM cust_plist WHERE cust_code =? AND order_type =?";
// pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
// pstmt.setString(1, lsCustCode); pstmt.setString(1, lsCustCode);
// pstmt.setString(2, lsOrderType); pstmt.setString(2, lsOrderType);
// rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
// if (rs.next()) { if (rs.next()) {
// lsPriceList = checkNull(rs.getString("price_list")); lsPriceList = checkNull(rs.getString("price_list"));
// lsPlistClg = checkNull(rs.getString("price_list__clg")); lsPlistClg = checkNull(rs.getString("price_list__clg"));
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if (lsPriceList == null || lsPriceList.trim().length() == 0) { if (lsPriceList == null || lsPriceList.trim().length() == 0) {
// Timestamp orderDate = Timestamp.valueOf( Timestamp orderDate = Timestamp.valueOf(
// genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1), genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1),
// genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())
// + " 00:00:00.0"); + " 00:00:00.0");
// lsPriceList = getPriceListOrderType(orderDate, dom, dom1, dom2, conn); lsPriceList = getPriceListOrderType(orderDate, dom, dom1, dom2, conn);
// } }
// if (lsPriceList == null || lsPriceList.trim().length() == 0) { if (lsPriceList == null || lsPriceList.trim().length() == 0) {
// lsPriceList = priceListSite(lsSiteCode, lsCustCode, conn); lsPriceList = priceListSite(lsSiteCode, lsCustCode, conn);
// } }
// } }
// //end manish //end manish
//
if (lbOrdFlag) { if (lbOrdFlag) {
...@@ -7769,7 +7769,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -7769,7 +7769,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<price_list__clg>").append("<![CDATA[" + lsPlistClg + "]]>") valueXmlString.append("<price_list__clg>").append("<![CDATA[" + lsPlistClg + "]]>")
.append("</price_list__clg>"); .append("</price_list__clg>");
} }
// lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019 lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
} else if (currentColumn.trim().equalsIgnoreCase("cust_code__notify")) { } else if (currentColumn.trim().equalsIgnoreCase("cust_code__notify")) {
valueXmlString.append( valueXmlString.append(
...@@ -8306,50 +8306,50 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -8306,50 +8306,50 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
//lsOrderType=checkNull(genericUtility.getColumnValue("order_type",dom)); //lsOrderType=checkNull(genericUtility.getColumnValue("order_type",dom));
// //added by manish mhatre on 24-sep-2019 //added by manish mhatre on 24-sep-2019
// //start manish //start manish
//
// sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? "; sql="SELECT PRICE_BASIS FROM SORDERTYPE where ORDER_TYPE= ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsOrderType); pstmt.setString(1,lsOrderType);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS")); priceBasis = checkNullandTrim(rs.getString("PRICE_BASIS"));
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if((priceBasis.length()>0)) if((priceBasis.length()>0))
// { {
// sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? "; sql=" SELECT CUST_CODE__BIL,CUST_CODE__DLV FROM CUSTOMER WHERE CUST_CODE = ? ";
// pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
// pstmt.setString(1,lsCustCode); pstmt.setString(1,lsCustCode);
// rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
// if(rs.next()) if(rs.next())
// { {
// custCodeBilPl = rs.getString("CUST_CODE__BIL"); custCodeBilPl = rs.getString("CUST_CODE__BIL");
// custCodeDlv = rs.getString("CUST_CODE__DLV"); custCodeDlv = rs.getString("CUST_CODE__DLV");
// } }
// rs.close(); rs.close();
// rs = null; rs = null;
// pstmt.close(); pstmt.close();
// pstmt = null; pstmt = null;
//
// if(("B").equalsIgnoreCase(priceBasis)) { if(("B").equalsIgnoreCase(priceBasis)) {
//
// lsCustCode=custCodeBilPl; lsCustCode=custCodeBilPl;
// custCode=custCodeBilPl; custCode=custCodeBilPl;
// } }
// if(("D").equalsIgnoreCase(priceBasis)) if(("D").equalsIgnoreCase(priceBasis))
// { {
// lsCustCode=custCodeDlv; lsCustCode=custCodeDlv;
// custCode=custCodeDlv; custCode=custCodeDlv;
// } }
// } }
// //end manish //end manish
sql = "SELECT price_list, price_list__clg FROM cust_plist WHERE cust_code = ? AND order_type =?"; sql = "SELECT price_list, price_list__clg FROM cust_plist WHERE cust_code = ? AND order_type =?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -8449,8 +8449,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -8449,8 +8449,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
lsTaxchaphdr = checkNull(genericUtility.getColumnValue("tax_chap", dom)); lsTaxchaphdr = checkNull(genericUtility.getColumnValue("tax_chap", dom));
lsTaxenvhdr = checkNull(genericUtility.getColumnValue("tax_env", dom)); lsTaxenvhdr = checkNull(genericUtility.getColumnValue("tax_env", dom));
lsSiteCodeShip = checkNull(genericUtility.getColumnValue("site_code__ship", dom)); lsSiteCodeShip = checkNull(genericUtility.getColumnValue("site_code__ship", dom));
// lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019 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 custCode=checkNull(genericUtility.getColumnValue("cust_code", dom)); //added by manish mhatre on 24-sep-2019
sql = "select stan_code from site where site_code =?"; sql = "select stan_code from site where site_code =?";
pstmt = conn.prepareStatement(sql); 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