DespatchConfirm.java

PostOrderActivity.java
PostOrderProcess.java
-Changes made in above component to update invoice id and invoice no in purchase receipt


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

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

@@ -35,7 +35,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 	//Calling GR NO GEneration and Retreiving Despatch Code Here ...
 	
-
 	//GP No Generation code...
 
 	public String generateGPNO(String xmlValues,String site,String SOrderNo,Connection conn) throws Exception
@@ -205,6 +204,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 		String siteCodeMfg = "", packCode = "";
 		Timestamp tranDate = null;
 
+		String poRcpTranId = "";//Modified by Anjali R. on [12/11/2018]
 		try
 		{
 			postordact=new PostOrderActivity();
@@ -442,10 +442,20 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 				//		CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
 
 				errString=postordact.createPORCP(tranId, xtraParams, conn,connCP);
-				if(errString != null && errString.trim().length()>0)
+				//Modified by Anjali R. on [12/11/2018][To get receipt no][Start]
+				//if(errString != null && errString.trim().length()>0)
+				if(errString != null && errString.trim().length()>0 && !(errString.indexOf("Success") > -1))
 				{
 					return errString;
 				}
+				else
+				{
+					String[] arrayForTranId = errString.split("<TranID>");
+					int endIndex = arrayForTranId[1].indexOf("</TranID>");
+					poRcpTranId = arrayForTranId[1].substring(0,endIndex);
+					System.out.println("poRcpTranId--["+poRcpTranId+"]");
+				}
+				//Modified by Anjali R. on [12/11/2018][To get receipt no][End]
 
 				exportOrderType = checkNull(distCommon.getDisparams("999999","EXPORT_DESPATCH_ORDER_TYPE",conn));//gf_getenv_dis('999999',"EXPORT_DESPATCH_ORDER_TYPE")
 
@@ -1464,13 +1474,15 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							long startTime = System.currentTimeMillis();
 							System.out.println("START TIME FOR POST ORDER PROCESS IN SECONDS:::["+startTime/1000+"]");
 
-							errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId ,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip,xtraParams, conn);
+							//Modified by Anjali R. on [12/11/2018][Passed despatch confirm class object][Start]
+							//errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId ,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip,xtraParams, conn);
+							errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId ,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip,xtraParams,poRcpTranId, conn);
+							//Modified by Anjali R. on [12/11/2018][Passed despatch confirm class object][End]
 							
 							long endTime = System.currentTimeMillis();
 							System.out.println("END TIME FOR POST ORDER PROCESS IN SECONDS:::["+endTime/1000+"]");
 							System.out.println("DIFFERANCE IN TIME FOR POST ORDER PROCESS IN SECONDS:::["+(endTime-startTime)/1000+"]for SALE_ORDER["+fromSaleOrder+"]");
 
-
 							System.out.println("@@@@@@@@@689 invPosting() errString::::::["+errString+"]");
 							if(errString.indexOf("Success") > -1)
 							{

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

@@ -928,9 +928,13 @@ public class PostOrderActivity {
 						pstmt1=null;
 						if(isItemLotAvail)
 						{
-							if(suppCodemnfr.trim().length()==0)
+							//Modified by Anjali R. On [12/11/2018][Start]
+							//if(suppCodemnfr.trim().length()==0)
+							if(suppCodemnfr == null || suppCodemnfr.trim().length()==0)
 							{
-								suppCodemnfr=suppCodeMfg;
+								//suppCodemnfr= suppCodeMfg;
+								suppCodemnfr= checkNull(suppCodeMfg);
+								//Modified by Anjali R. On [12/11/2018][End]
 							}
 						}
 						sql="select pack_code		,	discount from 	 sorddet "
@@ -1142,7 +1146,7 @@ public class PostOrderActivity {
 					pstmt.close();
 					pstmt=null;
 					//Added by Pavan R on 06/Feb/2K18[End]
-					retString="";
+					//retString="";//Modified by Anjali R. on[12/11/2018][To return success string in case of success]
 				}
 			//	System.out.println("--XML CREATION --");
 			//}
@@ -2882,13 +2886,19 @@ public class PostOrderActivity {
 	}
 	private String checkNull(String str)
 	{
-		if(str == null)
+		//Modified by Anjali R. on[12/11/2018][Start]
+		//if(str == null)
+		if(str == null || "NULL".equals(str))
+		//Modified by Anjali R. on[12/11/2018][End]
 		{
 			return "";
 		}
 		else
 		{
-			return str ;
+			//Modified by Anjali R. on[12/11/2018][Start]
+			//return str;
+			return str.trim() ;
+			//Modified by Anjali R. on[12/11/2018][Start]
 		}
 
 	}

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

@@ -1114,7 +1114,28 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 
 
 
-	public String invPosting(String fromSaleOrder,String toSaleOrder,String fromCustCode,String toCustCode,String tranIdDespatch, String orderType,Timestamp fromDate,String clubOrder,String clubPendingOrd,String adjDrcr,String adjCustAdv,String advAdjMode,String adjNewProdInv,String siteCodeShip,String xtraParams,Connection conn) throws ITMException
+	//Modified by Anjali R. on [12/11/2018][DepatchConfirm class's object pass as parameter][Start]
+	//public String invPosting(String fromSaleOrder,String toSaleOrder,String fromCustCode,String toCustCode,String tranIdDespatch, String orderType,Timestamp fromDate,String clubOrder,String clubPendingOrd,String adjDrcr,String adjCustAdv,String advAdjMode,String adjNewProdInv,String siteCodeShip,String xtraParams,Connection conn) throws ITMException
+	public String invPosting(String fromSaleOrder,String toSaleOrder,String fromCustCode,String toCustCode,String tranIdDespatch, String orderType,Timestamp fromDate,String clubOrder,String clubPendingOrd,String adjDrcr,String adjCustAdv,String advAdjMode,String adjNewProdInv,String siteCodeShip,String xtraParams,Connection conn) throws ITMException, SQLException
+	{
+		String retString = "";
+		String poRcpNo = "";
+		try
+		{
+			retString = invPosting(fromSaleOrder, toSaleOrder, fromCustCode, toCustCode, tranIdDespatch, orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, xtraParams, poRcpNo, conn);
+		}
+		catch(Exception e)
+		{
+			conn.rollback();
+			System.out.println("Exception--["+e.getMessage()+"]");
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		return retString;
+	}
+	
+	public String invPosting(String fromSaleOrder,String toSaleOrder,String fromCustCode,String toCustCode,String tranIdDespatch, String orderType,Timestamp fromDate,String clubOrder,String clubPendingOrd,String adjDrcr,String adjCustAdv,String advAdjMode,String adjNewProdInv,String siteCodeShip,String xtraParams,String poRcpTranId,Connection conn) throws ITMException
+	//Modified by Anjali R. on [12/11/2018][DepatchConfirm class's object pass as parameter][End]
 	{
 		System.out.println("@@@@@@@@@@@@ invPosting() called.........");
 		Boolean adjDrcrFlag= false, adjAdv=false, adjNewProdInvFlag=false;
@@ -1203,6 +1224,24 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					invoiceId = arrayForTranId1[1].substring(0, endIndex1);
 					//System.out.println("invoiceId=====["+invoiceId+"]");
 
+					//Modified by Anjali R. on[12/11/2018][To update invoice number in purchase receipt][Start]
+					if(poRcpTranId != null && poRcpTranId.trim().length() > 0)
+					{
+						sql = "update PORCP set INVOICE_DATE = ?,INVOICE_NO = ? where TRAN_ID = ?";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setTimestamp(1, fromDate);
+						pstmt.setString(2, invoiceId);
+						pstmt.setString(3, poRcpTranId);
+						int count = pstmt.executeUpdate();
+						if(pstmt != null)
+						{
+							pstmt.close();
+							pstmt = null;
+						}
+						System.out.println("updated ["+count+"] rows in porcp table");
+					}
+					//Modified by Anjali R. on[12/11/2018][To update invoice number in purchase receipt][end]
+					
 					String itemSer=""; 
 					double netAmt=0,lc_check_amt=0;