F17ABAS001 source code commit

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

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

@@ -978,22 +978,67 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 				//tran_type : 10 = Exports and tran_type : 11 = Exports amendments
 				if("10".equalsIgnoreCase(tranType) || "11".equalsIgnoreCase(tranType))
 				{
-					/*invoices = new ArrayList<Invoice>();
+					invoices = new ArrayList<Invoice>();
 					invoice = new Invoice();
 					invLineItems = new ArrayList<InvLineItem>();
 					
 					if("10".equalsIgnoreCase(tranType))
 					{
+						
+						lineSql = "SELECT * FROM GST_DATA_DET WHERE TRAN_ID = ? ORDER BY LINE_NO ";
+						linePstmt = conn.prepareStatement(lineSql);
+						linePstmt.setString(1, tranId);
+						lineRs = linePstmt.executeQuery();
+						
+						while(lineRs.next())
+						{
+							invLineItem = new InvLineItem();
+							invLineItem.ty = lineRs.getString("LINE_TYPE");
+							invLineItem.hsn_sc = lineRs.getString("GS_CODE");
+							invLineItem.taxval = lineRs.getDouble("TAXABLE_AMT");
+							invLineItem.irt = lineRs.getDouble("IGST_PERC");
+							invLineItem.iamt = lineRs.getDouble("IGST_AMT");
+							invLineItem.crt = lineRs.getDouble("CGST_PERC");
+							invLineItem.camt = lineRs.getDouble("CGST_AMT");
+							invLineItem.srt = lineRs.getDouble("SGST_PERC");
+							invLineItem.samt = lineRs.getDouble("SGST_AMT");
+							invLineItem.csrt = lineRs.getDouble("CESS_PERC");
+							invLineItem.csamt = lineRs.getDouble("CESS_AMT");
+							
+							invLineItems.add(invLineItem);
+						}
+						if(linePstmt != null)
+						{
+							linePstmt.close();
+							linePstmt = null;
+						}
+						if(lineRs != null)
+						{
+							lineRs.close();
+							lineRs = null;
+						}
+						
+						invoice.inum = rs.getString("DOC_NO");
+						invoice.idt = rs.getDate("DOC_DATE");
+						invoice.val = rs.getDouble("AMOUNT");
+						invoice.shippingPortCode = "SP001";//TODO Need to change
+						invoice.shippingBillNum = checkNullandTrim(rs.getString("LR_NO"));
+						invoice.shippingBillDt = rs.getDate("LR_DATE");
+						invoice.prs = "Y".equalsIgnoreCase(rs.getString("PROV_ASSMNT"));
+						invoice.od_num = rs.getString("ORDER_NO");
+						invoice.od_dt = rs.getDate("ORDER_DATE");
+						invoice.items = invLineItems;
+						
+						invoices.add(invoice);
+						
 						exp = new EXP();
 						exp.isReverseCharge = false;
 						
 						exp.exportType = checkNullandTrim(rs.getString("DOC_TYPE"));
-						
-						
 						exp.invoices = invoices;
 						
 						expInvoiceList.add(exp);
-					}*/
+					}
 				}
 				//tran_type : 12 = Advance Tax and tran_type : 13 = Adv. Tax amendments
 				if("12".equalsIgnoreCase(tranType) || "13".equalsIgnoreCase(tranType))
@@ -1186,6 +1231,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 			{
 				gstr1.ata = ataList;
 			}
+			if(expInvoiceList.size() > 0)
+			{
+				gstr1.exp = expInvoiceList;
+			}
 			
 			ObjectMapper objectMapper = new ObjectMapper();
 			
@@ -1613,7 +1662,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					 errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
 					 retString = getError(errMsg, "GSTAPIERR", conn);
 				 }
-
 			 }
 			 else
 			 {
@@ -1638,14 +1686,15 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		JSONObject b2bInvJsonObj = new JSONObject();
 		JSONArray b2bInvLineItmsArry = new JSONArray();
 		JSONObject b2bInvLineItemObj = new JSONObject();
-		String tranId, cptyGSTIN, iNum, iDate, reversCharge, docCheckSum, stateCode; 
+		String tranId, cptyGSTIN, iNum, iDate, reversCharge, docCheckSum, stateCode="", gstStateCode; 
 		String lineType, hsnSC;
 		
 		int lineNo;
 		double amount, lineAmt, irt, iamt, crt, camt, srt, samt, csrt, csamt; 
 	 	
-		String hdrSql, detSql;
-		PreparedStatement hdrPstmt, detPstmt;
+		String hdrSql, detSql, dataSql;
+		PreparedStatement hdrPstmt, detPstmt, dataPstmt;
+		ResultSet dataRs;
 		
 		try
 		{
@@ -1667,7 +1716,27 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					amount = b2bInvJsonObj.getDouble("val");
 					docCheckSum = b2bInvJsonObj.getString("chksum");
 					reversCharge = b2bInvJsonObj.getString("rchrg");
-					stateCode = b2bInvJsonObj.getString("pos");
+					gstStateCode = b2bInvJsonObj.getString("pos");
+					
+					dataSql = "SELECT STATE_CODE FROM STATE WHERE GST_CODE = ? ";
+					dataPstmt = conn.prepareStatement(dataSql);
+					dataPstmt.setString(1, gstStateCode);
+					dataRs = dataPstmt.executeQuery();
+					
+					if(dataRs.next())
+					{
+						stateCode = checkNullandTrim(dataRs.getString("STATE_CODE"));
+					}
+					if(dataPstmt != null)
+					{
+						dataPstmt.close();
+						dataPstmt = null;
+					}
+					if(dataRs != null)
+					{
+						dataRs.close();
+						dataRs = null;
+					}
 					
 					tranId = generateTranId("w_gstr_purc","","",conn);
 					
@@ -1687,7 +1756,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					
 					int hdrCnt = hdrPstmt.executeUpdate();
 					
-					System.out.println("560101.hdrCnt["+hdrCnt+"]");
+					System.out.println("GST_DATA_HDR insert count ["+hdrCnt+"]");
 					
 					b2bInvLineItmsArry = b2bInvJsonObj.getJSONArray("itms");
 					
@@ -1736,7 +1805,12 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					
 					int[] detCnt = detPstmt.executeBatch();
 					
-					System.out.println("560101.detCnt["+detCnt+"]");
+					System.out.print("GST_DATA_DET insert count");
+					
+					for(int eachRowCnt : detCnt)
+					{
+						System.out.print(eachRowCnt + ",");
+					}
 				}
 				
 			}

webitm-gst/ibase/webitm/util/gst/BaseSerializer.java

@@ -63,11 +63,13 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
                 {
                 	json.writeStringField("sbdt", gstFmt.format(inv.shippingBillDt));
                 }
-                
-                json.writeStringField("inum", inv.inum);
+            	json.writeStringField("inum", inv.inum);
                 json.writeStringField("idt", gstFmt.format(inv.idt));
                 json.writeNumberField("val", inv.val);
-                json.writeStringField("pos", inv.pos);
+                if(inv.pos != null)
+                {
+                	json.writeStringField("pos", inv.pos);
+                }
                 if(genericInvoice.isReverseCharge)
                 {
                 	json.writeStringField("rchrg", inv.rchrg ? "Y" : "N");
@@ -113,10 +115,17 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
         try 
         {
             json.writeStartObject();
-            json.writeNumberField("num", li.num);
             
-            json.writeFieldName("itm_det");
-            json.writeStartObject();
+            if(li.num > 0 )
+            {
+            	json.writeNumberField("num", li.num);
+            }
+            
+            if(!("EXP".equalsIgnoreCase(genericInvoice.getClass().getSimpleName()) || "EXPA".equalsIgnoreCase(genericInvoice.getClass().getSimpleName())))
+            {
+            	json.writeFieldName("itm_det");
+            	json.writeStartObject();
+            }
             json.writeStringField("ty", li.ty);
             json.writeStringField("hsn_sc", li.hsn_sc);
             json.writeNumberField("txval", li.taxval);
@@ -132,7 +141,10 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             
             json.writeNumberField("csrt", li.csrt);
             json.writeNumberField("csamt", li.csamt);
-            json.writeEndObject();
+            if(!("EXP".equalsIgnoreCase(genericInvoice.getClass().getSimpleName()) || "EXPA".equalsIgnoreCase(genericInvoice.getClass().getSimpleName())))
+            {
+            	json.writeEndObject();
+            }
             
             json.writeEndObject();
         }