Updated ejb component for cust stock itemchange

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

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

@@ -110,14 +110,15 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 		{	
 			ConnDriver connDriver = new ConnDriver();			
 			//Changes and Commented By Bhushan on 09-06-2016 :START
-			//conn = connDriver.getConnectDB("DriverITM");
-			conn = getConnection();
+			conn = connDriver.getConnectDB("DriverITM");
+			//conn = getConnection();
 			//Changes and Commented By Bhushan on 09-06-2016 :END 
 			connDriver = null;
 			connDriver = new ConnDriver();
 			//Changes and Commented By Bhushan on 09-06-2016 :START
 			//connCP = connDriver.getConnectDB("DriverCP");
-			connCP = getConnection();
+			connCP = connDriver.getConnectDB("DriverITM");
+			//connCP = getConnection();
 			//Changes and Commented By Bhushan on 09-06-2016 :END
 			connDriver = null;
 			//stmt = conn.createStatement();//Removed Resultset Sensitive Type // To be Updated in Server - Jiten - 
@@ -197,6 +198,8 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 					{
 						orderType = "%";
 					}
+					
+					System.out.println("dateFlag:::["+dateFlag+"]");
 					/*sql =" SELECT B.ITEM_CODE ,SUM(B.QUANTITY - B.QTY_DESP),C.DESCR ,C.UNIT ,"+
 						" C.LOC_TYPE FROM SORDITEM B , ITEM C ,SORDER A"+
 						" WHERE A.SALE_ORDER = B.SALE_ORDER"+ 
@@ -764,6 +767,8 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 							pstmt1.close();
 							pstmt1 = null;
 							// changed by pankaj on 19.02.09 to bring valuexml string out of while(rsScd.next()) loop
+							System.out.println("ASSOCIATE count["+count+"]");
+							
 							for(int i = 0; i < count; i++)
 							{
 								if(i == 2)
@@ -772,12 +777,12 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 								}
 								System.out.println("clStk:"+clStk+":");
 								valueXmlString.append("<Detail>\r\n");
-								valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode==null?"":itemCode).append("]]>").append("</item_code>\r\n");
+								valueXmlString.append("<item_code>").append("<![CDATA[").append(itemCode==null?"":itemCode).append("]]>").append("</item_code>\r\n");
 								valueXmlString.append("<descr isSrvCallOnChg='0'>").append("<![CDATA[").append(itemDescr).append("]]>").append("</descr>\r\n");
 								valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n");
 								valueXmlString.append("<loc_type isSrvCallOnChg='0'>").append("<![CDATA[").append(locType).append("]]>").append("</loc_type>\r\n");
 								valueXmlString.append("<item_ser isSrvCallOnChg='0'>").append("<![CDATA[").append(itemSer).append("]]>").append("</item_ser>\r\n");
-								valueXmlString.append("<cl_stock isSrvCallOnChg='0'>").append("<![CDATA[").append(clStk).append("]]>").append("</cl_stock>\r\n");
+								valueXmlString.append("<cl_stock>").append("<![CDATA[").append(clStk).append("]]>").append("</cl_stock>\r\n");
 								if (tranId != null)	     // if condition added in 23/05/06 - jiten
 								{
 									valueXmlString.append("<tran_id isSrvCallOnChg='0'>").append("<![CDATA[").append(tranId).append("]]>").append("</tran_id>\r\n");

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

@@ -418,6 +418,8 @@ public class CustStockAct extends ActionHandlerEJB implements CustStockActLocal,
 			}
 			catch (Exception se){}
 		}
+		
+		System.out.println("valueXmlString11111111..." + valueXmlString);
 		return valueXmlString.toString();
 	} 
 	
@@ -564,7 +566,8 @@ public class CustStockAct extends ActionHandlerEJB implements CustStockActLocal,
 				pstmt = null;
 
 				strBuff.append( "<op_stock>" ).append( mopStk ).append( "</op_stock>" ); 
-				strBuff.append( "<cl_stock>" ).append( mopStk ).append( "</cl_stock>" ); 
+				
+				//strBuff.append( "<cl_stock>" ).append( mopStk ).append( "</cl_stock>" ); 
 					  				
 				sql = "select sum(b.quantity__stduom) qty_stduom from invoice a, invdet b "
 					  +"	where a.invoice_id = b.invoice_id "
@@ -593,6 +596,8 @@ public class CustStockAct extends ActionHandlerEJB implements CustStockActLocal,
 				pstmt.close();
 				pstmt = null;
 				
+				double purcRcp = mquant;
+
 				strBuff.append( "<purc_rcp>" ).append( mquant ).append( "</purc_rcp>" ); 
 								
 				mquant = 0.0;
@@ -612,7 +617,7 @@ public class CustStockAct extends ActionHandlerEJB implements CustStockActLocal,
 				
 				if( rs.next() )
 				{	
-					mquant = rs.getDouble( "qty_stduom" );
+					mquant = rs.getDouble("qty_stduom");
 				}
 				else
 				{
@@ -626,9 +631,17 @@ public class CustStockAct extends ActionHandlerEJB implements CustStockActLocal,
 				strBuff.append( "<purc_ret>" ).append( mquant ).append( "</purc_ret>" ); 
 				strBuff.append( "<tran_id>" ).append( kFld1 ).append( "</tran_id>" ); 
 				
+				System.out.println("Auto stock mopStk::::["+mopStk+"]purcRcp["+purcRcp+"]mquant["+mquant+"]");
+				double clStk = mopStk + purcRcp - mquant;
+				
+				System.out.println("Auto stock clStk::::["+clStk+"]");
+				strBuff.append( "<cl_stock>" ).append( clStk ).append( "</cl_stock>" ); 
+									
 				strBuff.append( "</Detail>" );
 			}
 		//}
+			
+			System.out.println("strBuff1111111..." + strBuff);
 		return strBuff;
 	}
 	private ArrayList gbfGetDefaultData( String asCustCode, String asItmSer, String asSiteCode, Connection conn )
@@ -735,6 +748,8 @@ public class CustStockAct extends ActionHandlerEJB implements CustStockActLocal,
 			}catch( Exception e ){ e.printStackTrace(); }
 		}
 		//return strBuff.toString();
+		
+		System.out.println("defData111111..." + defData);
 		return defData;
 	}
 	private class ItemDescr

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

@@ -70,7 +70,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 			      " ( CUST_STOCK.CUST_CODE = CUSTOMER.CUST_CODE ) and   " +
 			      " ( ( cust_stock.tran_id >= ? ) AND  " +
 			      " ( cust_stock.tran_id <= ? ) AND " + 
-			      " ( CUST_STOCK.STATUS <> 'Y' ) AND  " +
+			      " ( CUST_STOCK.STATUS = 'S' ) AND  " +
 			      " ( cust_stock.confirmed = 'Y' ) )";
 				  pstmt = conn.prepareStatement(sql);
 				  pstmt.setString(1, tranId);
@@ -419,6 +419,23 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 				}
 				rs.close();rs = null;
 				pstmt.close();pstmt = null;
+				
+				
+				
+				if(asType == null  || asType.trim().length() == 0)
+				{
+					asType = distCommon.getDisparams("999999", "REPL_OPT", conn);
+					
+					if(asType == null  || asType.trim().length() == 0)
+					{
+						asType = "S";
+					}
+					if("NULLFOUND".equalsIgnoreCase(asType))
+					{
+						mvarValue = "S";
+					}
+				}
+				System.out.println("asType:::::["+asType +"]asType["+asType+"]");
   			}
 			if(asType != null && asType.trim().length() > 0)
   			{
@@ -656,10 +673,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 			System.out.println("astype >> "+asType);
 			
 					
-			
-			
-			
-				
 			sqlDet = " select  item_code , loc_type , line_no , item_ser , unit , sales ,  rate ," +
 				     " case when ? = 'P' then cl_stock else (cl_stock + transit_qty) end as mclStock,cust_item__ref " +
 				     " from cust_stock_det where tran_id = ?  " ;
@@ -939,7 +952,6 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 						
 						mclStock = mminQty - mclStock ;						
 						
-						
 						System.out.println("In !P ELSE mclStock...."+mclStock);
 						sql = "update cust_stock_det set demand_qty = ? where  tran_id = ? and line_no = ? ";
 						pstmt = conn.prepareStatement(sql);
@@ -961,6 +973,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 					}
 				}
 				
+				System.out.println("mclStock aftre delete cl_stock"+mclStock);
+				
 				sql = "select count(*) from  customeritem where cust_code = ? and 	 item_code = ?  " ;
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString( 1, custCode );
@@ -1372,11 +1386,11 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 								
 								if(mmodqty > 0)
 								{
-									perc = (mclStock/mintQty) + 1;
+									perc = Math.round((mclStock/mintQty)) + 1;
 								}
 								else
 								{
-									perc = (mclStock/mintQty);
+									perc = Math.round((mclStock/mintQty));
 								}
 								
 								mclStock = perc *  mintQty ;
@@ -1421,16 +1435,16 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 									
 									if(mmodqty < lcQty)
 									{
-										perc = (mclStock/mintQty) ;
+										perc = Math.round((mclStock/mintQty)) ;
 									}
 									else
 									{
-										perc = (mclStock/mintQty) + 1;
+										perc = Math.round((mclStock/mintQty)) + 1;
 									}
 								}
 								else
 								{
-									perc = (mclStock/mintQty) ;
+									perc = Math.round((mclStock/mintQty)) ;
 								}
 								
 								mclStock = perc * mintQty ;
@@ -1836,22 +1850,22 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 												System.out.println("mmodqty:::["+mmodqty+"]lcQty:::["+lcQty+"]");
 												if(mmodqty < lcQty)
 												{
-													perc = (mclStock/integralQty) ;
+													perc = Math.round((mclStock/integralQty)) ;
 												}
 												else
 												{
-													perc = (mclStock/integralQty) + 1;
+													perc = Math.round((mclStock/integralQty)) + 1;
 													System.out.println("perc:::"+perc+"]mclStock:::["+mclStock+"]");
 												}
 											}
 											else
 											{
-												perc = (mclStock/integralQty) + 1 ;
+												perc = Math.round((mclStock/integralQty)) + 1 ;
 											}
 										}
 										else
 										{
-											perc = (mclStock/integralQty) ;
+											perc = Math.round((mclStock/integralQty)) ;
 										}
 										mclStock = (perc * integralQty) ;
 										
@@ -2215,18 +2229,18 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 										System.out.println("mmodqty...."+mmodqty);
 										if(mmodqty > 0)
 										{
-											perc = (mclStock/integralQty)+1 ;
+											perc = Math.round((mclStock/integralQty))+1 ;
 										}
 										else
 										{
-											perc = (mclStock/integralQty) ;
+											perc = Math.round((mclStock/integralQty)) ;
 										}
 										System.out.println("perc...."+perc);
 										System.out.println("mclStock...."+mclStock+"integralQty/...."+integralQty);
 									}
 									else
 									{
-										perc = (mclStock/integralQty) ;
+										perc = Math.round((mclStock/integralQty)) ;
 									}
 									mclStock = perc * integralQty ;
 									System.out.println("mclStock///...."+mclStock+"integralQty...."+integralQty+"perc..."+perc);
@@ -2303,22 +2317,22 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 											System.out.println("lcQty.....>>"+lcQty);
 											if(mmodqty < lcQty)
 											{
-												perc = (mclStock/integralQty) ;
+												perc = Math.round((mclStock/integralQty)) ;
 											}
 											else
 											{
-												perc = (mclStock/integralQty) +1 ;
+												perc = Math.round((mclStock/integralQty)) +1 ;
 											}
 										}
 										else
 										{
-											perc = (mclStock/integralQty) +1 ;
+											perc = Math.round((mclStock/integralQty)) +1 ;
 										}
 					
 									}
 									else
 									{
-										perc = (mclStock/integralQty) ;
+										perc = Math.round((mclStock/integralQty)) ;
 									}
 									mclStock = perc * integralQty ;
 									System.out.println("mclStock mmodqty>>["+mclStock +"]perc["+perc+"]integralQty["+integralQty+"]");
@@ -2829,7 +2843,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 						w++;
 						tempList = null;
 					}
-					System.out.println("Count while loop outsiide"+cnt2);
+					System.out.println("Count while loop outside"+cnt2);
 				}
 			}
 			sql = "update cust_stock set status = 'Y' where tran_id = ? and status <> 'Y'";

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

@@ -42,21 +42,24 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 		PreparedStatement pstmt = null ;
 		String errString = null;
 		ResultSet rs = null;
-		String confirm = "", custCode = "",emailId = "",name = "",msgText= "",subText = "", mailRetStr = "";
+		String confirm = "", custCode = "",emailId = "",name = "",msgText= "",subText = "", mailRetStr = "",status= "";
+		int updCnt = 0;
 		Date tranDate = null;
 		try
 		{
 
-			ConnDriver connDriver  = new ConnDriver();
+			//ConnDriver connDriver  = new ConnDriver();
 			//conn = connDriver.getConnectDB("DriverITM");
 			conn = getConnection();
 			conn.setAutoCommit(false);
+			SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			SimpleDateFormat sdf2 = new SimpleDateFormat(genericUtility.getDispDateFormat());
 			
 			System.out.println("xtraParams"+xtraParams);
 			String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 			System.out.println("--login code--"+userId);
 
-			sql = " select confirmed,cust_code,tran_date from cust_stock where tran_id = ?";
+			sql = " select confirmed,cust_code,tran_date,status from cust_stock where tran_id = ?";
 			pstmt = conn.prepareStatement( sql );
 			pstmt.setString( 1, tranId.trim());
 			rs = pstmt.executeQuery();
@@ -65,16 +68,26 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 				confirm = rs.getString("confirmed");
 				custCode = rs.getString("cust_code");
 				tranDate = rs.getDate("tran_date");
+				status = rs.getString("status");
 			}
 			pstmt.close();
 			pstmt = null;				
 			rs.close();
 			rs = null;
 			
+			String tDate = sdf1.format(tranDate);
+			String tDate2 = sdf2.format(tranDate);
+			
+			System.out.println("tDate["+tDate+"]tDate2["+tDate2+"]");
+			
 			if( "Y".equalsIgnoreCase(confirm))
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTCONFMDSM","","",conn);
 			}
+			else if( "S".equalsIgnoreCase(status))
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTSUBM1AD","","",conn);
+			}
 			else
 			{
 				
@@ -102,8 +115,8 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 				subText = "Auto stock Replenishment generation["+tranId+"]" ;
 				
 				msgText = "Dear " + name +",\n\n "+ 
-						"\t\t Kindly check , verify and approve the Auto stock Replenishment for tran_id : "+tranId +" generated on "+tranDate +".\n"+
-						"\n\n"+ "Thanks and Regards,\n"+ userId +" .";
+						"\t\t Kindly check,verify and approve the Auto stock Replenishment for tran_id "+tranId +" generated on "+tDate+".\n"+
+						"\n\n"+ "Thanks and Regards,\n"+ userId ;
 				
 				System.out.println("msgText loop" + msgText);
 				
@@ -124,6 +137,12 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 				
 				if("S".equalsIgnoreCase(mailRetStr))
 				{
+					sql = "update cust_stock set status = 'S' where tran_id = ? and status <> 'S'";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, tranId);	
+					updCnt = pstmt.executeUpdate();
+					pstmt.close();pstmt = null;
+					System.out.println("updCnt status>>"+updCnt);									
 					errString = itmDBAccessEJB.getErrorString("","VTSUBM1","","",conn);
 				}
 			}