Client Request ID-D17FSHL001 Client name-SYNCOM

Issue channel partner configuration 
added  item sorddet then should be  auto added also in porddet.  

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

webitm-dis/ibase/webitm/ejb/dis/adv/SorderConf.java

@@ -2,7 +2,7 @@
 	Title : SorderConf[D16BSUN008]
 	Date  : 24/05/16
 	Developer: Chandrashekar
-	
+
  ********************************************************/
 package ibase.webitm.ejb.dis.adv;
 
@@ -39,16 +39,16 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		String sql = "";
 		Connection conn = null;
 		PreparedStatement pstmt = null,pstmt1=null;
-	    String errString = null;
-	    String refSer = "",winName= "",custCode="",itemSer="",siteCode="",status="",stopBusiness="",automps="";
-	    String errCode="",totalAmtStr="";
+		String errString = null;
+		String refSer = "",winName= "",custCode="",itemSer="",siteCode="",status="",stopBusiness="",automps="";
+		String errCode="",totalAmtStr="";
 		ResultSet rs = null,rs1=null;
-	    double totAmt=0.0,totalAmt=0.0;
+		double totAmt=0.0,totalAmt=0.0;
 		java.sql.Date orderDate = null;
 		Timestamp dueDate=null;
-	    int cnt = 0,cnt1 = 0, updCnt1=0;
-	    int retCtr=0;
-	    Boolean isSaleOrder=false;
+		int cnt = 0,cnt1 = 0, updCnt1=0;
+		int retCtr=0;
+		Boolean isSaleOrder=false;
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
 		Timestamp sysDate = null;
 		E12GenericUtility genericUtility= new  E12GenericUtility();
@@ -62,7 +62,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
 			conn.setAutoCommit(false);
-			
+
 			if (saleOrder != null && saleOrder.trim().length() > 0) 
 			{
 				sql = "	select cust_code , item_ser , site_code ,	due_date	, tot_amt, confirmed , " +
@@ -278,7 +278,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 	{
 		String sql = "",errorCode = "";
 		PreparedStatement pstmt = null,pstmt1=null;
-	    String errString ="";
+		String errString ="";
 		ResultSet rs = null;
 		int cnt=0,updCnt=0;
 		String sordLineNo="";
@@ -294,14 +294,14 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		DistCommon distCommom = new DistCommon();
 		//start implement
 		try 
-        {
+		{
 			loginEmpCode =(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
 			Calendar currentDate = Calendar.getInstance();
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			String sysDateStr = sdf.format(currentDate.getTime());
 			sysDate = Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-		
-			
+
+
 			sql = "SELECT site_code,due_date,confirmed,quot_no,contract_no,tot_amt,ord_amt,"
 					+ "(CASE WHEN comm_perc__on IS NULL THEN '' ELSE comm_perc__on END) AS comm_perc__on,"
 					+ "(CASE WHEN comm_perc_on_1 IS NULL THEN '' ELSE comm_perc_on_1 END) AS comm_perc_on_1,"
@@ -330,9 +330,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			ordAmount = ordAmount * exchRate;
 			//get count......
 			sql ="SELECT count(1) AS cnt FROM sorddet WHERE sale_order = ?";
-		    pstmt=conn.prepareStatement(sql);
+			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1, saleOrder);
-		    rs = pstmt.executeQuery();
+			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
 				cnt=rs.getInt(1);
@@ -346,37 +346,37 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				errString = itmDBAccessLocal.getErrorString("","''VTNODET1''","");
 				return errString;
 			}
-			
+
 			if(commPerc1 > 0 || commPerc2 > 0 || commPerc3 > 0)
 			{
-				 commissionMap = calcCommission(saleOrder,"", conn);
-				 errString= checkNull((String)commissionMap.get("errorStr"));
-				 if(errString.trim().length() > 0)
-				 {
-					 return errString;
-				 }
-				 totalCommSp1= checkDouble((Double)commissionMap.get("sp1Comm"));
-				 totalCommSp2= checkDouble((Double)commissionMap.get("sp2Comm"));
-				 totalCommSp3= checkDouble((Double)commissionMap.get("sp3Comm"));
-				 totalCommAmt = checkDouble((Double)commissionMap.get("netComm"));
-
-				   if(exchRate==0)
-				   {
-					   exchRate=1;
-				   }
-				   //check if total commision exceeds Order Amount. 
-				   if(totalCommAmt > ordAmount)
-				   {
-					   errString = itmDBAccessLocal.getErrorString("","''VTCOMMERR''","");
-					   return errString;
-				   }
+				commissionMap = calcCommission(saleOrder,"", conn);
+				errString= checkNull((String)commissionMap.get("errorStr"));
+				if(errString.trim().length() > 0)
+				{
+					return errString;
+				}
+				totalCommSp1= checkDouble((Double)commissionMap.get("sp1Comm"));
+				totalCommSp2= checkDouble((Double)commissionMap.get("sp2Comm"));
+				totalCommSp3= checkDouble((Double)commissionMap.get("sp3Comm"));
+				totalCommAmt = checkDouble((Double)commissionMap.get("netComm"));
+
+				if(exchRate==0)
+				{
+					exchRate=1;
+				}
+				//check if total commision exceeds Order Amount. 
+				if(totalCommAmt > ordAmount)
+				{
+					errString = itmDBAccessLocal.getErrorString("","''VTCOMMERR''","");
+					return errString;
+				}
 			}
 			else
 			{
 				sql ="SELECT sale_order, line_no FROM sorddet WHERE sale_order = ? ORDER BY line_no";
-			    pstmt=conn.prepareStatement(sql);
+				pstmt=conn.prepareStatement(sql);
 				pstmt.setString(1, saleOrder);
-			    rs = pstmt.executeQuery();
+				rs = pstmt.executeQuery();
 				while(rs.next())
 				{
 					saleOrder=rs.getString("sale_order");
@@ -396,42 +396,42 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					totalCommSp1= totalCommSp1 + spComm1;
 					totalCommSp2= totalCommSp2 + spComm2;
 					totalCommSp3= totalCommSp3 + spComm3;
-					
+
 					if(exchRate==0)
 					{
-					   exchRate=1;
+						exchRate=1;
 					}
-					
-	                //check if total commision exceeds Order Amount. 
+
+					//check if total commision exceeds Order Amount. 
 					if(totalCommAmt > ordAmount)
 					{
 						errString = itmDBAccessLocal.getErrorString("","''VTCOMMERR''","");
 						return errString;
 					}
-				    
+
 					//Update sorddet
-					 sql="UPDATE sorddet SET sales_pers_comm_1 = ?,sales_pers_comm_2 = ?,sales_pers_comm_3 = ? WHERE sale_order = ? AND line_no = ?";
-					 pstmt1 = conn.prepareStatement(sql);
-					 pstmt1.setDouble(1, spComm1);
-					 pstmt1.setDouble(2, spComm2);
-					 pstmt1.setDouble(3, spComm3);
-					 pstmt1.setString(4, saleOrder);
-					 pstmt1.setString(5, sordLineNo);
-					 updCnt= pstmt1.executeUpdate();
-					 pstmt1.close();
-					 pstmt1 = null;
-					 if(updCnt <= 0)
-					 {
-						 errString = itmDBAccessLocal.getErrorString("","''VTNCONFT''","");
-						 return errString;
-					 }
+					sql="UPDATE sorddet SET sales_pers_comm_1 = ?,sales_pers_comm_2 = ?,sales_pers_comm_3 = ? WHERE sale_order = ? AND line_no = ?";
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setDouble(1, spComm1);
+					pstmt1.setDouble(2, spComm2);
+					pstmt1.setDouble(3, spComm3);
+					pstmt1.setString(4, saleOrder);
+					pstmt1.setString(5, sordLineNo);
+					updCnt= pstmt1.executeUpdate();
+					pstmt1.close();
+					pstmt1 = null;
+					if(updCnt <= 0)
+					{
+						errString = itmDBAccessLocal.getErrorString("","''VTNCONFT''","");
+						return errString;
+					}
 				}
 				rs.close();
 				rs = null;
 				pstmt.close();
 				pstmt = null;
 			}
-			
+
 			//update sorder..
 			updCnt=0;
 			sql="UPDATE sorder SET	sales_pers_comm_1 = ?, sales_pers_comm_2 = ?, sales_pers_comm_3 = ? WHERE sale_order = ?";
@@ -443,28 +443,28 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			updCnt= pstmt.executeUpdate();
 			System.out.println(">>>>Update sorder totalsp1Comm:"+updCnt);
 			pstmt.close();
-		    pstmt = null;
-		    
-		    if(updCnt > 0)
-		    {
-		    	//update sorder...
-		    	updCnt=0;
-			    commAmtOc=totalCommAmt / exchRate;
-			    sql="UPDATE sorder SET	comm_amt__oc = ? WHERE sale_order = ?";
+			pstmt = null;
+
+			if(updCnt > 0)
+			{
+				//update sorder...
+				updCnt=0;
+				commAmtOc=totalCommAmt / exchRate;
+				sql="UPDATE sorder SET	comm_amt__oc = ? WHERE sale_order = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setDouble(1, commAmtOc);
 				pstmt.setString(2, saleOrder);
 				updCnt= pstmt.executeUpdate();
 				System.out.println(">>>>Update sorder comm_amt__oc:"+updCnt);
 				pstmt.close();
-			    pstmt = null;
-		    }
-		    
-		    if(updCnt > 0)
-		    {
-		    	//update sorder set updCnt
-		    	updCnt=0;
-			    sql="UPDATE sorder SET confirmed = 'Y',conf_date = ?,comm_amt = ?,emp_code__aprv = ? WHERE sale_order = ?";
+				pstmt = null;
+			}
+
+			if(updCnt > 0)
+			{
+				//update sorder set updCnt
+				updCnt=0;
+				sql="UPDATE sorder SET confirmed = 'Y',conf_date = ?,comm_amt = ?,emp_code__aprv = ? WHERE sale_order = ?";
 				pstmt = conn.prepareStatement(sql); 
 				pstmt.setTimestamp(1, sysDate);
 				pstmt.setDouble(2, totalCommAmt);
@@ -473,35 +473,28 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				updCnt= pstmt.executeUpdate();
 				System.out.println(">>>>Update sorder confirmed status:"+updCnt);
 				pstmt.close();
-			    pstmt = null;
-		    }
-		    if(updCnt > 0)
-		    {
-		    	errString=confirmSaleOrder(saleOrder,xtraParams,conn); 
-		    	System.out.println("confirmSaleOrder error code >>>"+errString);
-		    	if(errString ==null || errString.trim().length() == 0)
-		    	{
-		    		sql ="select channel_partner, dis_link from  site_customer where cust_code = ? and   site_code = ?";
-				    pstmt=conn.prepareStatement(sql);
-					pstmt.setString(1, custCode);
-					pstmt.setString(2, siteCode);
-				    rs = pstmt.executeQuery();
-					if(rs.next())
-					{
-						channelPartner=rs.getString("channel_partner");
-						disLink=rs.getString("dis_link");
-					}
-					rs.close();
-					rs = null;
-					pstmt.close();
-					pstmt = null;
-					
-					if(channelPartner== null || channelPartner.trim().length()==0)
+				pstmt = null;
+			}
+			if(updCnt > 0)
+			{
+
+				///// added by arun pal 06-OCT-2017
+				System.out.println("channel  Partner configuration ");
+				errString=confirmSaleOrder(saleOrder,xtraParams,conn); 
+				System.out.println("confirmSaleOrder error code >>>"+errString);
+				System.out.println(" @@@@@@@@@@@@@@@@@@@---------channel  Partner configuration ");
+				if(errString ==null || errString.trim().length() == 0)
+				{				
+					System.out.println("confirmSaleOrder error code >>>"+errString);
+					if(errString ==null || errString.trim().length() == 0)
 					{
-						sql ="select channel_partner, dis_link from  customer where cust_code = ? ";
-					    pstmt=conn.prepareStatement(sql);
+						sql ="select channel_partner, dis_link from  site_customer where cust_code = ? and   site_code = ?";
+						pstmt=conn.prepareStatement(sql);
+						System.out.println("@@@@@@ sql "+sql );
+
 						pstmt.setString(1, custCode);
-					    rs = pstmt.executeQuery();
+						pstmt.setString(2, siteCode);
+						rs = pstmt.executeQuery();
 						if(rs.next())
 						{
 							channelPartner=rs.getString("channel_partner");
@@ -511,75 +504,280 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-					}
-					sql = "select edi_option from transetup where tran_window = ?  ";
-					pstmt = conn.prepareStatement(sql);
-					pstmt.setString(1, winName);
-					rs = pstmt.executeQuery();
-					if (rs.next()) 
-					{
-						ediOption = rs.getString("edi_option");
-					}
-					rs.close();
-					rs = null;
-					pstmt.close();
-					pstmt = null;
-					
-					if("Y".equalsIgnoreCase(channelPartner) && "E".equalsIgnoreCase(disLink))
-					{
-						if ("2".equals(ediOption)) 
+
+						System.out.println("@@@@@@ channel_partner"+channelPartner);
+						System.out.println("@@@@@@@ dis_link"+disLink);
+
+						if(channelPartner== null || channelPartner.trim().length()==0)
+						{
+							sql ="select channel_partner, dis_link from  customer where cust_code = ? ";
+							System.out.println("@@@@@@ sql "+sql );
+
+							pstmt=conn.prepareStatement(sql);
+							pstmt.setString(1, custCode);
+							rs = pstmt.executeQuery();
+							if(rs.next())
+							{
+								channelPartner=rs.getString("channel_partner");
+								disLink=rs.getString("dis_link");
+								System.out.println("@@@@@@ channel partner "+channelPartner );
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+						}
+
+						System.out.println("@@@@@@ channel partner "+channelPartner );
+						///added arun
+						if("Y".equalsIgnoreCase(channelPartner) )
 						{
-							CreateRCPXML createRCPXML = new CreateRCPXML(winName,"sale_order");
-							dataStr = createRCPXML.getTranXML(saleOrder, conn);
-							System.out.println("dataStr =[ " + dataStr + "]");
-							Document ediDataDom = genericUtility.parseString(dataStr);
 
-							E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
-							retString = e12CreateBatchLoad.createBatchLoad(ediDataDom,winName, "2", xtraParams, conn);
-							createRCPXML = null;
-							e12CreateBatchLoad = null;
+							System.out.println("@@@@@@@ channel partner in "+channelPartner);
+
+							String pItemCode="",plineNo="",pItemFlg="",pUnit="",pUnitStd="",pItemCodeOrd="",pNature="",plineNoContr="",pDspDate="",acctCodeCr=null,acctCodeDr=null,cctrCodeCr=null;
+							String taxEnv="" , pStatus="",locCode="",ppackCode="",pspecRef="",cctrCodeDr=null;
+							double pQuantityStduom=0,pConvQtyStduom=0,pRate=0,taxAmt=0,ptotAmt=0,pDiscount=0,pnoArt=0,prateClg=0,prateStd=0;
+							String custItemRef="";
+							Timestamp pDspDate1=null, pstatusDate=null,reqDate=null,dlvDate=null;
+							int lineNoSo=0;
+							String lineNoPo="",purcOrder="";
+							sql ="select cust_pord from sorder where sale_order = ? ";
+							pstmt=conn.prepareStatement(sql);
+							pstmt.setString(1, saleOrder);
+							rs = pstmt.executeQuery();
+							if(rs.next())
+							{
+								purcOrder=rs.getString("cust_pord");
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+							System.out.println("@@@@ cust purchase order "+purcOrder);
 
-							if (retString != null && "SUCCESS".equalsIgnoreCase(retString)) 
+							if(purcOrder !=null && purcOrder.trim().length() > 0)
 							{
-								System.out.println("retString from edi 2 batchload = [" + retString + "]");
+								sql="select line_no FROM sorddet WHERE sale_order =?";
+								pstmt1 = conn.prepareStatement(sql);
+								pstmt1.setString(1,saleOrder );	
+								rs1 = pstmt1.executeQuery();
+								while (rs1.next())
+								{
+									lineNoSo=rs1.getInt(1);
+									System.out.println("@@@@ lineNoSo"+lineNoSo);
+
+									sql="select line_no,SITE_CODE,TAX_AMT,TAX_ENV,LOC_CODE,REQ_DATE ,DLV_DATE,STATUS,ACCT_CODE__DR,ACCT_CODE__CR,CCTR_CODE__CR,CCTR_CODE__DR from  porddet where purc_order=? and line_no=? ";
+									//sql1="select line_no from  porddet where purc_order=? ";
+									pstmt = conn.prepareStatement(sql);
+									pstmt.setString(1,purcOrder );	
+									pstmt.setInt(2,lineNoSo );	
+									rs = pstmt.executeQuery();
+									if(rs.next())
+									{  
+										lineNoPo=rs.getString(1);
+										siteCode=rs.getString(2);
+										taxAmt=rs.getDouble(3);
+										//totAmt=rs.getDouble(3);
+										taxEnv=rs.getString(4);
+										locCode=rs.getString(5);
+										reqDate=rs.getTimestamp(6);
+										dlvDate=rs.getTimestamp(7);
+										pStatus=rs.getString(8);
+										acctCodeDr=rs.getString(9);
+										acctCodeCr=rs.getString(10);
+										cctrCodeCr=rs.getString(11);
+										cctrCodeDr=rs.getString(12);
+
+
+										System.out.println("@@@@@@@@ lineNoPo"+lineNoPo);
+									}
+									rs.close();
+									rs = null;
+									pstmt.close();
+									pstmt = null;
+									//System.out.println("lineNoPo.trim().length()"+lineNoPo.trim().length());
+									if(lineNoPo!=null && lineNoPo.trim().length()>0)
+									{
+										System.out.println("Not null");
+										lineNoPo="";
+									}
+
+									else
+									{
+
+
+										sql="SELECT sale_order, line_no, site_code, item_code, item_code__ord, item_flg, " +
+												"quantity, unit, line_no__contr, unit__std, quantity__stduom, dsp_date, rate, " +
+												"min_shelf_life, max_shelf_life, cust_item__ref, nature, conv__qty_stduom,NET_AMT," +
+												"STATUS_DATE,DISCOUNT,NO_ART,PACK_CODE,RATE__CLG,SPEC_REF,RATE__STD  FROM" +
+												" sorddet WHERE sale_order = ? and line_no=?";
+										pstmt = conn.prepareStatement(sql);
+										pstmt.setString(1, saleOrder);
+										pstmt.setInt(2, lineNoSo);
+										rs = pstmt.executeQuery();
+										while(rs.next()) 
+										{
+											pItemCode = rs.getString("item_code");
+											plineNo= rs.getString("line_no");
+											//siteCode= rs.getString("site_code");
+											pItemFlg = rs.getString("item_flg");
+											pUnit = rs.getString("unit");
+											pUnitStd = rs.getString("unit__std");
+											pItemCodeOrd = rs.getString("item_code__ord");
+											minShelfLife= rs.getDouble("min_shelf_life"); 
+											maxShelfLife= rs.getDouble("max_shelf_life");
+											custItemRef = rs.getString("cust_item__ref");
+											pNature= rs.getString("nature");
+											plineNoContr= rs.getString("line_no__contr");
+											qtyOrd= rs.getDouble("quantity");
+											pQuantityStduom= rs.getDouble("quantity__stduom");
+											pConvQtyStduom= rs.getDouble("conv__qty_stduom");
+											pRate= rs.getDouble("rate");
+											pDspDate1= rs.getTimestamp("dsp_date");
+											ptotAmt= rs.getDouble("NET_AMT");
+											//pStatus= rs.getString("STATUS");
+											pstatusDate= rs.getTimestamp("STATUS_DATE");
+											pDiscount= rs.getDouble("DISCOUNT");
+											pnoArt= rs.getDouble("NO_ART");
+											ppackCode=rs.getString("PACK_CODE");
+											prateClg= rs.getDouble("RATE__CLG");
+											pspecRef=rs.getString("SPEC_REF");
+											prateStd= rs.getDouble("RATE__STD");
+
+
+
+										}
+										rs.close();
+										rs = null;
+										pstmt.close();
+										pstmt = null;
+										/////	
+
+										sql="Insert into porddet(PURC_ORDER,LINE_NO,SITE_CODE,ITEM_CODE,QUANTITY,UNIT,"+
+												"RATE,CONV__QTY_STDUOM,CONV__RTUOM_STDUOM,UNIT__STD,QUANTITY__STDUOM,ACCT_CODE__DR,ACCT_CODE__CR,"+
+												"CCTR_CODE__CR,TAX_AMT,TAX_ENV,TOT_AMT,STATUS,DISCOUNT,LOC_CODE,REQ_DATE ,DLV_DATE,NO_ART,PACK_CODE,RATE__CLG,SPEC_REF,STD_RATE,CCTR_CODE__DR)"+ 
+												"values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+										// System.out.println("@@@@ inserted in"+sql);// where purc_order=? and line_no=? ";	
+										pstmt = conn.prepareStatement(sql);
+										pstmt.setString(1, purcOrder);
+										//pstmt.setInt(2, lineNoSo);
+										pstmt.setString(2, plineNo);
+										pstmt.setString(3, siteCode);
+										pstmt.setString(4,pItemCode );
+										pstmt.setDouble(5, qtyOrd);
+										pstmt.setString(6, pUnit);
+										pstmt.setDouble(7, pRate);
+										pstmt.setDouble(8,pConvQtyStduom );
+										pstmt.setDouble(9, pConvQtyStduom);
+										pstmt.setString(10, pUnitStd);
+										pstmt.setDouble(11, pQuantityStduom);
+										pstmt.setString(12, acctCodeDr);
+										pstmt.setString(13, acctCodeCr);
+										pstmt.setString(14, cctrCodeCr);
+										pstmt.setDouble(15, taxAmt);
+										//pstmt.setDouble(16, totAmt);
+										pstmt.setString(16, taxEnv);
+										pstmt.setDouble(17, ptotAmt);
+										pstmt.setString(18, pStatus);
+										pstmt.setDouble(19, pDiscount);
+										pstmt.setString(20, locCode);
+										pstmt.setTimestamp(21, reqDate);
+										pstmt.setTimestamp(22, dlvDate);
+										pstmt.setDouble(23, pnoArt);
+										pstmt.setString(24, ppackCode);
+										pstmt.setDouble(25, prateClg);
+										pstmt.setString(26, pspecRef);
+										pstmt.setDouble(27, prateStd);
+										pstmt.setString(28, cctrCodeDr);
+
+
+										rs = pstmt.executeQuery(); 
+										//System.out.println("@@@ lineNoPo"+lineNoPo);
+										//lineNoPo="";
+									}//end if 
+								}
+								rs1.close();
+								rs1 = null;
+								pstmt1.close();
+								pstmt1 = null;
 							}
+
+						}//end else if
+						///ended by arun pal 06-OCT-2017
+
+						/*errString=confirmSaleOrder(saleOrder,xtraParams,conn); */
+						System.out.println("confirmSaleOrder error code >>>"+errString);
+
+						sql = "select edi_option from transetup where tran_window = ?  ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, winName);
+						rs = pstmt.executeQuery();
+						if (rs.next()) 
+						{
+							ediOption = rs.getString("edi_option");
 						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
 
-						else 
+						if("Y".equalsIgnoreCase(channelPartner) && "E".equalsIgnoreCase(disLink))
 						{
-							CreateRCPXML createRCPXML = new CreateRCPXML(winName,"sale_order");
-							dataStr = createRCPXML.getTranXML(saleOrder, conn);
-							System.out.println("dataStr =[ " + dataStr + "]");
-							Document ediDataDom = genericUtility.parseString(dataStr);
+							if ("2".equals(ediOption)) 
+							{
+								CreateRCPXML createRCPXML = new CreateRCPXML(winName,"sale_order");
+								dataStr = createRCPXML.getTranXML(saleOrder, conn);
+								System.out.println("dataStr =[ " + dataStr + "]");
+								Document ediDataDom = genericUtility.parseString(dataStr);
+
+								E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
+								retString = e12CreateBatchLoad.createBatchLoad(ediDataDom,winName, "2", xtraParams, conn);
+								createRCPXML = null;
+								e12CreateBatchLoad = null;
 
-							E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
-							retString = e12CreateBatchLoad.createBatchLoad(ediDataDom,winName, ediOption, xtraParams, conn);
-							createRCPXML = null;
-							e12CreateBatchLoad = null;
+								if (retString != null && "SUCCESS".equalsIgnoreCase(retString)) 
+								{
+									System.out.println("retString from edi 2 batchload = [" + retString + "]");
+								}
+							}
 
-							if (retString != null && "SUCCESS".equalsIgnoreCase(retString)) 
+							else 
 							{
-								System.out.println("retString from batchload = ["+ retString + "]");
+								CreateRCPXML createRCPXML = new CreateRCPXML(winName,"sale_order");
+								dataStr = createRCPXML.getTranXML(saleOrder, conn);
+								System.out.println("dataStr =[ " + dataStr + "]");
+								Document ediDataDom = genericUtility.parseString(dataStr);
+
+								E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
+								retString = e12CreateBatchLoad.createBatchLoad(ediDataDom,winName, ediOption, xtraParams, conn);
+								createRCPXML = null;
+								e12CreateBatchLoad = null;
+
+								if (retString != null && "SUCCESS".equalsIgnoreCase(retString)) 
+								{
+									System.out.println("retString from batchload = ["+ retString + "]");
+								}
 							}
 						}
 					}
-		    	}
-		    	else
-		    	{
-		    		return errString;
-		    	}
-		    }
-		    else
-		    {
-		    	errString = itmDBAccessLocal.getErrorString("","''VTNCONFT''","");
-				return errString;
-		    }
+					else
+					{
+						return errString;
+					}
+				}
+				else
+				{
+					errString = itmDBAccessLocal.getErrorString("","''VTNCONFT''","");
+					return errString;
+				}
+			}
 		}
 		catch(Exception e)
 		{
 			e.printStackTrace();
 			throw new ITMException(e);
-						
+
 		}
 		finally
 		{
@@ -619,118 +817,118 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		int cnt=0,updCnt=0;
 		String consumeFc="",ordType="",custCode="",itemCode="",itemSer="",priceListDisc="",disVarValue="",lineNoContr="",contractNo="",quotNo="",itemCodeOrd="";
 		String lineNo="",siteCode="",itemFlg="",unit="",unitStd="",custItemRef="",lineType="";
-    	String nature="",explev = "1.",expLev="";
+		String nature="",explev = "1.",expLev="";
 		double ordAmount=0.0,minShelfLife=0.0,minShelfPerc=0.0,maxLife=0.0,shelfLife=0.0,tempLife=0.0,maxShelfLife=0.0,qtyOrd=0.0;
-    	double quantityStduom=0.0,rate=0.0,convQtyStduom=0.0;
-    	Timestamp dspDate=null;
+		double quantityStduom=0.0,rate=0.0,convQtyStduom=0.0;
+		Timestamp dspDate=null;
 		String loginEmpCode="",projCode="";
 		Timestamp sysDate = null,dueDate=null,orderDate=null;
 		DistCommon distCommom = new DistCommon();
 		try
 		{
 			//Get consume_fc from Sale Order header.
-		    sql="SELECT consume_fc, cust_code, item_ser, price_list__disc, proj_code,due_date, " +
-		    		" order_date, order_type FROM sorder WHERE sale_order = ?";
-		    pstmt = conn.prepareStatement(sql);
-		    pstmt.setString(1, saleOrder);
-		    rs = pstmt.executeQuery();
-		    if (rs.next()) 
-		    {
-		    	consumeFc=rs.getString("consume_fc");
-			    custCode=rs.getString("cust_code");
-			    itemSer=rs.getString("item_ser");
-			    priceListDisc=rs.getString("price_list__disc");
-			    //ordAmount=rs.getDouble("ord_amt");
-			    ordType=rs.getString("order_type");
-			    projCode=rs.getString("proj_code");
-			    dueDate=rs.getTimestamp("due_date");
-			    orderDate=rs.getTimestamp("order_date");
-		    }
-		    rs.close();
-		    rs = null;
-		    pstmt.close();
-		    pstmt = null;
-		
-		    // get from sorddet
-		    sql="SELECT sale_order, line_no, site_code, item_code, item_code__ord, item_flg, " +
-		    		"quantity, unit, line_no__contr, unit__std, quantity__stduom, dsp_date, rate, " +
-		    		"min_shelf_life, max_shelf_life, cust_item__ref, nature, conv__qty_stduom FROM" +
-		    		" sorddet WHERE sale_order = ? ORDER BY line_no";
-		    pstmt = conn.prepareStatement(sql);
-		    pstmt.setString(1, saleOrder);
-		    rs = pstmt.executeQuery();
-		    while(rs.next()) 
-		    {
-		    	itemCode= rs.getString("item_code");
-		    	lineNo= rs.getString("line_no");
-		    	siteCode= rs.getString("site_code");
-		    	itemFlg= rs.getString("item_flg");
-		    	unit= rs.getString("unit");
-		    	unitStd= rs.getString("unit__std");
-		    	itemCodeOrd= rs.getString("item_code__ord");
-		    	minShelfLife= rs.getDouble("min_shelf_life"); 
-		    	maxShelfLife= rs.getDouble("max_shelf_life");
-		    	custItemRef= rs.getString("cust_item__ref");
-		    	nature= rs.getString("nature");
-		    	lineNoContr= rs.getString("line_no__contr");
-		    	qtyOrd= rs.getDouble("quantity");
-		    	quantityStduom= rs.getDouble("quantity__stduom");
-		    	convQtyStduom= rs.getDouble("conv__qty_stduom");
-		    	rate= rs.getDouble("rate");
-		    	dspDate= rs.getTimestamp("dsp_date");
-			
-		    	if(minShelfLife==0)
-		    	{
-		    		//get min_shelf_life from sordertype
-		    		sql="SELECT min_shelf_life FROM sordertype WHERE order_type = ?";
-		    		pstmt1= conn.prepareStatement(sql);
-		    		pstmt1.setString(1, ordType);
-		    		rs1 = pstmt1.executeQuery();
-		    		if (rs1.next()) 
-		    		{
-		    			minShelfLife = rs1.getDouble("min_shelf_life");
-		    		}
-		    		rs1.close();
-		    		rs1= null;
-		    		pstmt1.close();
-		    		pstmt1= null;
-		    	}
-		    	if(minShelfLife==0)
-		    	{
-		    		//get min_shelf_life from customeritem
-		    		minShelfLife=0;
-		    		sql="SELECT min_shelf_life FROM customeritem WHERE cust_code = ? AND item_code = ?";
-		    		pstmt1=conn.prepareStatement(sql);
-		    		pstmt1.setString(1, custCode);
-		    		pstmt1.setString(2, itemCode);
-		    		rs1 = pstmt1.executeQuery();
-		    		if (rs1.next()) 
-		    		{
-		    			minShelfLife = rs1.getDouble("min_shelf_life");
-		    		}
-		    		rs1.close();
-		    		rs1= null;
-		    		pstmt1.close();
-		    		pstmt1= null;
-				
-		    		if(minShelfLife==0)
-		    		{
-		    			//get min_shelf_perc from customer series...
-		    			sql="SELECT (CASE WHEN min_shelf_perc IS NULL THEN 0 ELSE min_shelf_perc END) AS min_shelf_perc " +
-		    					" FROM customer_series WHERE cust_code = ? AND item_ser = ?";
-		    			pstmt1 = conn.prepareStatement(sql);
-		    			pstmt1.setString(1, custCode);
-		    			pstmt1.setString(2, itemSer);
-		    			rs1 = pstmt1.executeQuery();
-		    			if (rs1.next()) 
-		    			{
-		    				minShelfPerc = rs1.getDouble("min_shelf_perc"); 
-		    			}
-		    			rs1.close();
-		    			rs1 = null;
-		    			pstmt1.close();
+			sql="SELECT consume_fc, cust_code, item_ser, price_list__disc, proj_code,due_date, " +
+					" order_date, order_type FROM sorder WHERE sale_order = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, saleOrder);
+			rs = pstmt.executeQuery();
+			if (rs.next()) 
+			{
+				consumeFc=rs.getString("consume_fc");
+				custCode=rs.getString("cust_code");
+				itemSer=rs.getString("item_ser");
+				priceListDisc=rs.getString("price_list__disc");
+				//ordAmount=rs.getDouble("ord_amt");
+				ordType=rs.getString("order_type");
+				projCode=rs.getString("proj_code");
+				dueDate=rs.getTimestamp("due_date");
+				orderDate=rs.getTimestamp("order_date");
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+
+			// get from sorddet
+			sql="SELECT sale_order, line_no, site_code, item_code, item_code__ord, item_flg, " +
+					"quantity, unit, line_no__contr, unit__std, quantity__stduom, dsp_date, rate, " +
+					"min_shelf_life, max_shelf_life, cust_item__ref, nature, conv__qty_stduom FROM" +
+					" sorddet WHERE sale_order = ? ORDER BY line_no";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, saleOrder);
+			rs = pstmt.executeQuery();
+			while(rs.next()) 
+			{
+				itemCode= rs.getString("item_code");
+				lineNo= rs.getString("line_no");
+				siteCode= rs.getString("site_code");
+				itemFlg= rs.getString("item_flg");
+				unit= rs.getString("unit");
+				unitStd= rs.getString("unit__std");
+				itemCodeOrd= rs.getString("item_code__ord");
+				minShelfLife= rs.getDouble("min_shelf_life"); 
+				maxShelfLife= rs.getDouble("max_shelf_life");
+				custItemRef= rs.getString("cust_item__ref");
+				nature= rs.getString("nature");
+				lineNoContr= rs.getString("line_no__contr");
+				qtyOrd= rs.getDouble("quantity");
+				quantityStduom= rs.getDouble("quantity__stduom");
+				convQtyStduom= rs.getDouble("conv__qty_stduom");
+				rate= rs.getDouble("rate");
+				dspDate= rs.getTimestamp("dsp_date");
+
+				if(minShelfLife==0)
+				{
+					//get min_shelf_life from sordertype
+					sql="SELECT min_shelf_life FROM sordertype WHERE order_type = ?";
+					pstmt1= conn.prepareStatement(sql);
+					pstmt1.setString(1, ordType);
+					rs1 = pstmt1.executeQuery();
+					if (rs1.next()) 
+					{
+						minShelfLife = rs1.getDouble("min_shelf_life");
+					}
+					rs1.close();
+					rs1= null;
+					pstmt1.close();
+					pstmt1= null;
+				}
+				if(minShelfLife==0)
+				{
+					//get min_shelf_life from customeritem
+					minShelfLife=0;
+					sql="SELECT min_shelf_life FROM customeritem WHERE cust_code = ? AND item_code = ?";
+					pstmt1=conn.prepareStatement(sql);
+					pstmt1.setString(1, custCode);
+					pstmt1.setString(2, itemCode);
+					rs1 = pstmt1.executeQuery();
+					if (rs1.next()) 
+					{
+						minShelfLife = rs1.getDouble("min_shelf_life");
+					}
+					rs1.close();
+					rs1= null;
+					pstmt1.close();
+					pstmt1= null;
+
+					if(minShelfLife==0)
+					{
+						//get min_shelf_perc from customer series...
+						sql="SELECT (CASE WHEN min_shelf_perc IS NULL THEN 0 ELSE min_shelf_perc END) AS min_shelf_perc " +
+								" FROM customer_series WHERE cust_code = ? AND item_ser = ?";
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1, custCode);
+						pstmt1.setString(2, itemSer);
+						rs1 = pstmt1.executeQuery();
+						if (rs1.next()) 
+						{
+							minShelfPerc = rs1.getDouble("min_shelf_perc"); 
+						}
+						rs1.close();
+						rs1 = null;
+						pstmt1.close();
 						pstmt1 = null;
-					
+
 						if(minShelfPerc==0)
 						{
 							minShelfLife = 0;
@@ -752,7 +950,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 							rs1 = null;
 							pstmt1.close();
 							pstmt1 = null;
-						
+
 							if(shelfLife > 0)
 							{
 								//minShelfLife = round((minShelfPerc/100) * shelfLife,0);
@@ -765,153 +963,153 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 								maxLife = 0;
 							}
 						}
-		    		}
-		    		// Pick up min_shelf_perc from customer series .
-		    		if(minShelfLife==0)
-		    		{
-		    			sql="SELECT min_shelf_life FROM customer WHERE cust_code = ?";
-		    			pstmt1 = conn.prepareStatement(sql);
-		    			pstmt1.setString(1, custCode);
-		    			rs1 = pstmt1.executeQuery();
-		    			if (rs1.next()) 
-		    			{
-		    				minShelfLife = rs1.getDouble("min_shelf_life");
-		    			}
-		    			rs1.close();
-		    			rs1 = null;
-		    			pstmt1.close();
-		    			pstmt1 = null;
-					
-		    		}
-		    		if(minShelfLife==0)
-		    		{
-		    			//Changed by Manish on 09/09/16 for removing extra semicolon[start]
-		    			//sql="SELECT min_shelf_life FROM item WHERE item_code = ?;";
-		    			sql="SELECT min_shelf_life FROM item WHERE item_code = ?";
-		    			//Changed by Manish on 09/09/16 for removing extra semicolon[end]
-		    			pstmt1 = conn.prepareStatement(sql);
-		    			pstmt1.setString(1, itemCode);
-		    			rs1 = pstmt1.executeQuery();
-		    			if (rs1.next()) 
-		    			{
-		    				minShelfLife = rs1.getDouble("min_shelf_life");
-		    			}
-		    			rs1.close();
-		    			rs1 = null;
-		    			pstmt1.close();
-		    			pstmt1 = null;
-					
-		    		}
-		    		if(priceListDisc!=null && priceListDisc.trim().length() > 0) 
-		    		{
-		    			sql="SELECT order_type FROM sorder WHERE sale_order = ?";
-		    			pstmt1 = conn.prepareStatement(sql);
-		    			pstmt1.setString(1, saleOrder);
-		    			rs1 = pstmt1.executeQuery();
-		    			if (rs1.next()) 
-		    			{
-		    				ordType = rs1.getString("order_type");
-		    			}
-		    			rs1.close();
-		    			rs1 = null;
-		    			pstmt1.close();
-		    			pstmt1 = null;
-		    			if("NE".equals(ordType.trim()))
-		    			{
-		    				sql="SELECT (CASE WHEN no_sales_month IS NULL THEN 0 ELSE no_sales_month END) AS no_sales_month " +
-		    						" FROM item WHERE item_code = ?";
-		    				pstmt1 = conn.prepareStatement(sql);
-		    				pstmt1.setString(1, itemCode);
-		    				rs1 = pstmt1.executeQuery();
-		    				if (rs1.next()) 
-		    				{
-		    					maxLife = rs1.getDouble("no_sales_month");
-		    				}
-		    				rs1.close();
-		    				rs1 = null;
-		    				pstmt1.close();
-		    				pstmt1 = null;
-		    				if(maxLife==0)
-		    				{
-							    //call getDisparams() .....
-		    					disVarValue = checkNull(distCommom.getDisparams("999999","NEAR_EXP_SHELF_LIFE", conn));
-		    					System.out.println(">>>>>disVarValue:"+disVarValue);
-		    					if("NULLFOUND".equalsIgnoreCase(disVarValue) || disVarValue== null || disVarValue.trim().length()==0)
-		    					{
-		    						disVarValue="0";
-		    					}
-		    					maxLife=Double.parseDouble(disVarValue);
-		    				}
-		    				// Interchange values of min shelf life with max shelf life
-		    				tempLife=maxLife;
-						    maxLife=minShelfLife;
-						    minShelfLife=tempLife;
-		    			}
-		    			else
-		    			{
-		    				maxLife=0;
-		    			}
-		    		}
-				 
-		    	}
-		    	if(maxShelfLife > 0)
-		    	{
-		    		maxLife = maxShelfLife;
-		    	}
-                sql="insert into sorditem "
-                        + " (sale_order, line_no, site_code, item_code__ord, item_code__ref," 
-                        + " item_code,item_flag,line_type,unit__ord,unit__ref,unit,qty_ord,qty_ref,"
-                        + "quantity,exp_lev, min_shelf_life,max_shelf_life,consume_fc,due_date," +
-                        "cust_item__ref,order_date,order_type,dsp_date,rate,status,nature," +
-                        "conv__qty_stdqty,cust_code__dlv, " 
-                      //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
-                        +" qty_alloc, qty_desp )"
-                      //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[end]
-                        + " values "
-                        + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-                pstmt1=conn.prepareStatement(sql);
-                pstmt1.setString(1,saleOrder);
-                pstmt1.setString(2,lineNo);
-                pstmt1.setString(3,siteCode);
-                pstmt1.setString(4,itemCode);
-                pstmt1.setString(5,itemCode);
-                pstmt1.setString(6,itemCode);
-                pstmt1.setString(7,itemFlg);
-                pstmt1.setString(8,itemFlg);
-                pstmt1.setString(9,unit);
-                pstmt1.setString(10,unit);
-                pstmt1.setString(11,unit);
-                pstmt1.setDouble(12,qtyOrd);
-                pstmt1.setDouble(13,qtyOrd);
-                pstmt1.setDouble(14,qtyOrd);
-                pstmt1.setString(15,explev);
-                pstmt1.setDouble(16,minShelfLife);
-                pstmt1.setDouble(17,maxShelfLife);
-                pstmt1.setString(18,consumeFc);
-                pstmt1.setTimestamp(19,dueDate);
-                pstmt1.setString(20,custItemRef);
-                pstmt1.setTimestamp(21,orderDate);
-                pstmt1.setString(22,ordType);
-                pstmt1.setTimestamp(23,dspDate);
-                pstmt1.setDouble(24,rate);
-                pstmt1.setString(25,"P");
-                pstmt1.setString(26,nature);
-                pstmt1.setDouble(27,convQtyStduom);
-                pstmt1.setString(28,custCode);
-                //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
-                pstmt1.setString(29,"0");
-                pstmt1.setString(30,"0");
-                //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[end]
-                
-                pstmt1.executeUpdate();
-                pstmt1.close();
-                pstmt1=null;
-                
-		    	
-		    	if(contractNo!=null && lineNoContr!=null && contractNo.trim().length() > 0 && lineNoContr.trim().length() > 0)
-		    	{
-		    		sql="UPDATE scontractdet SET rel_qty= rel_qty + ?,rel_date = ? WHERE contract_no = ? AND line_no = ?";
-		    		pstmt1 = conn.prepareStatement(sql); 
+					}
+					// Pick up min_shelf_perc from customer series .
+					if(minShelfLife==0)
+					{
+						sql="SELECT min_shelf_life FROM customer WHERE cust_code = ?";
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1, custCode);
+						rs1 = pstmt1.executeQuery();
+						if (rs1.next()) 
+						{
+							minShelfLife = rs1.getDouble("min_shelf_life");
+						}
+						rs1.close();
+						rs1 = null;
+						pstmt1.close();
+						pstmt1 = null;
+
+					}
+					if(minShelfLife==0)
+					{
+						//Changed by Manish on 09/09/16 for removing extra semicolon[start]
+						//sql="SELECT min_shelf_life FROM item WHERE item_code = ?;";
+						sql="SELECT min_shelf_life FROM item WHERE item_code = ?";
+						//Changed by Manish on 09/09/16 for removing extra semicolon[end]
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1, itemCode);
+						rs1 = pstmt1.executeQuery();
+						if (rs1.next()) 
+						{
+							minShelfLife = rs1.getDouble("min_shelf_life");
+						}
+						rs1.close();
+						rs1 = null;
+						pstmt1.close();
+						pstmt1 = null;
+
+					}
+					if(priceListDisc!=null && priceListDisc.trim().length() > 0) 
+					{
+						sql="SELECT order_type FROM sorder WHERE sale_order = ?";
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1, saleOrder);
+						rs1 = pstmt1.executeQuery();
+						if (rs1.next()) 
+						{
+							ordType = rs1.getString("order_type");
+						}
+						rs1.close();
+						rs1 = null;
+						pstmt1.close();
+						pstmt1 = null;
+						if("NE".equals(ordType.trim()))
+						{
+							sql="SELECT (CASE WHEN no_sales_month IS NULL THEN 0 ELSE no_sales_month END) AS no_sales_month " +
+									" FROM item WHERE item_code = ?";
+							pstmt1 = conn.prepareStatement(sql);
+							pstmt1.setString(1, itemCode);
+							rs1 = pstmt1.executeQuery();
+							if (rs1.next()) 
+							{
+								maxLife = rs1.getDouble("no_sales_month");
+							}
+							rs1.close();
+							rs1 = null;
+							pstmt1.close();
+							pstmt1 = null;
+							if(maxLife==0)
+							{
+								//call getDisparams() .....
+								disVarValue = checkNull(distCommom.getDisparams("999999","NEAR_EXP_SHELF_LIFE", conn));
+								System.out.println(">>>>>disVarValue:"+disVarValue);
+								if("NULLFOUND".equalsIgnoreCase(disVarValue) || disVarValue== null || disVarValue.trim().length()==0)
+								{
+									disVarValue="0";
+								}
+								maxLife=Double.parseDouble(disVarValue);
+							}
+							// Interchange values of min shelf life with max shelf life
+							tempLife=maxLife;
+							maxLife=minShelfLife;
+							minShelfLife=tempLife;
+						}
+						else
+						{
+							maxLife=0;
+						}
+					}
+
+				}
+				if(maxShelfLife > 0)
+				{
+					maxLife = maxShelfLife;
+				}
+				sql="insert into sorditem "
+						+ " (sale_order, line_no, site_code, item_code__ord, item_code__ref," 
+						+ " item_code,item_flag,line_type,unit__ord,unit__ref,unit,qty_ord,qty_ref,"
+						+ "quantity,exp_lev, min_shelf_life,max_shelf_life,consume_fc,due_date," +
+						"cust_item__ref,order_date,order_type,dsp_date,rate,status,nature," +
+						"conv__qty_stdqty,cust_code__dlv, " 
+						//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
+						+" qty_alloc, qty_desp )"
+						//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[end]
+						+ " values "
+						+ "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+				pstmt1=conn.prepareStatement(sql);
+				pstmt1.setString(1,saleOrder);
+				pstmt1.setString(2,lineNo);
+				pstmt1.setString(3,siteCode);
+				pstmt1.setString(4,itemCode);
+				pstmt1.setString(5,itemCode);
+				pstmt1.setString(6,itemCode);
+				pstmt1.setString(7,itemFlg);
+				pstmt1.setString(8,itemFlg);
+				pstmt1.setString(9,unit);
+				pstmt1.setString(10,unit);
+				pstmt1.setString(11,unit);
+				pstmt1.setDouble(12,qtyOrd);
+				pstmt1.setDouble(13,qtyOrd);
+				pstmt1.setDouble(14,qtyOrd);
+				pstmt1.setString(15,explev);
+				pstmt1.setDouble(16,minShelfLife);
+				pstmt1.setDouble(17,maxShelfLife);
+				pstmt1.setString(18,consumeFc);
+				pstmt1.setTimestamp(19,dueDate);
+				pstmt1.setString(20,custItemRef);
+				pstmt1.setTimestamp(21,orderDate);
+				pstmt1.setString(22,ordType);
+				pstmt1.setTimestamp(23,dspDate);
+				pstmt1.setDouble(24,rate);
+				pstmt1.setString(25,"P");
+				pstmt1.setString(26,nature);
+				pstmt1.setDouble(27,convQtyStduom);
+				pstmt1.setString(28,custCode);
+				//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
+				pstmt1.setString(29,"0");
+				pstmt1.setString(30,"0");
+				//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[end]
+
+				pstmt1.executeUpdate();
+				pstmt1.close();
+				pstmt1=null;
+
+
+				if(contractNo!=null && lineNoContr!=null && contractNo.trim().length() > 0 && lineNoContr.trim().length() > 0)
+				{
+					sql="UPDATE scontractdet SET rel_qty= rel_qty + ?,rel_date = ? WHERE contract_no = ? AND line_no = ?";
+					pstmt1 = conn.prepareStatement(sql); 
 					pstmt1.setDouble(1, qtyOrd);
 					pstmt1.setTimestamp(2, sysDate);
 					pstmt1.setString(3, contractNo);
@@ -919,36 +1117,36 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					updCnt= pstmt1.executeUpdate();
 					System.out.println(">>>>Update scontractdet:"+updCnt);
 					pstmt1.close();
-				    pstmt1 = null;
-				    if (updCnt < 0) 
+					pstmt1 = null;
+					if (updCnt < 0) 
 					{	
 						errString = itmDBAccessLocal.getErrorString("","VTNCONFT","");
-                        return errString;
-					}
-		    	}
-		    	//confirmation rel_qty,bal_qty and rel_date update in sales_quotdet
-		    	sql="SELECT quot_no FROM sorder WHERE sale_order = ?";
-		    	pstmt1 = conn.prepareStatement(sql);
-		    	pstmt1.setString(1, saleOrder);
-		    	rs1 = pstmt1.executeQuery();
-		    	if (rs1.next()) 
-		    	{
-		    		quotNo = rs1.getString("quot_no");
-		    	}
-		    	rs1.close();
-		    	rs1 = null;
-		    	pstmt1.close();
-		    	pstmt1 = null;
-		    	if(quotNo!=null && quotNo.trim().length()!= 0)
-		    	{
-		    		updCnt=0;
-		    		sql="UPDATE sales_quotdet SET rel_qty =(CASE WHEN rel_qty IS NULL THEN 0 ELSE rel_qty END)  + ?,rel_date = ?," +
-		    				" bal_qty =(CASE WHEN bal_qty IS NULL THEN 0 ELSE bal_qty END) - ? WHERE quot_no = ?" +
-		    				" AND item_code = ?";
-		    		pstmt1 = conn.prepareStatement(sql); 
-		    		pstmt1.setDouble(1, qtyOrd);
-		    		pstmt1.setTimestamp(2, sysDate);
-		    		pstmt1.setDouble(3, qtyOrd);
+						return errString;
+					}
+				}
+				//confirmation rel_qty,bal_qty and rel_date update in sales_quotdet
+				sql="SELECT quot_no FROM sorder WHERE sale_order = ?";
+				pstmt1 = conn.prepareStatement(sql);
+				pstmt1.setString(1, saleOrder);
+				rs1 = pstmt1.executeQuery();
+				if (rs1.next()) 
+				{
+					quotNo = rs1.getString("quot_no");
+				}
+				rs1.close();
+				rs1 = null;
+				pstmt1.close();
+				pstmt1 = null;
+				if(quotNo!=null && quotNo.trim().length()!= 0)
+				{
+					updCnt=0;
+					sql="UPDATE sales_quotdet SET rel_qty =(CASE WHEN rel_qty IS NULL THEN 0 ELSE rel_qty END)  + ?,rel_date = ?," +
+							" bal_qty =(CASE WHEN bal_qty IS NULL THEN 0 ELSE bal_qty END) - ? WHERE quot_no = ?" +
+							" AND item_code = ?";
+					pstmt1 = conn.prepareStatement(sql); 
+					pstmt1.setDouble(1, qtyOrd);
+					pstmt1.setTimestamp(2, sysDate);
+					pstmt1.setDouble(3, qtyOrd);
 					pstmt1.setString(4, quotNo);
 					pstmt1.setString(5, itemCodeOrd);
 					updCnt= pstmt1.executeUpdate();
@@ -958,16 +1156,16 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					if (updCnt < 0) 
 					{	
 						errString = itmDBAccessLocal.getErrorString("","VTNCONFT","");
-                        return errString;
-					}
-		    	}
-		    }
-		    rs.close();
-		    rs = null;
-		    pstmt.close();
-		    pstmt = null;
-		    
-		    sql="SELECT line_type,item_code,exp_lev,line_no FROM sorditem WHERE sale_order = ?";
+						return errString;
+					}
+				}
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+
+			sql="SELECT line_type,item_code,exp_lev,line_no FROM sorditem WHERE sale_order = ?";
 			pstmt1 = conn.prepareStatement(sql);
 			pstmt1.setString(1, saleOrder);
 			rs1 = pstmt1.executeQuery();
@@ -990,53 +1188,53 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			rs1 = null;
 			pstmt1.close();
 			pstmt1 = null;
-		
-		    // Calling of new function which uses sales order credit terms data.
-		    cnt=0;
-		    sql ="SELECT count(*) AS cnt FROM sord_cr_terms WHERE sale_order = ? AND rel_agnst ='02'";
-		    pstmt=conn.prepareStatement(sql);
-		    pstmt.setString(1, saleOrder);
-		    rs = pstmt.executeQuery();
-		    if(rs.next())
-		    {
-		    	cnt=rs.getInt(1);
-		    }
-		    rs.close();
-		    rs = null;
-		    pstmt.close();
-		    pstmt = null;
-		    if(cnt > 0)
-		    {
-		    	//errString=InvoicememoHdr("S-ORD",projCode,dueDate,saleOrder,saleOrder,xtraParams,conn);//no need as per manoharan sir  suggession
-		    }
-		    if(quotNo!=null && quotNo.trim().length()!= 0)
-		    {
-		    	updCnt=0;
-		    	sql="UPDATE sales_quot SET status = 'O', status_date = ? WHERE quot_no = ?";
-		    	pstmt = conn.prepareStatement(sql); 
-		    	pstmt.setTimestamp(1, sysDate);
-		    	pstmt.setString(2, quotNo);
-		    	updCnt= pstmt.executeUpdate();
-		    	System.out.println(">>>>Update sales_quot:"+updCnt);
-		    	pstmt.close();
-		    	pstmt = null;
-		    	if (updCnt < 0) 
-				{	
-					errString = itmDBAccessLocal.getErrorString("","VTNCONFT","");
-                    return errString;
-				}
-		    }
-		}
-		catch (Exception e) 
-		{
-			e.printStackTrace();
-			throw new ITMException(e);
-		} 
-		finally
-		{
-			try
+
+			// Calling of new function which uses sales order credit terms data.
+			cnt=0;
+			sql ="SELECT count(*) AS cnt FROM sord_cr_terms WHERE sale_order = ? AND rel_agnst ='02'";
+			pstmt=conn.prepareStatement(sql);
+			pstmt.setString(1, saleOrder);
+			rs = pstmt.executeQuery();
+			if(rs.next())
 			{
-				if(pstmt != null)
+				cnt=rs.getInt(1);
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			if(cnt > 0)
+			{
+				//errString=InvoicememoHdr("S-ORD",projCode,dueDate,saleOrder,saleOrder,xtraParams,conn);//no need as per manoharan sir  suggession
+			}
+			if(quotNo!=null && quotNo.trim().length()!= 0)
+			{
+				updCnt=0;
+				sql="UPDATE sales_quot SET status = 'O', status_date = ? WHERE quot_no = ?";
+				pstmt = conn.prepareStatement(sql); 
+				pstmt.setTimestamp(1, sysDate);
+				pstmt.setString(2, quotNo);
+				updCnt= pstmt.executeUpdate();
+				System.out.println(">>>>Update sales_quot:"+updCnt);
+				pstmt.close();
+				pstmt = null;
+				if (updCnt < 0) 
+				{	
+					errString = itmDBAccessLocal.getErrorString("","VTNCONFT","");
+					return errString;
+				}
+			}
+		}
+		catch (Exception e) 
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		} 
+		finally
+		{
+			try
+			{
+				if(pstmt != null)
 				{
 					pstmt.close();
 					pstmt = null;
@@ -1084,7 +1282,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			double1 = 0.0;
 		}
 		return double1;
-		
+
 	}
 	public HashMap calcCommission(String saleOrder,String lineNo ,Connection conn) throws ITMException
 	{
@@ -1098,8 +1296,8 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		double sp1Comm=0.0,sp2Comm=0.0,sp3Comm=0.0,totalCommBl=0.0,commAmt=0.0,commAmt1=0.0,commAmt2=0.0,commAmt3=0.0;
 		double baseAmtComm=0.0,baseAmtComm1=0.0,baseAmtComm2=0.0,baseAmtComm3=0.0,assessAmt=0.0,asesAmtComm=0.0,asesAmtComm1=0.0,asesAmtComm2=0.0,asesAmtComm3=0.0;
 		double salesAmt=0.0,taxAmtComm=0.0,taxAmtComm1=0.0,taxAmtComm2=0.0,taxAmtComm3=0.0,fobComm=0.0,fobComm1=0.0,fobComm2=0.0,fobComm3=0.0;
-	    double fobQtyComm=0.0,fobQtyComm1=0.0,fobQtyComm2=0.0,fobQtyComm3=0.0,amtQtyComm=0.0,amtQtyComm1=0.0,amtQtyComm2=0.0,amtQtyComm3=0.0;
-	    double taxAmtHdr=0.0,taxAmtDet=0.0,netAmtHdr=0.0,netAmtDet=0.0;
+		double fobQtyComm=0.0,fobQtyComm1=0.0,fobQtyComm2=0.0,fobQtyComm3=0.0,amtQtyComm=0.0,amtQtyComm1=0.0,amtQtyComm2=0.0,amtQtyComm3=0.0;
+		double taxAmtHdr=0.0,taxAmtDet=0.0,netAmtHdr=0.0,netAmtDet=0.0;
 		Date plDate=null;
 		PreparedStatement pstmt = null ;
 		ResultSet rs = null;
@@ -1148,13 +1346,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			rs = null;
 			pstmt.close();
 			pstmt = null;
-            //Get data from sale order...
+			//Get data from sale order...
 			sql ="SELECT dlv_term,curr_code,exch_rate,exch_rate__frt,exch_rate__ins," +
-						"ins_amt,frt_amt,comm_perc,comm_perc__on,curr_code__comm," +
-						"exch_rate__comm,comm_perc_1,comm_perc_on_1,curr_code__comm_1," +
-						"exch_rate__comm_1,comm_perc_2,comm_perc_on_2,curr_code__comm_2," +
-						"exch_rate__comm_2,pl_date,cust_code,item_ser,sales_pers," +
-						"sales_pers__1,sales_pers__2,tot_amt, tax_amt FROM sorder WHERE sale_order =?";
+					"ins_amt,frt_amt,comm_perc,comm_perc__on,curr_code__comm," +
+					"exch_rate__comm,comm_perc_1,comm_perc_on_1,curr_code__comm_1," +
+					"exch_rate__comm_1,comm_perc_2,comm_perc_on_2,curr_code__comm_2," +
+					"exch_rate__comm_2,pl_date,cust_code,item_ser,sales_pers," +
+					"sales_pers__1,sales_pers__2,tot_amt, tax_amt FROM sorder WHERE sale_order =?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,saleOrder);	
 			rs = pstmt.executeQuery();
@@ -1183,8 +1381,8 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				commPercOn2 =  rs.getString("comm_perc_on_2");
 				currCodeComm2 =  rs.getString("curr_code__comm_2");
 				exchRateComm2 = rs.getDouble("exch_rate__comm_2");
-				
-				
+
+
 				priceListDate = rs.getString("pl_date");
 				custCode= rs.getString("cust_code");
 				itemSer= rs.getString("item_ser");
@@ -1207,9 +1405,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			}
 			if("N".equalsIgnoreCase(commHdr) && lineNo.trim().length() > 0)
 			{
-				
+
 				sql="SELECT comm_perc_on_1, comm_perc_on_2, comm_perc_on_3, comm_perc_1, comm_perc_2, comm_perc_3, " +
-					"tax_amt,net_amt FROM sorddet WHERE sale_order = ? AND line_no = ? ";
+						"tax_amt,net_amt FROM sorddet WHERE sale_order = ? AND line_no = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,saleOrder);
 				pstmt.setString(2,lineNo.trim());	
@@ -1229,7 +1427,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				rs = null;
 				pstmt.close();
 				pstmt = null;
-				
+
 				if(commPercOnDet1 != null && commPercOnDet1.trim().length() > 0)
 				{
 					commPercOn = commPercOnDet1;
@@ -1261,7 +1459,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			{
 				netAmt =  netAmtHdr;
 				taxAmt =  taxAmtHdr;
-				
+
 				/*sql="SELECT tot_amt, tax_amt FROM sorder WHERE sale_order = ?";		
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,saleOrder);	
@@ -1280,7 +1478,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			{
 				netAmt =  netAmtDet;
 				taxAmt =  taxAmtDet;
-				
+
 				/*sql="SELECT net_amt, tax_amt FROM sorddet WHERE sale_order= ? AND line_no= ?";		
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, saleOrder);	
@@ -1310,12 +1508,12 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			rs = null;
 			pstmt.close();
 			pstmt = null;
-			
+
 			netAmt =netAmt * exchRate;
 			taxAmt =taxAmt * exchRate;
 			frtAmt =frtAmt * exchFrtRate;
 			insAmt =insAmt * exchInsRate;
-			
+
 			if("Y".equalsIgnoreCase(insReqd) && "Y".equalsIgnoreCase(frtReqd)) //CIF
 			{
 				fobAmt = netAmt - frtAmt - insAmt;
@@ -1333,11 +1531,11 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				fobAmt = netAmt;
 			}
 			fobAmt = fobAmt - taxAmt;
-			
-			
+
+
 			if(lineNo.trim().length() > 0)
 			{
-			    System.out.println(">>>>>>qty for detail");
+				System.out.println(">>>>>>qty for detail");
 				sql="SELECT quantity__stduom, rate__stduom, item_code FROM sorddet WHERE sale_order = ? AND line_no = ?";		
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,saleOrder);	
@@ -1348,13 +1546,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					qtyStduom =  rs.getDouble(1);
 					rateStduom =  rs.getDouble(2);
 					itemCode = rs.getString(3);
-			    }
-			    rs.close();
-			    rs = null;
-			    pstmt.close();
-			    pstmt = null;
-			    if("B".equalsIgnoreCase(commPercOn) || "B".equalsIgnoreCase(commPercOn1) || "B".equalsIgnoreCase(commPercOn2))
-			    {
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+				if("B".equalsIgnoreCase(commPercOn) || "B".equalsIgnoreCase(commPercOn1) || "B".equalsIgnoreCase(commPercOn2))
+				{
 					netComm=0;
 					ordPrice= rateStduom;
 					//Calling function for picking base comm perc for business logic 
@@ -1373,12 +1571,12 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						netComm=0;
 						commissionMap.put("errorStr", errString);
 						return commissionMap;
-						
+
 					}
-				 }
-				 //Option: Business Logic 1 	
-				 if("B".equalsIgnoreCase(commPercOn) && commPerc==0)
-				 {
+				}
+				//Option: Business Logic 1 	
+				if("B".equalsIgnoreCase(commPercOn) && commPerc==0)
+				{
 					//commision % not entered
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm))
 					{
@@ -1387,11 +1585,11 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					else
 					{
 						commBl1= qtyStduom * commPerUnit * exchRate;
-						
+
 					}
-				 }
-				 else if("B".equalsIgnoreCase(commPercOn) && commPerc > 0)
-				 {
+				}
+				else if("B".equalsIgnoreCase(commPercOn) && commPerc > 0)
+				{
 					//commission % entered
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm))
 					{
@@ -1400,13 +1598,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					else
 					{
 						commBl1= qtyStduom * commPerc * exchRate;
-						
+
 					}
-					
-				 }
-				 //Option: Business Logic 2
-				 if("B".equalsIgnoreCase(commPercOn1) && commPerc1==0)
-				 {
+
+				}
+				//Option: Business Logic 2
+				if("B".equalsIgnoreCase(commPercOn1) && commPerc1==0)
+				{
 					//commision % not entered
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm1))
 					{
@@ -1416,9 +1614,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl2= qtyStduom * commPerUnit * exchRate;
 					}
-				 }
-				 else if("B".equalsIgnoreCase(commPercOn1) && commPerc1 > 0)
-				 {
+				}
+				else if("B".equalsIgnoreCase(commPercOn1) && commPerc1 > 0)
+				{
 					//commission % entered
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm1))
 					{
@@ -1428,10 +1626,10 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl2= qtyStduom * commPerc1 * exchRate;
 					}
-			     }
-				 //Option: Business Logic 3
-				 if("B".equalsIgnoreCase(commPercOn2) && commPerc2==0)
-				 {
+				}
+				//Option: Business Logic 3
+				if("B".equalsIgnoreCase(commPercOn2) && commPerc2==0)
+				{
 					//commision % not entered
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm2))
 					{
@@ -1441,9 +1639,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl3= qtyStduom * commPerUnit * exchRate;
 					}
-				 }
-				 else if("B".equalsIgnoreCase(commPercOn2) && commPerc2 > 0)
-				 {
+				}
+				else if("B".equalsIgnoreCase(commPercOn2) && commPerc2 > 0)
+				{
 					//commission % entered
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm2))
 					{
@@ -1453,13 +1651,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl3= qtyStduom * commPerc2 * exchRate;
 					}
-			     }
-				
-				 //Business Logic Sales Person 
-				 netComm=0;
-				 ordPrice= rateStduom;
-				 if("S".equalsIgnoreCase(commPercOn) || "S".equalsIgnoreCase(commPercOn1) || "S".equalsIgnoreCase(commPercOn2))
-				 {
+				}
+
+				//Business Logic Sales Person 
+				netComm=0;
+				ordPrice= rateStduom;
+				if("S".equalsIgnoreCase(commPercOn) || "S".equalsIgnoreCase(commPercOn1) || "S".equalsIgnoreCase(commPercOn2))
+				{
 					if("S".equalsIgnoreCase(commPercOn))
 					{
 						commPercSalesMap=commPercSalesPers(salesPers,ordPrice,priceListDate,itemCode,conn);
@@ -1503,10 +1701,10 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						commissionMap.put("errorStr", errString);
 						return commissionMap;
 					}
-				  }
-				  //Option: 1
-				  if("S".equalsIgnoreCase(commPercOn) && commPerc==0)
-				  {
+				}
+				//Option: 1
+				if("S".equalsIgnoreCase(commPercOn) && commPerc==0)
+				{
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm))
 					{
 						commBl1= qtyStduom * commPerUnit1 * exchRateComm;
@@ -1515,9 +1713,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl1= qtyStduom * commPerUnit1 * exchRate;
 					}
-				  }
-				  else if("S".equalsIgnoreCase(commPercOn) && commPerc > 0)
-				  {
+				}
+				else if("S".equalsIgnoreCase(commPercOn) && commPerc > 0)
+				{
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm))
 					{
 						commBl1= qtyStduom * commPerc * exchRateComm;
@@ -1526,10 +1724,10 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl1= qtyStduom * commPerc * exchRate;
 					}
-				  }
-				  //Option: 2
-				  if("S".equalsIgnoreCase(commPercOn1) && commPerc1==0)
-				  {
+				}
+				//Option: 2
+				if("S".equalsIgnoreCase(commPercOn1) && commPerc1==0)
+				{
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm1))
 					{
 						commBl2= qtyStduom * commPerUnit2 * exchRateComm1;
@@ -1538,9 +1736,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl2= qtyStduom * commPerUnit2 * exchRate;
 					}
-				  }
-				  else if("S".equalsIgnoreCase(commPercOn1) && commPerc1 > 0)
-				  {
+				}
+				else if("S".equalsIgnoreCase(commPercOn1) && commPerc1 > 0)
+				{
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm1))
 					{
 						commBl2= qtyStduom * commPerc1 * exchRateComm1;
@@ -1549,10 +1747,10 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl2= qtyStduom * commPerc1 * exchRate;
 					}
-			      }
-				 //Option: 3
-				 if("S".equalsIgnoreCase(commPercOn2) && commPerc2==0)
-				 {
+				}
+				//Option: 3
+				if("S".equalsIgnoreCase(commPercOn2) && commPerc2==0)
+				{
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm2))
 					{
 						commBl3= qtyStduom * commPerUnit3 * exchRateComm2;
@@ -1561,9 +1759,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl3= qtyStduom * commPerUnit3 * exchRate;
 					}
-				 }
-			     else if("S".equalsIgnoreCase(commPercOn2) && commPerc2 > 0)
-				 {
+				}
+				else if("S".equalsIgnoreCase(commPercOn2) && commPerc2 > 0)
+				{
 					//commission % entered
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm2))
 					{
@@ -1573,11 +1771,11 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						commBl3= qtyStduom * commPerc2 * exchRate;
 					}
-			     } 
-				 //end.. Option : Business Logic Sales Person
-		
-			    if("Q".equalsIgnoreCase(commPercOn)) //commPercOn for Q
-			    {
+				} 
+				//end.. Option : Business Logic Sales Person
+
+				if("Q".equalsIgnoreCase(commPercOn)) //commPercOn for Q
+				{
 					//comm calc in base currency
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm))
 					{
@@ -1587,9 +1785,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						qtyComm1= qtyStduom * commPerc * exchRate;
 					}
-			    }
-			    if("Q".equalsIgnoreCase(commPercOn1)) //commPercOn1 for Q
-			    {
+				}
+				if("Q".equalsIgnoreCase(commPercOn1)) //commPercOn1 for Q
+				{
 					//comm calc in base currency
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm1))
 					{
@@ -1599,9 +1797,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						qtyComm2= qtyStduom * commPerc1 * exchRate;
 					}
-			    }
-			    if("Q".equalsIgnoreCase(commPercOn2)) //commPercOn2 for Q
-			    {
+				}
+				if("Q".equalsIgnoreCase(commPercOn2)) //commPercOn2 for Q
+				{
 					//comm calc in base currency
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm2))
 					{
@@ -1611,23 +1809,23 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					{
 						qtyComm3= qtyStduom * commPerc2 * exchRate;
 					}
-				 }
-				 qtyComm=qtyComm + qtyComm1 + qtyComm2 + qtyComm3 + commBl1 + commBl2 + commBl3;
-				
-				 sp1Comm = sp1Comm + commBl1 + qtyComm1;
-				 sp2Comm = sp2Comm + commBl2 + qtyComm2;
-				 sp3Comm = sp3Comm + commBl3 + qtyComm3;
-				
-				 qtyComm1=0;
-				 qtyComm2=0;
-				 qtyComm3=0;
-				
-				 qtyStduom=0;
-				 commBl1=0;
-				 commBl2=0;
-				 commBl3=0;
-			}
-			
+				}
+				qtyComm=qtyComm + qtyComm1 + qtyComm2 + qtyComm3 + commBl1 + commBl2 + commBl3;
+
+				sp1Comm = sp1Comm + commBl1 + qtyComm1;
+				sp2Comm = sp2Comm + commBl2 + qtyComm2;
+				sp3Comm = sp3Comm + commBl3 + qtyComm3;
+
+				qtyComm1=0;
+				qtyComm2=0;
+				qtyComm3=0;
+
+				qtyStduom=0;
+				commBl1=0;
+				commBl2=0;
+				commBl3=0;
+			}
+
 			if("B".equalsIgnoreCase(commPercOn) || "B".equalsIgnoreCase(commPercOn1) || "B".equalsIgnoreCase(commPercOn2) )
 			{
 				totalCommBl= qtyComm;
@@ -1646,13 +1844,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				commAmt3= (netAmt *  commPerc2) / 100;
 			}
 			commAmt= commAmt1 + commAmt2 + commAmt3;
-			
+
 			sp1Comm= sp1Comm + commAmt1;
 			sp2Comm= sp2Comm + commAmt2;
 			sp3Comm= sp3Comm + commAmt3;
-			
-		     //if line no is not available 
-			
+
+			//if line no is not available 
+
 			if(lineNo.trim().length() == 0)
 			{
 				System.out.println(">>>>>");
@@ -1669,7 +1867,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				pstmt.close();
 				pstmt = null;
 				//To calculate commission on Quantity...
-				
+
 				if("Q".equalsIgnoreCase(commPercOn))
 				{
 					if(!baseCurrency.equalsIgnoreCase(currCodeComm))
@@ -1703,7 +1901,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						qtyComm3 = qtyStduom *  commPerc2 * exchRate;
 					}
 				}
-				
+
 				qtyComm = qtyComm + qtyComm1 + qtyComm2 + qtyComm3 + commBl1 + commBl2 + commBl3;
 				sp1Comm= sp1Comm + commBl1 + qtyComm1;
 				sp2Comm= sp2Comm + commBl2 + qtyComm2 ;
@@ -1724,13 +1922,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			{
 				baseAmtComm3= (( netAmt - taxAmt) * commPerc2) / 100;
 			}
-			
+
 			baseAmtComm = baseAmtComm1 + baseAmtComm2 + baseAmtComm3;
-			
+
 			sp1Comm = sp1Comm + baseAmtComm1;
 			sp2Comm = sp2Comm + baseAmtComm2;
 			sp3Comm = sp3Comm + baseAmtComm3;
-			
+
 			//To calculate commission on ASSESSABLE AMOUNT
 			if("M".equalsIgnoreCase(commPercOn) || "M".equalsIgnoreCase(commPercOn1) || "M".equalsIgnoreCase(commPercOn2) )
 			{
@@ -1767,7 +1965,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			sp1Comm = sp1Comm + asesAmtComm1;
 			sp2Comm = sp2Comm + asesAmtComm2;
 			sp3Comm = sp3Comm + asesAmtComm3;
-			
+
 			//To calculate commission on Taxable Amount
 			if("T".equalsIgnoreCase(commPercOn) || "T".equalsIgnoreCase(commPercOn1) || "T".equalsIgnoreCase(commPercOn2))
 			{
@@ -1800,12 +1998,12 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				taxAmtComm3= (salesAmt * commPerc2) / 100;
 				taxAmtComm3= taxAmtComm3 * exchRate;
 			}
-			
+
 			taxAmtComm = taxAmtComm1 + taxAmtComm2 + taxAmtComm3;
 			sp1Comm =  sp1Comm + taxAmtComm1;
 			sp2Comm =  sp2Comm + taxAmtComm2;
 			sp3Comm =  sp3Comm + taxAmtComm3;
-			
+
 			//To calculate commission on FOB
 			if("F".equalsIgnoreCase(commPercOn))
 			{
@@ -1819,13 +2017,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			{
 				fobComm3= (fobAmt * commPerc2) / 100;
 			}
-			
+
 			fobComm= fobComm1 + fobComm2 + fobComm3;
-			
+
 			sp1Comm =  sp1Comm + fobComm1;
 			sp2Comm =  sp2Comm + fobComm2;
 			sp3Comm =  sp3Comm + fobComm3;
-			
+
 			//To calculate commission on FOB LESS QUANTITY
 			if("Y".equalsIgnoreCase(commPercOn))
 			{
@@ -1843,9 +2041,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			sp1Comm =  sp1Comm + fobQtyComm1;
 			sp2Comm =  sp2Comm + fobQtyComm2;
 			sp3Comm =  sp3Comm + fobQtyComm3;
-			
+
 			//To calculate commission on AMOUNT LESS QUANTITY
-			
+
 			if("Z".equalsIgnoreCase(commPercOn))
 			{
 				amtQtyComm1= ((netAmt - qtyComm) * commPerc) / 100;
@@ -1862,9 +2060,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			sp1Comm =  sp1Comm + amtQtyComm1;
 			sp2Comm =  sp2Comm + amtQtyComm2;
 			sp3Comm =  sp3Comm + amtQtyComm3;
-			
+
 			netComm = commAmt + qtyComm + fobComm + fobQtyComm + amtQtyComm + baseAmtComm + asesAmtComm + taxAmtComm ;
-			
+
 			if(netComm < 0)
 			{
 				netComm=0;
@@ -1872,7 +2070,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			if(exchRateComm > 0)
 			{
 				sp1Comm =  sp1Comm / exchRateComm;
-			   	
+
 			}
 			if(exchRateComm1 > 0)
 			{
@@ -1909,7 +2107,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		ResultSet rs = null;
 		DistCommon distCommon= new DistCommon(); 
 		HashMap commPercMap = null;	
-		
+
 		try
 		{
 			commPercMap = new HashMap();
@@ -1955,7 +2153,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					rs = null;
 					pstmt.close();
 					pstmt = null;
-					
+
 					if(commPerc == 0)
 					{
 						defaultPriceList=distCommon.getDisparams("999999", "BASE_PRICE_LIST", conn);
@@ -1971,61 +2169,61 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 							priceListVal=distCommon.pickRate(defaultPriceList, priceListDate, itemCode, "", "L", conn);
 							commPerc= ordPrice - priceListVal;
 						}
-					 }
-					 else if(commPerc > 0)
-					 {
-						 defaultPriceList=distCommon.getDisparams("999999", "DEFAULT_PRICE_LIST", conn);
-						 System.out.println(">>>>>>>>>>>>>>>defaultPriceList:"+defaultPriceList);
-						 if("NULLFOUND".equalsIgnoreCase(defaultPriceList) || defaultPriceList == null || defaultPriceList.trim().length()==0)
-						 {
-							 errString = itmDBAccessLocal.getErrorString("","VTNOPL","");
-							 commPercMap.put("errorStr", errString);
-							 return commPercMap;
-						 }
-						 else
-						 {
-							 priceListVal=distCommon.pickRate(defaultPriceList, priceListDate, itemCode, "", "L", conn);
-							 commPerc = (priceListVal * commPerc) / 100;
-							 commPerc = ordPrice - commPerc;
-						 }
-					 }
+					}
+					else if(commPerc > 0)
+					{
+						defaultPriceList=distCommon.getDisparams("999999", "DEFAULT_PRICE_LIST", conn);
+						System.out.println(">>>>>>>>>>>>>>>defaultPriceList:"+defaultPriceList);
+						if("NULLFOUND".equalsIgnoreCase(defaultPriceList) || defaultPriceList == null || defaultPriceList.trim().length()==0)
+						{
+							errString = itmDBAccessLocal.getErrorString("","VTNOPL","");
+							commPercMap.put("errorStr", errString);
+							return commPercMap;
+						}
+						else
+						{
+							priceListVal=distCommon.pickRate(defaultPriceList, priceListDate, itemCode, "", "L", conn);
+							commPerc = (priceListVal * commPerc) / 100;
+							commPerc = ordPrice - commPerc;
+						}
+					}
 				} 
 				else if(commPerc > 0)
 				{
-					 defaultPriceList=distCommon.getDisparams("999999", "DEFAULT_PRICE_LIST", conn);
-					 System.out.println(">>>>>>>>>>>>>>>defaultPriceList:"+defaultPriceList);
-					 if(defaultPriceList.equals("NULLFOUND") || defaultPriceList==null || defaultPriceList.trim().length()==0 )
-					 {
-						 // = 'VTNOPL' + "~t" + " Missing DISPARM Environment Variable: BASE_PRICE_LIST ";
-						 errString = itmDBAccessLocal.getErrorString("","VTNOPL","");
-						 commPercMap.put("errorStr", errString);
-						 return commPercMap;
-					 }
-					 else
-					 {
-						 priceListVal=distCommon.pickRate(defaultPriceList, priceListDate, itemCode, "", "L", conn);
-						 commPerc = (priceListVal * commPerc) / 100;
-						 commPerc = ordPrice - commPerc;
-					 }
+					defaultPriceList=distCommon.getDisparams("999999", "DEFAULT_PRICE_LIST", conn);
+					System.out.println(">>>>>>>>>>>>>>>defaultPriceList:"+defaultPriceList);
+					if(defaultPriceList.equals("NULLFOUND") || defaultPriceList==null || defaultPriceList.trim().length()==0 )
+					{
+						// = 'VTNOPL' + "~t" + " Missing DISPARM Environment Variable: BASE_PRICE_LIST ";
+						errString = itmDBAccessLocal.getErrorString("","VTNOPL","");
+						commPercMap.put("errorStr", errString);
+						return commPercMap;
+					}
+					else
+					{
+						priceListVal=distCommon.pickRate(defaultPriceList, priceListDate, itemCode, "", "L", conn);
+						commPerc = (priceListVal * commPerc) / 100;
+						commPerc = ordPrice - commPerc;
+					}
 				}
 			}
 			else if(commPerc > 0)
 			{
-				 defaultPriceList=distCommon.getDisparams("999999", "DEFAULT_PRICE_LIST", conn);
-				 System.out.println(">>>>>>>>>>>>>>>defaultPriceList:"+defaultPriceList);
-				 if(defaultPriceList.equals("NULLFOUND") || defaultPriceList == null || defaultPriceList.trim().length()==0 )
-				 {
-					 errString = itmDBAccessLocal.getErrorString("","VTNOPL","");
-					 commPercMap.put("errorStr", errString);
-					 return commPercMap;
-				 }
-				 else
-				 {
-					 priceListVal=distCommon.pickRate(defaultPriceList, priceListDate, itemCode, "", "L", conn);
-					 commPerc = (priceListVal * commPerc) / 100;
-					 commPerc = ordPrice - commPerc;
-					 commPercMap.put("commPerc", commPerc);
-				 }
+				defaultPriceList=distCommon.getDisparams("999999", "DEFAULT_PRICE_LIST", conn);
+				System.out.println(">>>>>>>>>>>>>>>defaultPriceList:"+defaultPriceList);
+				if(defaultPriceList.equals("NULLFOUND") || defaultPriceList == null || defaultPriceList.trim().length()==0 )
+				{
+					errString = itmDBAccessLocal.getErrorString("","VTNOPL","");
+					commPercMap.put("errorStr", errString);
+					return commPercMap;
+				}
+				else
+				{
+					priceListVal=distCommon.pickRate(defaultPriceList, priceListDate, itemCode, "", "L", conn);
+					commPerc = (priceListVal * commPerc) / 100;
+					commPerc = ordPrice - commPerc;
+					commPercMap.put("commPerc", commPerc);
+				}
 			}
 		}
 		catch(Exception e)
@@ -2082,7 +2280,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 		return commPercSalesMap;
 	}
 	public int explodeBomDs(String saleOrder, String itemCode, String expLev, String lineNo, String lineType,Connection conn) throws ITMException
-    {
+	{
 		String sql="",sql1="",sql2="",mapplicable = "Y",mitemCode="" ,mitemRef="";
 		String itemRef="";
 		String siteCode="",unit="",itemCodeOrd="",itemFlag="",unitOrd="";
@@ -2115,7 +2313,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			{
 				mitemCode = rs.getString(1) == null ? "" : rs.getString(1);
 				mitemRef = rs.getString(2) == null ? "" : rs.getString(2);
-				
+
 				sql1 = "select site_code,unit,quantity,item_code__ord,item_flag,unit__ord, " +
 						" qty_ord,order_date,dsp_date ,rate from sorditem where sale_order=? and exp_lev=? and line_no=? ";
 				pstmt1 = conn.prepareStatement(sql1);
@@ -2125,7 +2323,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				rs1 = pstmt1.executeQuery();
 				while (rs1.next())
 				{
-					
+
 					siteCode = rs1.getString("site_code");
 					unit = rs1.getString("unit");
 					quantity = rs1.getDouble("quantity");
@@ -2136,7 +2334,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					orderDate = rs1.getTimestamp("order_date");
 					dspDate = rs1.getTimestamp("dsp_date");
 					rate = rs1.getDouble("rate");
-					
+
 					sql2="select cust_code from sorder where sale_order =  ?";
 					pstmt2 = conn.prepareStatement(sql2);
 					pstmt2.setString(1, saleOrder);
@@ -2149,7 +2347,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 					rs2 = null;
 					pstmt2.close();
 					pstmt2 = null;
-					
+
 					if("B".equalsIgnoreCase(lineType))
 					{
 						sql2 = "select bom.unit, bom.batch_qty, bomdet.item_ref, bomdet.qty_per, bomdet.req_type, bomdet.min_qty, " +
@@ -2159,7 +2357,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						pstmt2.setString(1, itemCode);
 						pstmt2.setString(2, mitemCode);
 						pstmt2.setString(3, mitemRef);
-						
+
 						rs2 = pstmt2.executeQuery();
 						if (rs2.next())
 						{
@@ -2171,7 +2369,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 							aminqty = rs2.getDouble("app_min_qty");
 							amaxqty = rs2.getDouble("app_max_qty");
 							mnature = rs2.getString("nature");
-							
+
 							System.out.println("aminqty"+aminqty+" "+"amaxqty"+amaxqty);
 							System.out.println("mreqtype"+mreqtype);
 						}
@@ -2179,277 +2377,277 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 						rs2 = null;
 						pstmt2.close();
 						pstmt2 = null;
-							if(aminqty ==0 && amaxqty==0)
+						if(aminqty ==0 && amaxqty==0)
+						{
+							mapplicable = "Y";
+						}else
+						{
+							if(quantity>aminqty && quantity<=amaxqty)
 							{
 								mapplicable = "Y";
 							}else
 							{
-								if(quantity>aminqty && quantity<=amaxqty)
-								{
-									mapplicable = "Y";
-								}else
-								{
-									mapplicable = "N";
-								}
-							}
-							if("S".equalsIgnoreCase(mreqtype))
-							{
-								
-								mqty=(quantity/mbatqty)*mqtyper;
-								System.out.println("mqty S:::"+mqty);
-							}else if("P".equalsIgnoreCase(mreqtype))
-							{
-								mqty=(mqtyper/mbatqty)*quantity;
-								System.out.println("mqty P:::"+mqty);
-							}else if("F".equalsIgnoreCase(mreqtype))
-							{
-								mqty=mqtyper;
-								System.out.println("mqty F:::"+mqty);
-							}
-							if(mqty<mminqty)
-							{
-								mminqty=mqty;
-								System.out.println("mqty<mminqty:::::"+mqty);
+								mapplicable = "N";
 							}
+						}
+						if("S".equalsIgnoreCase(mreqtype))
+						{
+
+							mqty=(quantity/mbatqty)*mqtyper;
+							System.out.println("mqty S:::"+mqty);
+						}else if("P".equalsIgnoreCase(mreqtype))
+						{
+							mqty=(mqtyper/mbatqty)*quantity;
+							System.out.println("mqty P:::"+mqty);
+						}else if("F".equalsIgnoreCase(mreqtype))
+						{
+							mqty=mqtyper;
+							System.out.println("mqty F:::"+mqty);
+						}
+						if(mqty<mminqty)
+						{
+							mminqty=mqty;
+							System.out.println("mqty<mminqty:::::"+mqty);
+						}
 					}
-							
-							else
-							{
-								System.out.println("mqty S:::"+mqty);
-								mqty=quantity;
-								
-								sql2="select unit from item where item_code = ?";
-								pstmt2 = conn.prepareStatement(sql2);
-								pstmt2.setString(1, mitemCode);
-								rs2 = pstmt2.executeQuery();
-								if (rs2.next())
-								{
-									munit = rs2.getString("unit");
-								}
-								rs2.close();
-								rs2 = null;
-								pstmt2.close();
-								pstmt2 = null;
-							}
-							sql2="select count(*) from item where item_code = ?";
-							pstmt2 = conn.prepareStatement(sql2);
-							pstmt2.setString(1, mitemCode);
-							rs2 = pstmt2.executeQuery();
-							if (rs2.next())
-							{
-								mcnt=rs2.getInt(1);
-							}
-							rs2.close();
-							rs2 = null;
-							pstmt2.close();
-							pstmt2 = null;
-							if(mcnt==0)
-							{
-								sql2="select count(*) from bom where bom_code = ?";
-								pstmt2 = conn.prepareStatement(sql2);
-								pstmt2.setString(1, mitemCode);
-								rs2 = pstmt2.executeQuery();
-								if (rs2.next())
-								{
-									mcnt=rs2.getInt(1);
-								}
-								rs2.close();
-								rs2 = null;
-								pstmt2.close();
-								pstmt2 = null;
-								if(mcnt !=0)
-								{
-									mexptype="B";
-								}else
-								{
-									merrstr = "VTITEM1";
-								}
-							}
-							else
-							{
-								sql2="select item_stru from item where item_code = ?";
-								pstmt2 = conn.prepareStatement(sql2);
-								pstmt2.setString(1, mitemCode);
-								rs2 = pstmt2.executeQuery();
-								if (rs2.next())
-								{
-									mexptype = rs2.getString("item_stru");
-									System.out.println("mexptype"+mexptype);
-								}
-								rs2.close();
-								rs2 = null;
-								pstmt2.close();
-								pstmt2 = null;
-								if(!"F".equalsIgnoreCase(mexptype))
-								{
-									mexptype="I";
-								}
-							}
-							//PICKING MIN SHELF LIFE OF ITEM AND INSERTING IN SORDITEM IF MIN LIFE
-							sql2="select min_shelf_life from customeritem where cust_code =  ? and item_code = ?";
-							pstmt2 = conn.prepareStatement(sql2);
-							pstmt2.setString(1, custCode);
-							pstmt2.setString(2, mitemCode);
-							rs2 = pstmt2.executeQuery();
-							if (rs2.next())
-							{
-								minShelfLife = rs2.getDouble("min_shelf_life");
-							}
-							rs2.close();
-							rs2 = null;
-							pstmt2.close();
-							pstmt2 = null;
-							if(minShelfLife==0)
-							{
-								sql2="select min_shelf_life from item where item_code = ?";
-								pstmt2 = conn.prepareStatement(sql2);
-								pstmt2.setString(1, mitemCode);
-								rs2 = pstmt2.executeQuery();
-								if (rs2.next())
-								{
-									minShelfLife = rs2.getDouble("min_shelf_life");
-								}
-								rs2.close();
-								rs2 = null;
-								pstmt2.close();
-								pstmt2 = null;
-							}
-							
-							sql2="select order_type  from sorder where sale_order = ?";
-							pstmt2 = conn.prepareStatement(sql2);
-							pstmt2.setString(1, saleOrder);
-							rs2 = pstmt2.executeQuery();
-							if (rs2.next())
-							{
-								orderType = rs2.getString("order_type");
-							}
-							rs2.close();
-							rs2 = null;
-							pstmt2.close();
-							pstmt2 = null;
-							if("NE".equalsIgnoreCase(orderType))
-							{
-								sql2="select (case when no_sales_month is null then 0 else no_sales_month end)  as ll_max_life " +
-										"from item where item_code = ?";
-								pstmt2 = conn.prepareStatement(sql2);
-								pstmt2.setString(1, mitemCode);
-								rs2 = pstmt2.executeQuery();
-								if (rs2.next())
-								{
-									maxLife = rs2.getDouble("ll_max_life");
-								}
-								rs2.close();
-								rs2 = null;
-								pstmt2.close();
-								pstmt2 = null;
-								if(maxLife==0)
-								{
-									nearExpShelfLife = distCommon.getDisparams("999999", "NEAR_EXP_SHELF_LIFE", conn);
-									 try {
-										 maxLife = Long.parseLong(nearExpShelfLife);
-								      } catch (NumberFormatException nfe) {
-								         System.out.println("NumberFormatException: " + nfe.getMessage());
-								      }
-								}
-								temp=maxLife;
-								maxLife=minShelfLife;
-								minShelfLife=temp;
-							}
-							if("Y".equalsIgnoreCase(mapplicable) || "C".equalsIgnoreCase(mnature))
-							{
-								sql2="select unit from item where item_code = ?";
-								pstmt2 = conn.prepareStatement(sql2);
-								pstmt2.setString(1, mitemCode);
-								rs2 = pstmt2.executeQuery();
-								if (rs2.next())
-								{
-									munit = rs2.getString("unit");
-								}
-								rs2.close();
-								rs2 = null;
-								pstmt2.close();
-								pstmt2 = null;
-								
-								sql2="select round, round_to from uom  where unit = ?";
-								pstmt2 = conn.prepareStatement(sql2);
-								pstmt2.setString(1, munit);
-								rs2 = pstmt2.executeQuery();
-								if (rs2.next())
-								{
-									round = rs2.getString("round");
-									roundToStr = rs2.getString("round_to");
-								}
-								rs2.close();
-								rs2 = null;
-								pstmt2.close();
-								pstmt2 = null;
-								if(round ==null || round.trim().length()==0)
-								{
-									round="N";
-								}
-								if(roundToStr ==null || roundToStr.trim().length()==0)
-								{
-									roundTo=0.001;
-								}else
-								{
-									roundTo=Double.parseDouble(roundToStr);
-								}
-								mqty=geRndamt(mqty,round,roundTo);
-								
-								incrmlevel++;
-								mlevel=String.valueOf(incrmlevel)+".";
-								 sql="insert into sorditem "
-					                        + " (exp_lev, sale_order, line_no, site_code, item_code__ord," 
-					                        + " item_flag,unit__ord,qty_ord,item_code__ref,unit__ref,qty_ref,item_code,item_ref,"
-					                        + "quantity,unit, line_type,min_shelf_life,max_shelf_life,nature," +
-					                        "order_date,order_type,dsp_date,rate , "
-					                      //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
-					                        +" qty_alloc, qty_desp )"
-					                      //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
-					                        + " values "
-					                        + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-					                pstmt2=conn.prepareStatement(sql);
-					                pstmt2.setString(1,expLev+mlevel);
-					                pstmt2.setString(2,saleOrder);
-					                pstmt2.setString(3,lineNo);
-					                pstmt2.setString(4,siteCode);
-					                pstmt2.setString(5,itemCodeOrd);
-					                pstmt2.setString(6,itemFlag);
-					                pstmt2.setString(7,unitOrd);
-					                pstmt2.setDouble(8,qtyOrd);
-					                pstmt2.setString(9,itemCode);
-					                pstmt2.setString(10,unit);
-					                pstmt2.setDouble(11,quantity);
-					                pstmt2.setString(12,mitemCode);
-					                pstmt2.setString(13,mitemRef);
-					                pstmt2.setDouble(14,mqty);
-					                pstmt2.setString(15,munit);
-					                pstmt2.setString(16,mexptype);
-					                pstmt2.setDouble(17,minShelfLife);
-					                pstmt2.setDouble(18,maxLife);
-					                pstmt2.setString(19,mnature);
-					                pstmt2.setTimestamp(20,orderDate);
-					                pstmt2.setString(21,orderType);
-					                pstmt2.setTimestamp(22,dspDate);
-					                pstmt2.setDouble(23,rate);
-					              //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
-					                pstmt2.setString(24,"0");
-					                pstmt2.setString(25,"0");
-					              //Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[end]
-					                insertCnt= pstmt2.executeUpdate();
-					                pstmt2.close();
-					                pstmt2=null;
-					                
+
+					else
+					{
+						System.out.println("mqty S:::"+mqty);
+						mqty=quantity;
+
+						sql2="select unit from item where item_code = ?";
+						pstmt2 = conn.prepareStatement(sql2);
+						pstmt2.setString(1, mitemCode);
+						rs2 = pstmt2.executeQuery();
+						if (rs2.next())
+						{
+							munit = rs2.getString("unit");
+						}
+						rs2.close();
+						rs2 = null;
+						pstmt2.close();
+						pstmt2 = null;
+					}
+					sql2="select count(*) from item where item_code = ?";
+					pstmt2 = conn.prepareStatement(sql2);
+					pstmt2.setString(1, mitemCode);
+					rs2 = pstmt2.executeQuery();
+					if (rs2.next())
+					{
+						mcnt=rs2.getInt(1);
+					}
+					rs2.close();
+					rs2 = null;
+					pstmt2.close();
+					pstmt2 = null;
+					if(mcnt==0)
+					{
+						sql2="select count(*) from bom where bom_code = ?";
+						pstmt2 = conn.prepareStatement(sql2);
+						pstmt2.setString(1, mitemCode);
+						rs2 = pstmt2.executeQuery();
+						if (rs2.next())
+						{
+							mcnt=rs2.getInt(1);
+						}
+						rs2.close();
+						rs2 = null;
+						pstmt2.close();
+						pstmt2 = null;
+						if(mcnt !=0)
+						{
+							mexptype="B";
+						}else
+						{
+							merrstr = "VTITEM1";
+						}
+					}
+					else
+					{
+						sql2="select item_stru from item where item_code = ?";
+						pstmt2 = conn.prepareStatement(sql2);
+						pstmt2.setString(1, mitemCode);
+						rs2 = pstmt2.executeQuery();
+						if (rs2.next())
+						{
+							mexptype = rs2.getString("item_stru");
+							System.out.println("mexptype"+mexptype);
+						}
+						rs2.close();
+						rs2 = null;
+						pstmt2.close();
+						pstmt2 = null;
+						if(!"F".equalsIgnoreCase(mexptype))
+						{
+							mexptype="I";
+						}
+					}
+					//PICKING MIN SHELF LIFE OF ITEM AND INSERTING IN SORDITEM IF MIN LIFE
+					sql2="select min_shelf_life from customeritem where cust_code =  ? and item_code = ?";
+					pstmt2 = conn.prepareStatement(sql2);
+					pstmt2.setString(1, custCode);
+					pstmt2.setString(2, mitemCode);
+					rs2 = pstmt2.executeQuery();
+					if (rs2.next())
+					{
+						minShelfLife = rs2.getDouble("min_shelf_life");
+					}
+					rs2.close();
+					rs2 = null;
+					pstmt2.close();
+					pstmt2 = null;
+					if(minShelfLife==0)
+					{
+						sql2="select min_shelf_life from item where item_code = ?";
+						pstmt2 = conn.prepareStatement(sql2);
+						pstmt2.setString(1, mitemCode);
+						rs2 = pstmt2.executeQuery();
+						if (rs2.next())
+						{
+							minShelfLife = rs2.getDouble("min_shelf_life");
+						}
+						rs2.close();
+						rs2 = null;
+						pstmt2.close();
+						pstmt2 = null;
+					}
+
+					sql2="select order_type  from sorder where sale_order = ?";
+					pstmt2 = conn.prepareStatement(sql2);
+					pstmt2.setString(1, saleOrder);
+					rs2 = pstmt2.executeQuery();
+					if (rs2.next())
+					{
+						orderType = rs2.getString("order_type");
+					}
+					rs2.close();
+					rs2 = null;
+					pstmt2.close();
+					pstmt2 = null;
+					if("NE".equalsIgnoreCase(orderType))
+					{
+						sql2="select (case when no_sales_month is null then 0 else no_sales_month end)  as ll_max_life " +
+								"from item where item_code = ?";
+						pstmt2 = conn.prepareStatement(sql2);
+						pstmt2.setString(1, mitemCode);
+						rs2 = pstmt2.executeQuery();
+						if (rs2.next())
+						{
+							maxLife = rs2.getDouble("ll_max_life");
+						}
+						rs2.close();
+						rs2 = null;
+						pstmt2.close();
+						pstmt2 = null;
+						if(maxLife==0)
+						{
+							nearExpShelfLife = distCommon.getDisparams("999999", "NEAR_EXP_SHELF_LIFE", conn);
+							try {
+								maxLife = Long.parseLong(nearExpShelfLife);
+							} catch (NumberFormatException nfe) {
+								System.out.println("NumberFormatException: " + nfe.getMessage());
 							}
+						}
+						temp=maxLife;
+						maxLife=minShelfLife;
+						minShelfLife=temp;
+					}
+					if("Y".equalsIgnoreCase(mapplicable) || "C".equalsIgnoreCase(mnature))
+					{
+						sql2="select unit from item where item_code = ?";
+						pstmt2 = conn.prepareStatement(sql2);
+						pstmt2.setString(1, mitemCode);
+						rs2 = pstmt2.executeQuery();
+						if (rs2.next())
+						{
+							munit = rs2.getString("unit");
+						}
+						rs2.close();
+						rs2 = null;
+						pstmt2.close();
+						pstmt2 = null;
+
+						sql2="select round, round_to from uom  where unit = ?";
+						pstmt2 = conn.prepareStatement(sql2);
+						pstmt2.setString(1, munit);
+						rs2 = pstmt2.executeQuery();
+						if (rs2.next())
+						{
+							round = rs2.getString("round");
+							roundToStr = rs2.getString("round_to");
+						}
+						rs2.close();
+						rs2 = null;
+						pstmt2.close();
+						pstmt2 = null;
+						if(round ==null || round.trim().length()==0)
+						{
+							round="N";
+						}
+						if(roundToStr ==null || roundToStr.trim().length()==0)
+						{
+							roundTo=0.001;
+						}else
+						{
+							roundTo=Double.parseDouble(roundToStr);
+						}
+						mqty=geRndamt(mqty,round,roundTo);
+
+						incrmlevel++;
+						mlevel=String.valueOf(incrmlevel)+".";
+						sql="insert into sorditem "
+								+ " (exp_lev, sale_order, line_no, site_code, item_code__ord," 
+								+ " item_flag,unit__ord,qty_ord,item_code__ref,unit__ref,qty_ref,item_code,item_ref,"
+								+ "quantity,unit, line_type,min_shelf_life,max_shelf_life,nature," +
+								"order_date,order_type,dsp_date,rate , "
+								//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
+								+" qty_alloc, qty_desp )"
+								//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
+								+ " values "
+								+ "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+						pstmt2=conn.prepareStatement(sql);
+						pstmt2.setString(1,expLev+mlevel);
+						pstmt2.setString(2,saleOrder);
+						pstmt2.setString(3,lineNo);
+						pstmt2.setString(4,siteCode);
+						pstmt2.setString(5,itemCodeOrd);
+						pstmt2.setString(6,itemFlag);
+						pstmt2.setString(7,unitOrd);
+						pstmt2.setDouble(8,qtyOrd);
+						pstmt2.setString(9,itemCode);
+						pstmt2.setString(10,unit);
+						pstmt2.setDouble(11,quantity);
+						pstmt2.setString(12,mitemCode);
+						pstmt2.setString(13,mitemRef);
+						pstmt2.setDouble(14,mqty);
+						pstmt2.setString(15,munit);
+						pstmt2.setString(16,mexptype);
+						pstmt2.setDouble(17,minShelfLife);
+						pstmt2.setDouble(18,maxLife);
+						pstmt2.setString(19,mnature);
+						pstmt2.setTimestamp(20,orderDate);
+						pstmt2.setString(21,orderType);
+						pstmt2.setTimestamp(22,dspDate);
+						pstmt2.setDouble(23,rate);
+						//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[start]
+						pstmt2.setString(24,"0");
+						pstmt2.setString(25,"0");
+						//Changed by Manish on 12/09/16 for allocated quantity and despatch quantity[end]
+						insertCnt= pstmt2.executeUpdate();
+						pstmt2.close();
+						pstmt2=null;
+
 					}
-					
 				}
-				rs1.close();
-				rs1 = null;
-				pstmt1.close();
-				pstmt1 = null;
 
-		
+			}
+			rs1.close();
+			rs1 = null;
+			pstmt1.close();
+			pstmt1 = null;
+
+
 			rs.close();
 			rs = null;
 			pstmt.close();
@@ -2462,14 +2660,14 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			System.out.println("Exception :"+e);
 			throw new ITMException(e);
 		}
-	    return returnValue;
-    }
+		return returnValue;
+	}
 	private double geRndamt(double netAmt, String round, double roundTo)
-    {
-	    // TODO Auto-generated method stub
+	{
+		// TODO Auto-generated method stub
 		double rndAmt=0.0,multiply=1,unrAmt=0;
 		try
-        {
+		{
 			if(netAmt<0)
 			{
 				netAmt=abs(netAmt);
@@ -2494,7 +2692,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 				}
 			}else if("P".equalsIgnoreCase(round))
 			{
-					rndAmt=netAmt-(netAmt%roundTo);
+				rndAmt=netAmt-(netAmt%roundTo);
 			}else if("R".equalsIgnoreCase(round))
 			{
 				if(netAmt%roundTo<roundTo/2)
@@ -2508,17 +2706,17 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 			{
 				rndAmt=netAmt;
 			}
-	        
-        } catch (Exception e)
-        {
-	        // TODO: handle exception
-        }
-		
-	    return rndAmt;
-    }
+
+		} catch (Exception e)
+		{
+			// TODO: handle exception
+		}
+
+		return rndAmt;
+	}
 	private double abs(double netAmt)
-    {
-	    // TODO Auto-generated method stub
-	    return 0;
-    }
+	{
+		// TODO Auto-generated method stub
+		return 0;
+	}
 }
\ No newline at end of file