Skip to content

B
business-java
Commit a742bd72 authored by nkhan's avatar nkhan
Browse files
Options

[S15IBAS003] Updated Sources For Adding Validation From MSI And removing extra validation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103417 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ec3d7d10
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 758 additions and 318 deletions
webitm-dis/ibase/webitm/ejb/dis/CreditTermIC.java
View file @ a742bd72
......@@ -117,12 +117,14 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
if(childNodeName.equalsIgnoreCase("cr_term"))
{
crTerm = checkNull(genericUtility.getColumnValue("cr_term", dom));
//if(crTerm == null || crTerm.trim().length() == 0)
//{
// errCode = "VECRT2";
// errList.add(errCode);
// errFields.add(childNodeName.toLowerCase());
//}
// changed By Nasruddin 14/SEP/16 START
if(crTerm == null || crTerm.trim().length() == 0)
{
errCode = "VECRT2";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
// changed By Nasruddin 14/SEP/16 END
if(editFlag.equalsIgnoreCase("A") && crTerm != null && crTerm.trim().length() > 0)
{
sql = "select count(*) from crterm where cr_term = ?";
......@@ -155,6 +157,32 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
// changed By Nasruddin 14/SEP/16 Start
else
{
crTerm = checkNull(genericUtility.getColumnValue("cr_term", dom));
sql = "select count(1) from crterm where cr_term <> ? and descr = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,crTerm);
pstmt.setString(2, descr);
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
if(count > 0)
{
errCode = "VMDUPDESCR";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
// changed By Nasruddin 14/SEP/16 END
}
else if(childNodeName.equalsIgnoreCase("start_from"))
{
......@@ -181,7 +209,8 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
childNodeName = childNode.getNodeName();
if(childNodeName.equalsIgnoreCase("min_day"))
{
crTerm = checkNull(genericUtility.getColumnValue("cr_term", dom));
//crTerm = checkNull(genericUtility.getColumnValue("cr_term", dom));
crTerm = crTerm;
lineNo = checkNull(genericUtility.getColumnValue("line_no", dom));
minDay = convertInt(genericUtility.getColumnValue("min_day", dom));
maxDay = convertInt(genericUtility.getColumnValue("max_day", dom));
......@@ -258,18 +287,9 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
}
else
{
/*select count(*) into :cnt from crtermfc
where cr_term = :mval and (min_day <> :mmin_day
or min_cramt <> :mmin_cramt) and
max_day between :mmin_day and :mmax_day and
(min_cramt between :mmin_cramt and :mmax_cramt or
max_cramt between :mmin_cramt and :mmax_cramt) and
line_no <> :mval1 ;
if cnt > 0 then
// max range clashes in edit
errcode = 'VTCRTERM2'
// Changed By Nasruddin 14/SEP/16 START
sql = "select count(*) from crtermfc where cr_term = ? and "
+" (min_day <> ? or min_cramt <> ?) and max_day between ? and ? and "
+" (min_cramt between ? and ? or max_cramt between ? and ?) and "
......@@ -300,8 +320,8 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
*/
}
// Changed By Nasruddin 14/SEP/16 END
}
}
}
......@@ -347,6 +367,7 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
pstmt = null;
}
}
/*
else if(childNodeName.equalsIgnoreCase("fin_chg"))
{
financialCharge = checkNull(genericUtility.getColumnValue("fin_chg", dom));
......@@ -357,7 +378,7 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}*/
}
break;
case 3 :
......
webitm-dis/ibase/webitm/ejb/dis/CustItemUpdateIC.java
View file @ a742bd72
......@@ -599,5 +599,4 @@ public class CustItemUpdateIC extends ValidatorEJB implements CustItemUpdateICLo
return msgType;
}
}
webitm-dis/ibase/webitm/ejb/dis/CustomerItem.java
View file @ a742bd72
......@@ -138,7 +138,35 @@ public class CustomerItem extends ValidatorEJB implements CustomerItemLocal,Cust
errCode = "VTITEM1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
// Changed By Nasruddin [9/SEP/16] Start
else
{
if("A".equals(editFlag) && errCode == null || errCode.trim().length() == 0)
{
custCode = genericUtility.getColumnValue("cust_code", dom);
sql = "select count(1) from customeritem where cust_code = ? and item_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCode);
pstmt.setString(2, itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
if(count == 0)
{
errCode = "VTDUPENTRY";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
}
// Changed By Nasruddin [9/SEP/16] End
rs.close();
rs = null;
pstmt.close();
......
webitm-dis/ibase/webitm/ejb/dis/CustomerSerCredit.java
View file @ a742bd72
......@@ -73,6 +73,7 @@ public class CustomerSerCredit extends ValidatorEJB implements CustomerSerCredit
String errorType = "";
String childNodeName = null;
String errString = "";
String diskList = "";// Change By Nasruddin [9/SEP/16]
int ctr=0;
int childNodeListLength;
......@@ -288,7 +289,8 @@ public class CustomerSerCredit extends ValidatorEJB implements CustomerSerCredit
if(childNodeName.equalsIgnoreCase("dlv_term"))
{
dlvTerm = genericUtility.getColumnValue("dlv_term", dom);
if(dlvTerm != null && salesPers2.trim().length() > 0)
//if(dlvTerm != null && salesPers2.trim().length() > 0)
if(dlvTerm != null && dlvTerm.trim().length() > 0) // Changed By Nasruddin [9/SEP/16]
{
sql = "select count(*) from delivery_term where dlv_term = ?";
pstmt = conn.prepareStatement(sql);
......@@ -310,6 +312,33 @@ public class CustomerSerCredit extends ValidatorEJB implements CustomerSerCredit
pstmt = null;
}
}
// Changed By Nasruddin Khan [09/SEP/16] Start
if(childNodeName.equalsIgnoreCase("disc_list"))
{
diskList = genericUtility.getColumnValue("disc_list", dom);
if(diskList != null && diskList.trim().length() > 0)
{
sql = "SELECT COUNT(1) FROM DISC_LIST WHERE DISC_LIST = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,diskList);
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
if(count == 0)
{
errCode = "VTDISCLT1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
}
// Changed By Nasruddin Khan [09/SEP/16] END
}//end of for
int errListSize = errList.size();
......
webitm-dis/ibase/webitm/ejb/dis/DeptRate.java
View file @ a742bd72
......@@ -101,8 +101,8 @@ public class DeptRate extends ValidatorEJB implements DeptRateLocal,DeptRateRemo
if(childNodeName.equalsIgnoreCase("item_code__depb"))
{
itemCode = genericUtility.getColumnValue("item_code__depb", dom);
if(itemCode != null && itemCode.trim().length() > 0)
{
//if(itemCode != null && itemCode.trim().length() > 0) Comment by nasruddin [16-sep-16]
//{
sql = "select count(*) from item where item_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
......@@ -121,7 +121,7 @@ public class DeptRate extends ValidatorEJB implements DeptRateLocal,DeptRateRemo
rs = null;
pstmt.close();
pstmt = null;
}
//}
}
else if(childNodeName.equalsIgnoreCase("valid_upto"))
......
webitm-dis/ibase/webitm/ejb/dis/DisparmMaster.java
View file @ a742bd72
......@@ -114,22 +114,26 @@ public class DisparmMaster extends ValidatorEJB implements DisparmMasterLocal,
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
for (ctr = 0; ctr < childNodeListLength; ctr++) {
for (ctr = 0; ctr < childNodeListLength; ctr++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if ("var_name".equalsIgnoreCase(childNodeName)) {
if ((childNode.getFirstChild() == null)) {
if ("var_name".equalsIgnoreCase(childNodeName))
{
if ((childNode.getFirstChild() == null))
{
errList.add("VPBLKVRNM");
errFields.add(childNodeName.toLowerCase());
break;
} else {
}
else
{
prd_code = checkNull(genericUtility.getColumnValue(
"prd_code", curDom));
var_name = checkNull(genericUtility.getColumnValue(
"var_name", curDom));
prd_code = checkNull(genericUtility.getColumnValue("prd_code", curDom));
var_name = checkNull(genericUtility.getColumnValue("var_name", curDom));
if (editFlag.equalsIgnoreCase("A")) {
if (editFlag.equalsIgnoreCase("A"))
{
sql = "select count(*) as COUNT from disparm where prd_code=? and var_name=?";
pstmt = conn.prepareStatement(sql);
......@@ -137,11 +141,13 @@ public class DisparmMaster extends ValidatorEJB implements DisparmMasterLocal,
pstmt.setString(2, var_name.trim());
rs = pstmt.executeQuery();
if (rs.next()) {
if (rs.next())
{
count = rs.getInt("COUNT");
}
if (count > 0) {
if (count > 0)
{
errList.add("VPINVVRNM");
errFields.add(childNodeName.toLowerCase());
break;
......@@ -150,15 +156,19 @@ public class DisparmMaster extends ValidatorEJB implements DisparmMasterLocal,
}
}
}
if ("prd_code".equalsIgnoreCase(childNodeName)) {
if ((childNode.getFirstChild() == null)) {
if ("prd_code".equalsIgnoreCase(childNodeName))
{
if ((childNode.getFirstChild() == null))
{
errList.add("VPBLKPRCD");
errFields.add(childNodeName.toLowerCase());
break;
}
}
if ("var_type".equalsIgnoreCase(childNodeName)) {
if ((childNode.getFirstChild() == null)) {
if ("var_type".equalsIgnoreCase(childNodeName))
{
if ((childNode.getFirstChild() == null))
{
errList.add("VPBLKVRTP");
errFields.add(childNodeName.toLowerCase());
break;
......
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