Skip to content

B
business-java
Commit 7c6f7b51 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@103581 ce508802-f39f-4f6c-b175-0d175dae99d5
parent edb8c52a
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 59 deletions
webitm-dis/ibase/webitm/ejb/dis/CreditTermIC.java
View file @ 7c6f7b51
......@@ -120,7 +120,7 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
// changed By Nasruddin 14/SEP/16 START
if(crTerm == null || crTerm.trim().length() == 0)
{
errCode = "VECRT2";
errCode = "VTCRTERM";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
......@@ -137,7 +137,7 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
}
if(count > 0)
{
errCode = "VTCRTRMDB";
errCode = "VMPMKY";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
......@@ -608,7 +608,7 @@ public class CreditTermIC extends ValidatorEJB implements CreditTermICLocal, Cre
valueXmlString.append("<cr_term>").append("<![CDATA[" + crTerm + "]]>").append("</cr_term>");
//lineNo = genericUtility.getColumnValue("line_no", dom);
lineNo = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"lineNo"));
valueXmlString.append("<line_no>").append("<![CDATA[" + crTerm + "]]>").append("</line_no>");
/*valueXmlString.append("<line_no>").append("<![CDATA[" + lineNo + "]]>").append("</line_no>");*/
}
else if(currentColumn.trim().equalsIgnoreCase("tax_code"))
{
......
webitm-dis/ibase/webitm/ejb/dis/DeliveryTerm.java
View file @ 7c6f7b51
......@@ -6,6 +6,8 @@
package ibase.webitm.ejb.dis;
import javax.ejb.Stateless;
import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ValidatorEJB;
import java.rmi.RemoteException;
import java.util.ArrayList;
......@@ -17,7 +19,8 @@ import ibase.system.config.*;
@Stateless
public class DeliveryTerm extends ValidatorEJB implements DeliveryTermLocal,DeliveryTermRemote
{
GenericUtility genericUtility = GenericUtility.getInstance();
//GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility();
public String wfValData(String xmlString, String xmlString1,String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
{
Document dom = null;
......
webitm-dis/ibase/webitm/ejb/dis/ItemSerCrPolicy.java
View file @ 7c6f7b51
......@@ -28,7 +28,7 @@ import javax.ejb.Stateless;
@Stateless
public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLocal, ItemSerCrPolicyRemote {
E12GenericUtility genericUtility= new E12GenericUtility();
public ItemSerCrPolicy() {
System.out.println("^^^^^^^ inside ItemSerCrPolicy ^^^^^^^");
}
......@@ -44,6 +44,7 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
Node parentNode = null;
Node childNode = null;
String childNodeName = "";
try
{
System.out.println("xmlString ..> " + xmlString);
......@@ -105,9 +106,8 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
ResultSet rs = null;
String sql = "";
String userId = "";
SimpleDateFormat simpleDateFormat;
Date dateOfBirth;
E12GenericUtility genericUtility= new E12GenericUtility();
int ctr = 0, currentFormNo = 0, childNodeListLength = 0, cnt = 0;
String itemSeries = "", crPolicy = "", policyType = "", descr = "";
String policySql = "", policyResult = "", policyInput = "", policyCond = "", title = "";
......@@ -122,7 +122,7 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
//genericUtility = GenericUtility.getInstance();
simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
// simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
if (objContext != null && objContext.trim().length() > 0)
{
......@@ -169,7 +169,12 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
rs = null;
pStmt.close();
pStmt = null;
if ((cnt > 1))
{
errCode = "VMUCP";
errString = getErrorString("cr_policy", errCode, userId);
break;
}
}
/*
policyType = genericUtility.getColumnValue("policy_type", dom);
......@@ -404,7 +409,6 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
errCode = null;
sql = null;
userId = null;
simpleDateFormat = null;
dateOfBirth = null;
itemSeries = null;
crPolicy = null;
......@@ -446,7 +450,8 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
ResultSet rs = null;
String sql = "";
int currentFormNo = 0, crpolicy = 0;
SimpleDateFormat sdf;
SimpleDateFormat sdf ;
E12GenericUtility genericUtility= new E12GenericUtility();
String crPolicy = "", policySql = "", policyInput = "", policyResult = "", policyCondition = "", itemSeries = "";
try {
// genericUtility = GenericUtility.getInstance();
......@@ -457,20 +462,27 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
//Changes and Commented By Bhushan on 09-06-2016 :END
conn.setAutoCommit(false);
conndriver = null;
System.out.println("-------------- ITEMcHANGE----------------------");
System.out.println("hdrDataDom------->>["+genericUtility.serializeDom(dom)+"]");
System.out.println("currFormDataDom------>>["+genericUtility.serializeDom(dom1)+"]");
System.out.println("allFormDataDom------>>["+genericUtility.serializeDom(dom2)+"]");
// genericUtility = GenericUtility.getInstance();
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//Comment By Nasruddin 05-10-16 Start
// sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
currentColumn = currentColumn == null ? "" : currentColumn.trim();
if (objContext != null && objContext.trim().length() > 0)
{
currentFormNo = Integer.parseInt(objContext);
}
valueXmlString = new StringBuffer("<?xml version=\"1.0\"?><Root><header><editFlag>");
valueXmlString.append(editFlag).append("</editFlag></header>");
switch (currentFormNo) {
case 1:
valueXmlString.append("<Detail1>");
if (currentColumn.trim().equalsIgnoreCase("itm_default")) {
if (currentColumn.trim().equalsIgnoreCase("itm_default"))
{
itemSeries = getValueFromXTRA_PARAMS(xtraParams, "item_ser");
itemSeries = itemSeries == null ? "" : itemSeries.trim();
......@@ -478,53 +490,62 @@ public class ItemSerCrPolicy extends ValidatorEJB implements ItemSerCrPolicyLoca
valueXmlString.append("<itemSeries protect=\"1\">").append(itemSeries).append("</itemSeries>\r\n");
valueXmlString.append("<cr_policy protect=\"0\">").append(crPolicy).append("</cr_policy>\r\n");
} else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit")) {
crPolicy = genericUtility.getColumnValue("cr_policy", dom);
policySql = genericUtility.getColumnValue("policy_sql", dom);
policyInput = genericUtility.getColumnValue("policy_input", dom);
policyResult = genericUtility.getColumnValue("policy_result", dom);
policyCondition = genericUtility.getColumnValue("policy_condition", dom);
crPolicy = crPolicy == null ? "" : crPolicy.trim();
policySql = policySql == null ? "" : policySql.trim();
policyInput = policyInput == null ? "" : policyInput.trim();
policyResult = policyResult == null ? "" : policyResult.trim();
policyCondition = policyCondition == null ? "" : policyCondition.trim();
}
else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
{
crPolicy = genericUtility.getColumnValue("cr_policy", dom);
policySql = genericUtility.getColumnValue("policy_sql", dom);
policyInput = genericUtility.getColumnValue("policy_input", dom);
policyResult = genericUtility.getColumnValue("policy_result", dom);
policyCondition = genericUtility.getColumnValue("policy_condition", dom);
crPolicy = crPolicy == null ? "" : crPolicy.trim();
policySql = policySql == null ? "" : policySql.trim();
policyInput = policyInput == null ? "" : policyInput.trim();
policyResult = policyResult == null ? "" : policyResult.trim();
policyCondition = policyCondition == null ? "" : policyCondition.trim();
if(crPolicy.startsWith("P") && crPolicy.length() >= 3)
{
//System.out.println("P = "+crPolicy.substring(1,3));
System.out.println("P = "+crPolicy.substring(1,3));
crpolicy = Integer.parseInt(crPolicy.substring(1,3));
}
if (crpolicy >= 90 && crpolicy <= 99) {
if (crpolicy >= 90 && crpolicy <= 99)
{
valueXmlString.append("<policy_sql protect=\"0\">").append(policySql).append("</policy_sql>\r\n");
valueXmlString.append("<policy_input protect=\"0\">").append(policyInput).append("</policy_input>\r\n");
valueXmlString.append("<policy_result protect=\"0\">").append(policyResult).append("</policy_result>\r\n");
valueXmlString.append("<policy_condition protect=\"0\">").append(policyCondition).append("</policy_condition>\r\n");
} else {
}
else
{
valueXmlString.append("<policy_sql protect=\"1\">").append("</policy_sql>\r\n");
valueXmlString.append("<policy_input protect=\"1\">").append("</policy_input>\r\n");
valueXmlString.append("<policy_result protect=\"1\">").append("</policy_result>\r\n");
valueXmlString.append("<policy_condition protect=\"1\">").append("</policy_condition>\r\n");
}
System.out.println("crPolicy ["+ crPolicy + "]");
valueXmlString.append("<cr_policy protect=\"1\">").append(crPolicy).append("</cr_policy>\r\n");
} else if (currentColumn.trim().equalsIgnoreCase("cr_policy")) {
}
else if (currentColumn.trim().equalsIgnoreCase("cr_policy"))
{
System.out.println("==== iNSIDE cr_policy ");
crPolicy = genericUtility.getColumnValue("cr_policy", dom);
crPolicy = crPolicy == null ? "" : crPolicy.trim();
System.out.println("==== iNSIDE cr_policy ["+crPolicy+"]");
if(crPolicy.startsWith("P") && crPolicy.length() >= 3)
{
crpolicy = Integer.parseInt(crPolicy.substring(1,3));
}
if (crpolicy >= 90 && crpolicy <= 99) {
if (crpolicy >= 90 && crpolicy <= 99)
{
valueXmlString.append("<policy_sql protect=\"0\">").append("</policy_sql>\r\n");
valueXmlString.append("<policy_input protect=\"0\">").append("</policy_input>\r\n");
valueXmlString.append("<policy_result protect=\"0\">").append("</policy_result>\r\n");
valueXmlString.append("<policy_condition protect=\"0\">").append("</policy_condition>\r\n");
} else {
}
else
{
valueXmlString.append("<policy_sql protect=\"1\">").append("</policy_sql>\r\n");
valueXmlString.append("<policy_input protect=\"1\">").append("</policy_input>\r\n");
valueXmlString.append("<policy_result protect=\"1\">").append("</policy_result>\r\n");
......
webitm-dis/ibase/webitm/ejb/dis/LocationMaster.java
View file @ 7c6f7b51
......@@ -217,10 +217,10 @@ public class LocationMaster extends ValidatorEJB implements
}
}
}
/* Comment By Nasruddin [20-SEP-16] START
else if ("inv_stat".equalsIgnoreCase(childNodeName))
{
if (!(childNode.getFirstChild() == null)) {
sql = "select count(*) as COUNT from invstat where inv_stat = ?";
......@@ -242,9 +242,8 @@ public class LocationMaster extends ValidatorEJB implements
break;
}
callPstRs(pstmt, rs);
}
}
/* Comment By Nasruddin [20-SEP-16] END*/
else if ("site_code__own".equalsIgnoreCase(childNodeName))
{
// Changed by Nasruddin [20-SEP-16]
......
webitm-dis/ibase/webitm/ejb/dis/PriceListTranIC.java
View file @ 7c6f7b51
......@@ -190,27 +190,37 @@ public class PriceListTranIC extends ValidatorEJB implements
if (childNodeName.equalsIgnoreCase("ref_no"))
{
System.out.println(":::childNodeName" + childNodeName);
refNo = genericUtility.getColumnValue("ref_no", dom);
refNo = refNo == null ? "" : refNo.trim();
refNo = chkNull(genericUtility.getColumnValue("ref_no", dom));
if(refNo.length() == 0)
{
errString = getErrorString("ref_no", "VTCIRCUNL", userId);
return errString;
}
/*refNo = refNo == null ? "" : refNo.trim();
System.out.println(":::ref No:: " + refNo);
if (refNo.isEmpty()) {
errString = getErrorString("ref_no", "VTCIRCUNL", userId);
return errString;
}
}*/
}
if (childNodeName.equalsIgnoreCase("ref_no_old")) {
System.out.println(":::childNodeName" + childNodeName);
refOld = genericUtility.getColumnValue("ref_no_old",
dom);
refOld = refOld == null ? "" : refOld.trim();
refOld = chkNull(genericUtility.getColumnValue("ref_no_old",dom));
if(refOld.length() == 0)
{
errString = getErrorString("ref_no_old", "VTCIRCUNL", userId);
return errString;
}
/*refOld = refOld == null ? "" : refOld.trim();
System.out.println(":::ref No old:: " + refOld);
if (refOld.isEmpty()) {
errString = getErrorString("ref_no_old", "VTCIRCOUNL", userId);
return errString;
}
}*/
}
}
break;
......@@ -405,6 +415,18 @@ public class PriceListTranIC extends ValidatorEJB implements
return errString;
}
private String chkNull(String columnValue) {
if( columnValue == null)
{
columnValue = "";
}
else
{
}
return columnValue.trim();
}
private void close(PreparedStatement pstmt, ResultSet rs) {
try {
if (pstmt != null) {
......
webitm-dis/ibase/webitm/ejb/dis/SalePersonIC.java
View file @ 7c6f7b51
......@@ -668,7 +668,7 @@ public class SalePersonIC extends ValidatorEJB implements SalePersonICRemote,Sal
}
else
{ Comment BY Nasruddin 22-SEP-16 END*/
if (contactCode != null || contactCode.trim().length() > 0)
if (contactCode != null && contactCode.trim().length() > 0)
{
sql=" SELECT COUNT(1) AS COUNTER FROM CONTACT WHERE CONTACT_CODE = '" + contactCode.trim() + "'";
pstmt = conn.prepareStatement(sql);
......@@ -1176,10 +1176,10 @@ public class SalePersonIC extends ValidatorEJB implements SalePersonICRemote,Sal
{
errCode = finCommon.isAcctCode(siteCode, acctCodeAp, "", conn);
}
else
/*else
{
errCode = "VMACCTCD1";
}
}*/
if(errCode != null && errCode.trim().length() > 0)
{
......@@ -1200,10 +1200,10 @@ public class SalePersonIC extends ValidatorEJB implements SalePersonICRemote,Sal
{
errCode = finCommon.isAcctCode(siteCode, acctCodeApAdv, "", conn);
}
else
/* else
{
errCode = "VMACCTCD1";
}
}*/
if(errCode != null && errCode.trim().length() > 0)
{
......@@ -1221,10 +1221,10 @@ public class SalePersonIC extends ValidatorEJB implements SalePersonICRemote,Sal
{
errCode = finCommon.isCctrCode(acctCodeAp, cctrCodeAp, "", conn);
}
else
/*else
{
errCode = "VMCCTRCD1";
}
}*/
if(errCode != null && errCode.trim().length() > 0)
{
System.out.println("errCode :"+errCode);
......@@ -1240,10 +1240,10 @@ public class SalePersonIC extends ValidatorEJB implements SalePersonICRemote,Sal
{
errCode = finCommon.isCctrCode(acctCodeApAdv, cctrCodeApAdv, "", conn);
}
else
/*else
{
errCode = "VMCCTRCD1";
}
}*/
if(errCode != null && errCode.trim().length() > 0)
{
System.out.println("errCode :"+errCode);
......
webitm-dis/ibase/webitm/ejb/dis/TransporterIC.java
View file @ 7c6f7b51
......@@ -314,8 +314,6 @@ public class TransporterIC extends ValidatorEJB implements TransporterICLocal, T
}
}
else if(childNodeName.equalsIgnoreCase("site_code__pay"))
{
sitecodepay = genericUtility.getColumnValue("site_code__pay",dom);
......
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