Skip to content

B
business-java
Commit bd46ee13 authored by arawankar's avatar arawankar
Browse files
Options

Update asset_sales related changes 

1.Below changes made in AssetSales.java
- Added error code wherever empty error code added.

2.Below changes made in AssetSalesPostSaveLocal.java
-Extend component with validatorLocal

3.Added messages.sql file
-Added sql statements for new error codes

4.Added ASSET_SALES.SQL
- Added alter table statements for tax_chap,tax_class,tax_env,amount.tot_amount columns
-Added obj_itemchange entry for itm_default column in form_no 2

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@184360 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 646d954e
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 26 deletions
webitm-fin/ibase/webitm/ejb/fin/AssetSales.java
View file @ bd46ee13
......@@ -94,9 +94,9 @@ public class AssetSales extends ValidatorEJB implements AssetSalesLocal,AssetSal
try
{
//Changes and Commented By Bhushan on 06-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
connDriver = null;
userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
System.out.println("user ID form XtraParam : "+userId);
......@@ -124,7 +124,10 @@ conn = getConnection();
tranDateTs = Timestamp.valueOf(genericUtility.getValidDateString(tranDateStr,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())+ " 00:00:00.0");
if (tranDateStr == null || tranDateStr.trim().length() == 0 )
{
errCode = "";
//Modified by Anjali R.[02/05/2018][Added error code for blank tran date][Start]
//errCode = "";
errCode = "VTTRANDATE";
//Modified by Anjali R.[02/05/2018][Added error code for blank tran date][End]
errString = getErrorString("tran_date",errCode,userId);
break;
}
......@@ -225,7 +228,8 @@ conn = getConnection();
errCode = "VTCUST1";
errString = getErrorString("cust_code",errCode,userId);
break;
}else
}
else
{
sql = "select count(1) from customer where cust_code = ?";
......@@ -490,7 +494,8 @@ conn = getConnection();
if(saleAmts == null || saleAmts.trim().length() == 0)
{
saleAmt = 0;
}else
}
else
{
saleAmt = Double.parseDouble(genericUtility.getColumnValue("sale_amt",dom));
}
......@@ -536,7 +541,10 @@ conn = getConnection();
if (acctCdAr == null || acctCdAr.trim().length() == 0 )
{
errCode = "";
//Modified by Anjali R.[02/05/2018][Added error code for blank aact code ar][Start]
//errCode = "";
errCode = "VTACCTARCD";
//Modified by Anjali R.[02/05/2018][Added error code for blank aact code ar][End]
errString = getErrorString("acct_code__ar",errCode,userId);
break;
}
......@@ -576,7 +584,10 @@ conn = getConnection();
if (cctrCdAr == null || cctrCdAr.trim().length() == 0 )
{
errCode = "";
//Modified by Anjali R.[02/05/2018][Added error code for blank cctr code ar][Start]
//errCode = "";
errCode = "VTCCTRARCD";
//Modified by Anjali R.[02/05/2018][Added error code for blank cctr code ar][Start]
errString = getErrorString("cctr_code__ar",errCode,userId);
break;
}
......@@ -709,7 +720,10 @@ conn = getConnection();
if (acctCdPl == null || acctCdPl.trim().length() == 0 )
{
errCode = " ";
//Modified by Anjali R.[02/05/2018][Added error code for blank acct code pl][Start]
//errCode = " ";
errCode = "VTACCTPLCD";
//Modified by Anjali R.[02/05/2018][Added error code for blank acct code pl][End]
errString = getErrorString("acct_code__pl",errCode,userId);
break;
}
......@@ -738,7 +752,10 @@ conn = getConnection();
if (acctCdLo == null || acctCdLo.trim().length() == 0 )
{
errCode = "";
//Modified by Anjali R.[02/05/2018][Added error code for blank acct code loss][Start]
//errCode = "";
errCode = "VTACCTLSCD";
//Modified by Anjali R.[02/05/2018][Added error code for blank acct code loss][End]
errString = getErrorString("acct_code__loss",errCode,userId);
break;
}
......@@ -784,7 +801,10 @@ conn = getConnection();
if (cctrCdPl == null || cctrCdPl.trim().length() == 0 )
{
errCode = " ";
//Modified by Anjali R.[02/05/2018][Added error code for blank cctr code pl][Start]
//errCode = " ";
errCode = "VTCCTRPLCD";
//Modified by Anjali R.[02/05/2018][Added error code for blank cctr code pl][End]
errString = getErrorString("cctr_code__pl",errCode,userId);
break;
}
......@@ -813,7 +833,10 @@ conn = getConnection();
if (cctrCdLo == null || cctrCdLo.trim().length() == 0 )
{
errCode = " ";
//Modified by Anjali R.[02/05/2018][Added error code for blank cctr code loss][Start]
//errCode = " ";
errCode = "VTCCTRLSCD";
//Modified by Anjali R.[02/05/2018][Added error code for blank cctr code loss][End]
errString = getErrorString("cctr_code__loss",errCode,userId);
break;
}
......
webitm-fin/ibase/webitm/ejb/fin/AssetSalesPostSaveLocal.java
View file @ bd46ee13
package ibase.webitm.ejb.fin;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import java.sql.Connection;
import javax.ejb.Local;
@Local
public interface AssetSalesPostSaveLocal
//Modified by Anjali R. on[02/05/2018][To extend local file with validatorLocal][Start]
//public interface AssetSalesPostSaveLocal
public interface AssetSalesPostSaveLocal extends ValidatorLocal
//Modified by Anjali R. on[02/05/2018][To extend local file with validatorLocal][End]
{
public String postSave(String xmlString,String tranid,String editFlag,String xtraParams,Connection conn) throws RemoteException,ITMException;
......
webitm-fin/module-resource/sql/ASSET_SALES.sql 0 → 100644
View file @ bd46ee13
SET DEFINE OFF;
alter table ASSET_SALES_DET add TAX_CHAP CHAR(10);
alter table ASSET_SALES_DET add TAX_ENV CHAR(10);
alter table ASSET_SALES_DET add TAX_CLASS CHAR(10);
alter table ASSET_SALES_DET add AMOUNT number(14,3);
alter table ASSET_SALES_DET add TOT_AMT number(14,3);
Insert into OBJ_ITEMCHANGE (OBJ_NAME,FORM_NO,FIELD_NAME,MANDATORY) values ('asset_sales','2','itm_default',null);
commit;
webitm-fin/module-resource/sql/MESSAGES.SQL 0 → 100644
View file @ bd46ee13
SET DEFINE OFF;
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VTACCTARCD','Invalid Account Code!','Please enter Account Code.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VTCCTRARCD','Invalid Cost center Code!','Please enter Cost center Code.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VTACCTPLCD','Invalid Account Code PL!','Please enter Account Code PL.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VTACCTLSCD','Invalid Account Code Loss!','Please enter Account Code Loss.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VTCCTRPLCD','Invalid Cost Center Code PL!','Please enter Cost Center Code PL.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values ('VTCCTRLSCD','Invalid Cost Center Code Loss!','Please enter Cost Center Code Loss.','E','Y',null,null,null,sysdate,'BASE','BASE',null,null);
COMMIT;
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