F17ABAS001 source code commit

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

webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizPos.java

@@ -1506,7 +1506,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 									if("IP".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
 									{
 										retStatusCallStatus = "0";
-										continue;
+										retStatusResponseJsonStr = "IP";
 									}
 									else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
 									{
@@ -1603,6 +1603,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					        {
 					        	break;
 					        }
+					        else
+					        {
+					        	continue;
+					        }
 						}
 					}
 					else
@@ -2628,8 +2632,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					impg = new IMPG();
 					impg.isSezImport = true;//TODO need to confirm exact value
 					impg.sezGSTIN = checkNullandTrim(rs.getString("TAX_REG_NO"));
-					impg.billOfEntryNo = checkNullandTrim(rs.getString("LR_NO"));
-					impg.billOfEntryDate = rs.getDate("LR_DATE");
+					impg.billOfEntryNo = checkNullandTrim(rs.getString("DOC_NO"));
+					impg.billOfEntryDate = rs.getDate("DOC_DATE");
 					impg.amount = rs.getDouble("AMOUNT");
 					impg.portCode = checkNullandTrim(rs.getString("ORDER_NO"));
 					impg.items = invLineItems;
@@ -3094,7 +3098,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 									if("IP".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
 									{
 										retStatusCallStatus = "0";
-										continue;
+										retStatusResponseJsonStr = "IP";
 									}
 									else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
 									{
@@ -3191,6 +3195,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					        {
 					        	break;
 					        }
+					        else
+					        {
+					        	continue;
+					        }
 						}
 					}
 					else
@@ -5039,7 +5047,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 			
 			int[] updateCount = pstmtUpd.executeBatch();
 			
-			System.out.print("GST_DATA_HSR Update count");
+			System.out.print("GST_DATA_HDR Update count");
 			
 			for(int eachRowCnt : updateCount)
 			{