W15GSUN002 changed by wasim to update timestamp check for exp_date,mfg_date,tran_date

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

webitm-wms/ibase/webitm/utility/wms/CommonWmsUtil.java

@@ -261,6 +261,7 @@ public  class CommonWmsUtil {
     	Boolean isError = false;
     	
 		Timestamp tranDateAct = null,expDate = null,mfgDate = null;
+		String tranDate = "",expDt = "",mfgDt = "";
 		
     	String itemCode = "",lineNo = "",descr = "",unit = "",itemType = "",familyGrp = "",refSer = "",lotNo = "",refId = "",lotSl = "",quantity = "",
 				palletNo = "",palletStatus = "",lockStat = "",qcType = "",stroPref = "",palletRej = "",palletRejDesc = "",confirmed = "",siteCode = "",
@@ -281,13 +282,6 @@ public  class CommonWmsUtil {
 						+ "?,?,?,?,?,?,"
 						+ "?,?,?,?,?,?,?)";
 			 
-			 /*interfaceSql = "INSERT INTO INTERFACE2 (IN_OUT,ERR_COD,MSG_STAT,TRANS_DT_ACK,TRAN_ID,"
-						+ "ITEM_CODE,DESCR,UNIT,ITEM_TYPE,FAMILY_GRP,REF_SER,"
-						+ "LOT_NO,REF_ID,LOT_SL,QUANINTY) "
-						+ "VALUES (?,?,?,?,?,?,"
-						+ "?,?,?,?,?,?,"
-						+ "?,?,?)";*/
-			 
 			 Iterator itr=interfaceArrList.iterator();
 			 
 			 System.out.println("Array List size="+interfaceArrList.size());
@@ -301,7 +295,15 @@ public  class CommonWmsUtil {
 				  inOut = (String) detail.get("IN_OUT");
 				  errCod = (String) detail.get("ERR_COD");
 				  msgStat = (String) detail.get("MSG_STAT");
-				  tranDateAct = (Timestamp) detail.get("TRANS_DT_ACK");
+				  
+				  tranDate =  (String) detail.get("TRANS_DT_ACK");
+				  System.out.println("Tran Date is="+tranDate);
+				  if(tranDate != null && tranDate.trim().length() > 0 && !tranDate.equals("null"))
+				  {
+					  //tranDateAct = (Timestamp) detail.get("TRANS_DT_ACK");
+					  tranDateAct = Timestamp.valueOf((String) detail.get("TRANS_DT_ACK"));
+				  }
+				  
 				  transactionId = (String) detail.get("TRAN_ID");
 				  itemCode = (String) detail.get("ITEM_CODE");
 				  descr = (String) detail.get("DESCR");
@@ -314,8 +316,23 @@ public  class CommonWmsUtil {
 				  lotSl = (String) detail.get("LOT_SL");
 				  quantity = (String) detail.get("QUANTITY");
 				  
-				  expDate = (Timestamp) detail.get("EXP_DATE");
-				  mfgDate = (Timestamp) detail.get("MFG_DATE");
+				  expDt =  (String) detail.get("EXP_DATE");
+				  System.out.println("Exp date"+expDt);
+				  if(expDt != null && expDt.trim().length() > 0 && !expDt.equals("null"))
+				  {
+					  //expDate = (Timestamp) detail.get("EXP_DATE");
+					    expDate = Timestamp.valueOf((String) detail.get("EXP_DATE"));
+				  }
+				  
+				  mfgDt =  (String) detail.get("MFG_DATE");
+				  System.out.println("Mfg date"+mfgDt);
+				  if(mfgDt != null && mfgDt.trim().length() > 0 && !mfgDt.equals("null"))
+				  {
+					  //mfgDate = (Timestamp) detail.get("MFG_DATE");
+					    mfgDate = Timestamp.valueOf((String) detail.get("MFG_DATE"));
+				  }
+				  //expDate = (Timestamp) detail.get("EXP_DATE");
+				  //mfgDate = (Timestamp) detail.get("MFG_DATE");
 				  palletNo = (String) detail.get("PALLET_NO");
 				  palletNo = (String) detail.get("PALLET_STATUS");
 				  lockStat = (String) detail.get("LOCK_STAT");