Skip to content

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

[S15IBAS003] Updated Sources For Adding Validation and Item Change From MSI... 

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


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103568 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7e075384
Show whitespace changes
Inline Side-by-side
Showing with 138 additions and 75 deletions
webitm-dis/ibase/webitm/ejb/dis/Customer.java
View file @ 6f44ea26
......@@ -780,14 +780,8 @@ implements CustomerLocal, CustomerRemote
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
} else
{
errCode = "VTACCTCD1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
// cHANGED By Nasruddin [30-SEP-16] START
else
{
errCode = "VTACCTCD1";// A/C Rec is null
......
webitm-dis/ibase/webitm/ejb/dis/CustomerItem.java
View file @ 6f44ea26
......@@ -137,7 +137,6 @@ public class CustomerItem extends ValidatorEJB implements CustomerItemLocal,Cust
rs = null;
pstmt.close();
pstmt = null;
if(count == 0)
{
errCode = "VTITEM1";
......@@ -147,7 +146,10 @@ public class CustomerItem extends ValidatorEJB implements CustomerItemLocal,Cust
// Changed By Nasruddin [9/SEP/16] Start
else
{
if("A".equals(editFlag) && errCode == null || errCode.trim().length() == 0)
if("A".equals(editFlag) )
{
System.out.println("Olnly Add Mode editFlag ["+editFlag+"]");
if(errCode == null || errCode.trim().length() == 0)
{
custCode = genericUtility.getColumnValue("cust_code", dom);
sql = "select count(1) from customeritem where cust_code = ? and item_code = ?";
......@@ -159,7 +161,7 @@ public class CustomerItem extends ValidatorEJB implements CustomerItemLocal,Cust
{
count = rs.getInt(1);
}
if(count == 0)
if(count > 0)
{
errCode = "VTDUPENTRY";
errList.add(errCode);
......@@ -171,6 +173,7 @@ public class CustomerItem extends ValidatorEJB implements CustomerItemLocal,Cust
pstmt = null;
}
}
}
// Changed By Nasruddin [9/SEP/16] End
}
......
webitm-dis/ibase/webitm/ejb/dis/CustomerSerCredit.java
View file @ 6f44ea26
......@@ -563,7 +563,9 @@ public class CustomerSerCredit extends ValidatorEJB implements CustomerSerCredit
rs = null;
pstmt.close();
pstmt = null;
if(siteCode.trim().length() > 0)
//Changed By Nasruddin 01/10/16
//if(siteCode.trim().length() > 0)
if(siteCode != null && siteCode.trim().length() > 0)
{
valueXmlString.append("<cust_site_code>").append("<![CDATA[" + siteCode + "]]>").append("</cust_site_code>");
}
......@@ -571,7 +573,9 @@ public class CustomerSerCredit extends ValidatorEJB implements CustomerSerCredit
{
valueXmlString.append("<cust_site_code>").append("<![CDATA[" + "" + "]]>").append("</cust_site_code>");
}
if(siteCodePl.trim().length() > 0)
////Changed By Nasruddin 01/10/16 Start
//if(siteCodePl.trim().length() > 0)
if(siteCodePl != null && siteCodePl.trim().length() > 0)
{
valueXmlString.append("<site_code__pbus>").append("<![CDATA[" + siteCodePl + "]]>").append("</site_code__pbus>");
}
......
webitm-dis/ibase/webitm/ejb/dis/ItemSerChange.java
View file @ 6f44ea26
......@@ -278,6 +278,7 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj
Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null ;
String sysDate = "";
ConnDriver connDriver = new ConnDriver();
try
{
......@@ -287,35 +288,89 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj
//Changes and Commented By Bhushan on 09-06-2016 :END
conn.setAutoCommit(false);
connDriver = null;
SimpleDateFormat dbDateFormat = new SimpleDateFormat("dd/MM/yy");
//Changed By Nasruddin 04-10-16 Start
//SimpleDateFormat dbDateFormat = new SimpleDateFormat("dd/MM/yy");
Calendar currentDate = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
sysDate = sdf.format(currentDate.getTime());
//Changed By Nasruddin 04-10-16 End
valueXmlString = new StringBuffer("<?xml version = \"1.0\"?> <Root> <header> <editFlag>");
valueXmlString.append(editFlag).append("</editFlag> </header>");
valueXmlString.append("<Detail1>");
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
effDate = genericUtility.getColumnValue("eff_date", dom);
effPdate = dbDateFormat.parse(effDate);
valueXmlString.append("<eff_date>").append("<![CDATA[" + effPdate +"]]>").append("</eff_date>");
{ //Comment By Nasruddin 04-10-16
//effDate = genericUtility.getColumnValue("eff_date", dom);
//effPdate = dbDateFormat.parse(effDate);
System.out.println("sysDate ["+sysDate+"]");
valueXmlString.append("<eff_date>").append("<![CDATA[" + sysDate +"]]>").append("</eff_date>");
}
else if(currentColumn.trim().equalsIgnoreCase("item_code"))
{
itemCode =genericUtility.getColumnValue("item_code", dom);
sql2 = " select descr from item where item_code = ? " ;
pstmt = conn.prepareStatement(sql2);
//Comment By Nasruddin Start 4-10-16
//sql = " select descr from item where item_code = ? " ;
sql = " select item_ser from itemser_change where item_code = ? and valid_upto is null";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
descrItm = rs.getString("descr");
itemSer1 = rs.getString("item_ser");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = " select item_ser from itemser_change where item_code = ? and valid_upto is null";
if(itemSer1 == null || itemSer1.trim().length() == 0)
{
sql = " select item_ser from item where item_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
itemSer1 = rs.getString("item_ser");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
sql = " select descr from item where item_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
descr = rs.getString("descr");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = " select descr from itemSer where item_ser = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemSer1);
rs = pstmt.executeQuery();
if(rs.next())
{
descr1 = rs.getString("descr");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append("<item_descr>").append("<![CDATA[" + descr + "]]>").append("</item_descr>");
valueXmlString.append("<item_ser__old>").append("<![CDATA[" + itemSer1 + "]]>").append("</item_ser__old>");
valueXmlString.append("<descr>").append("<![CDATA[" + descr1 + "]]>").append("</descr>");
/*Comment By Nasruddin Start 04-10-16
* sql = " select item_ser from itemser_change where item_code = ? and valid_upto is null";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
......@@ -351,14 +406,9 @@ public String itemChanged(Document dom, Document dom1, Document dom2, String obj
rs = null;
pstmt.close();
pstmt = null;
}
valueXmlString.append("<item_descr>").append("<![CDATA[" + descrItm + "]]>").append("</item_descr>");
valueXmlString.append("<item_ser__old>").append("<![CDATA[" + itemSer1 + "]]>").append("</item_ser__old>");
valueXmlString.append("<descr>").append("<![CDATA[" + descr1 + "]]>").append("</descr>");
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}/*Comment By Nasruddin End 04-10-16
*/
}
else if(currentColumn.trim().equalsIgnoreCase("item_ser"))
{
......
webitm-dis/ibase/webitm/ejb/dis/ItemTypeIC.java
View file @ 6f44ea26
......@@ -116,7 +116,7 @@ public class ItemTypeIC extends ValidatorEJB implements ItemTypeICLocal, ItemTyp
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else if(itemType != null && itemType.trim().length() > 0)
else if(itemType != null && itemType.trim().length() > 0 && "A".equals(editFlag))
{
sql = "select count(*) from item_type where item_type = ?";
pstmt = conn.prepareStatement(sql);
......
webitm-dis/ibase/webitm/ejb/dis/SiteCustomer.java
View file @ 6f44ea26
......@@ -513,7 +513,7 @@ public class SiteCustomer extends ValidatorEJB implements SiteCustomerLocal,Site
String terrCode = "";
String terrDescr = "";
String channelPartner = "";
String nullVar= null;
String nullVar= "";
String sql = "";
StringBuffer valueXmlString = new StringBuffer();
Connection conn = null;
......@@ -593,10 +593,14 @@ public class SiteCustomer extends ValidatorEJB implements SiteCustomerLocal,Site
valueXmlString.append("<dis_link protect = \"0\">").append ("</dis_link>");
}
else
{
{ /* Changed By Nasruddin Start 03-10-16
valueXmlString.append("<site_code__ch>").append("<site_code_ch protect = \"1\">").append("<![CDATA[" + nullVar + "]]>").append("</site_code__ch>");
valueXmlString.append("<fin_link>").append("<fin_link protect = \"1\">").append("<![CDATA[" + nullVar + "]]>").append("</fin_link>");
valueXmlString.append("<dis_link>").append("<dis_link protect = \"1\">").append("<![CDATA[" + nullVar + "]]>").append("</dis_link>");
valueXmlString.append("<dis_link>").append("<dis_link protect = \"1\">").append("<![CDATA[" + nullVar + "]]>").append("</dis_link>");*/
valueXmlString.append("<site_code_ch protect = \"1\">").append("<![CDATA[" + nullVar + "]]>").append("</site_code__ch>");
valueXmlString.append("<fin_link protect = \"1\">").append("<![CDATA[" + nullVar + "]]>").append("</fin_link>");
valueXmlString.append("<dis_link protect = \"1\">").append("<![CDATA[" + nullVar + "]]>").append("</dis_link>");
//Changed By Nasruddin END 03-10-16
}
}
valueXmlString.append("</Detail1>");
......
webitm-dis/ibase/webitm/ejb/dis/SiteItemIC.java
View file @ 6f44ea26
......@@ -242,16 +242,13 @@ public class SiteItemIC extends ValidatorEJB implements SiteItemICLocal, SiteIte
else if(childNodeName.equalsIgnoreCase("item_ser"))
{
itemSer = checkNull(genericUtility.getColumnValue("item_ser", dom));
/*
* Comment By Nasruddin [20-SEP-16] START
if(itemSer == null || itemSer.trim().length() == 0)
{
errCode = "VMITMSERBK";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
Comment By Nasruddin [20-SEP-16] END*/
if(itemSer != null && itemSer.trim().length() > 0)
else
{
//errcode = nvo_dis.gbf_itemser(mval,transer)
sql = "select count(*) from itemser where item_ser = ?";
......
webitm-dis/ibase/webitm/ejb/dis/Supplier.java
View file @ 6f44ea26
......@@ -228,11 +228,11 @@ public class Supplier extends ValidatorEJB implements SupplierLocal,SupplierRemo
else if(childNodeName.equalsIgnoreCase("supp_code__pay"))
{
System.out.println(">>>>>>>>>>>supp_code__pay validation:");
payTo = genericUtility.getColumnValue("supp_code__pay", dom);
suppCode = genericUtility.getColumnValue("supp_code", dom);
payTo = checkNull(genericUtility.getColumnValue("supp_code__pay", dom));
suppCode = checkNull(genericUtility.getColumnValue("supp_code", dom));
if(payTo != null && payTo.trim().length() > 0)
{
if(!(suppCode).equalsIgnoreCase(payTo))
if(!suppCode.equalsIgnoreCase(payTo))
{
count = 0;
sql = "SELECT COUNT(1) FROM SUPPLIER WHERE SUPP_CODE = ?";
......
webitm-dis/ibase/webitm/ejb/dis/SupplierItem.java
View file @ 6f44ea26
......@@ -96,17 +96,28 @@ public class SupplierItem extends ValidatorEJB implements SupplierItemLocal,Supp
suppCode = genericUtility.getColumnValue("supp_code", dom);
siteCode = genericUtility.getColumnValue("site_code", dom);
errCode = fn_supplier(siteCode,suppCode,conn);
//errList.add(errCode);
//errFields.add(childNodeName.toLowerCase());
if( errCode != null && errCode.trim().length() > 0)
{
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
else if(childNodeName.equalsIgnoreCase("item_ser"))
{
itemSer = genericUtility.getColumnValue("item_ser", dom);
errCode = fn_itemser(itemSer,conn);
//Changed By Nasruddin 03-10-16
//errList.add(errCode);
//errFields.add(childNodeName.toLowerCase());
if( errCode != null && errCode.trim().length() >0)
{
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
//Changed By Nasruddin 22-SEP-16 START
else if(childNodeName.equalsIgnoreCase("lock_group"))
{
......@@ -135,15 +146,11 @@ public class SupplierItem extends ValidatorEJB implements SupplierItemLocal,Supp
errFields.add(childNodeName.toLowerCase());
}
}
}
//Changed By Nasruddin 22-SEP-16 END
}//end of for
int errListSize = errList.size();
int cnt = 0;
String errFldName = null;
......@@ -227,7 +234,9 @@ public class SupplierItem extends ValidatorEJB implements SupplierItemLocal,Supp
String valueXmlString = "";
try
{
System.out.println("xmlString"+xmlString);
dom = parseString(xmlString);
System.out.println("xmlString1"+xmlString1);
dom1 = parseString(xmlString1);
if(xmlString2.trim().length() > 0 )
{
......@@ -275,7 +284,9 @@ public class SupplierItem extends ValidatorEJB implements SupplierItemLocal,Supp
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
itemCode = genericUtility.getColumnValue("tran_id", dom);
//Comment By Nasruddin 03-10-16
//itemCode = genericUtility.getColumnValue("tran_id", dom);
itemCode = genericUtility.getColumnValue("item_code", dom);
valueXmlString.append("<item_code>").append("<![CDATA[" + itemCode +"]]>").append("</item_code>");
sql = " select item_ser,unit,pur_lead_time from item where item_code = ?";
pstmt = conn.prepareStatement(sql);
......@@ -358,12 +369,12 @@ public class SupplierItem extends ValidatorEJB implements SupplierItemLocal,Supp
ResultSet rs = null;
try
{
sql = "select var_value from disparm where prd_code = '999999' and var_name = 'SITE_SPECIFIC_SUPP';";
sql = "select var_value from disparm where prd_code = '999999' and var_name = 'SITE_SPECIFIC_SUPP'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
varValue = rs.getString(1);
varValue = rs.getString(1) == null ?"":rs.getString(1);
}
// Changed by Sneha on 12-09-2016, for Closing the Open Cursor [Start]
if ( pstmt != null )
......@@ -376,8 +387,8 @@ public class SupplierItem extends ValidatorEJB implements SupplierItemLocal,Supp
rs.close();
rs = null;
}
System.out.println("varValue ["+varValue+"]");
// Changed by Sneha on 12-09-2016, for Closing the Open Cursor [End]
if("Y".equalsIgnoreCase(varValue))
{
sql = "select count(*) from site_supplier where site_code = ? and supp_code = ?";
......
webitm-dis/ibase/webitm/ejb/dis/UnitConvIC.java
View file @ 6f44ea26
......@@ -184,7 +184,7 @@ public class UnitConvIC extends ValidatorEJB implements UnitConvICLocal,UnitConv
{
cnt = rs.getInt(1);
}
if (cnt == 0)
if (cnt > 0)
{
errCode = "VMDUPL1";
errList.add(errCode);
......
webitm-dis/ibase/webitm/ejb/dis/UnitOfMeasureIC.java
View file @ 6f44ea26
......@@ -128,9 +128,9 @@ public class UnitOfMeasureIC extends ValidatorEJB implements UnitOfMeasureICRemo
if(childNodeName.equalsIgnoreCase("descr"))
{
descr = genericUtility.getColumnValue("descr", dom);
//descr = descr == null ? "" : descr.trim();
descr = descr == null ? "" : descr.trim();
System.out.println("Description :::" + descr);
if(descr.trim().isEmpty()){
if(descr.isEmpty()){
errString = itmdbAccessEJB.getErrorString("descr", "VMDESCR", userId);
return errString;
}
......
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