ibase.webitm.Utility.GenericUtility repalced with ibase.utility.E12GenericUtility

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96858 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/DistCommon.java

@@ -15,14 +15,14 @@ import java.text.NumberFormat;
 import java.text.DecimalFormat;
 import ibase.webitm.ejb.*;
 import ibase.webitm.utility.*;
-import ibase.webitm.utility.GenericUtility;
+import ibase.utility.E12GenericUtility;
 import ibase.webitm.ejb.fin.FinCommon;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;//import java.util.Date;
 import ibase.webitm.ejb.sys.UtilMethods;
 public class DistCommon
 {
-	GenericUtility genericUtility = GenericUtility.getInstance();
+	E12GenericUtility genericUtility = new E12GenericUtility();
 	public String setPlistTaxClassEnv(String siteCodeFrom,String siteCodeTo,String itemCode,String tranType,String itemSer,String caseString,Connection conn)throws ITMException
 	{
 		System.out.println("--------------[setPlistTaxClassEnv]---------------------------------");
@@ -7547,7 +7547,7 @@ public class DistCommon
 			System.out.println("taxChap["+taxChap);
 			System.out.println("taxClass["+taxClass);
 			System.out.println("siteCodeShip["+siteCodeShip);
-			GenericUtility genericUtility = GenericUtility.getInstance();
+			E12GenericUtility genericUtility = new E12GenericUtility();
 			sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			Timestamp currDateTs = new Timestamp(System.currentTimeMillis());
 			sql="select state_code  from station where stan_code = ? " ;
@@ -8006,6 +8006,14 @@ public class DistCommon
 		java.sql.Timestamp expDate = null;
 		int lastDay = 0, iShelfLife = 0;
 		iShelfLife = (int)shelfLife;
+		if (iShelfLife < 0)
+		{
+			iShelfLife = iShelfLife + 1;
+		}
+		else
+		{
+			iShelfLife = iShelfLife - 1;
+		}
 		expDate = utilMethods.AddMonths(date, iShelfLife);
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(expDate);