updated for adduser and chguser

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

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

@@ -23,6 +23,7 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 import java.util.StringTokenizer;
 
 import javax.ejb.Stateless;
@@ -708,7 +709,10 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 		java.util.Date chkDate1 = null;
 		String prvDeptCode = null,deptCode ="";
 		String locGroupJwiss="";
-		String subSQL="";
+		String subSQL="",gdistOrder="";
+		 List<String> addUsers = new ArrayList<String>();
+		 List<String> gdistOrders = new ArrayList<String>();
+		 
 		try
 		{   
 			sdf=new SimpleDateFormat(genutility.getApplDateFormat());
@@ -744,13 +748,16 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 				
 				
 				
-				sql = "select add_user from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and dist_order = ?";
+				sql = "select add_user,dist_order from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and dist_order = ?";
 				pstmt=conn.prepareStatement(sql);
 				pstmt.setString(1,distOrder);
 				rs = pstmt.executeQuery();
-				if(rs.next())
+				while(rs.next())
 				{
 					addUser = rs.getString("add_user")==null?"":rs.getString("add_user").trim();
+					addUsers.add(addUser);
+					gdistOrder = rs.getString("dist_order")==null?"":rs.getString("dist_order").trim();
+					gdistOrders.add(gdistOrder);
 				}
 				pstmt.close();
 				rs.close();
@@ -773,14 +780,27 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 				rs.close();
 				pstmt = null;
 				rs = null;
-
+				chgUser = chgUser.trim();
 
 				if(cnt > 0)
 				{
-					if(currentColumn.trim().equalsIgnoreCase("itm_default") && addUser.equalsIgnoreCase(chgUser))
+					if(currentColumn.trim().equalsIgnoreCase("itm_default"))
+					{
+						System.out.println("in itm default for check itm_default>>>>>>"+addUser+">>>>>>"+chgUser);
+						if(addUsers.contains(chgUser))
+						{
+							
+							for(int i = 0;i < addUsers.size(); i++)
+							{
+								
+								addUser = addUsers.get(i);
+								System.out.println("addUser>>>>>>>>>>>LL"+addUser);
+								
+								if(chgUser.equalsIgnoreCase(addUser))
 								{
 
 									
+									System.out.println("in itm default for checked itm_default");
 								        sql =   "SELECT SITE_A.DESCR,SITE_B.DESCR,LOCATION.DESCR,DISTORD_ISS.TRAN_ID,DISTORD_ISS.TRAN_DATE,DISTORD_ISS.EFF_DATE,DISTORD_ISS.DIST_ORDER,DISTORD_ISS.SITE_CODE,DISTORD_ISS.SITE_CODE__DLV,"
 										+"DISTORD_ISS.DIST_ROUTE,DISTORD_ISS.TRAN_CODE,DISTORD_ISS.LR_NO,DISTORD_ISS.LR_DATE,DISTORD_ISS.LORRY_NO,DISTORD_ISS.GROSS_WEIGHT,"
 										+"DISTORD_ISS.TARE_WEIGHT,DISTORD_ISS.NET_WEIGHT,DISTORD_ISS.FRT_AMT,DISTORD_ISS.AMOUNT,DISTORD_ISS.TAX_AMT,DISTORD_ISS.NET_AMT,DISTORD_ISS.REMARKS,"
@@ -803,7 +823,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 										+"DISTORD_ISS.TRAN_CODE=TRANSPORTER.TRAN_CODE(+)) AND ( "
 										+"DISTORD_ISS.CURR_CODE__FRT=CURRENCY_B.CURR_CODE(+)) AND (" 
 										+"DISTORD_ISS.SITE_CODE__BIL=SITE_C.SITE_CODE(+)) AND "
-								+"DISTORD_ISS.DIST_ORDER    = '"+distOrder+"'";
+										+"DISTORD_ISS.DIST_ORDER    = '"+distOrder+"' AND DISTORD_ISS.ADD_USER = '"+addUser+"'";
 
 
 
@@ -907,11 +927,17 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 								rs.close();
 								pstmt = null;
 								rs = null;
+							
+								}
+								
+							}
+							
+							
+							
 					}
 						else
 						{
 
-
                                     sql="SELECT D.DIST_ORDER AS DIST_ORDER,D.ORDER_DATE AS ORDER_DATE,D.SITE_CODE__SHIP AS SITE_CODE__SHIP,D.SITE_CODE__DLV AS SITE_CODE__DLV,D.SHIP_DATE AS SHIP_DATE,D.DUE_DATE AS DUE_DATE,D.REMARKS AS REMARKS,"
 									+" D.DIST_ROUTE AS DIST_ROUTE,D.PRICE_LIST AS PRICE_LIST,D.CONFIRMED AS CONFIRMED,D.CHG_USER AS CHG_USER,D.CHG_TERM AS CHG_TERM,D.TARGET_WGT AS TARGET_WGT,D.TARGET_VOL AS TARGET_VOL,D.LOC_CODE__GIT AS LOC_CODE__GIT,"
 									+" D.CHG_DATE AS CHG_DATE,SITE_A.DESCR AS SITEA_DESCR,SITE_B.DESCR AS SITEB_DESCR,LOCATION.DESCR AS LOCATION_DESCR,D.CONF_DATE AS CONF_DATE,D.SITE_CODE AS SITE_CODE,D.STATUS AS STATUS,D.SALE_ORDER AS SALE_ORDER,"
@@ -1027,7 +1053,13 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							rs = null;
 
 						
+						
+						
+						
 						}
+						
+					}
+					
 				}
 				else   
 				{
@@ -1222,6 +1254,58 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 				distOrder = genericUtility.getColumnValue("dist_order1", dom1);
 				System.out.println("tran val"+tranid+"dist_order1>>>"+distOrder);
 
+				
+				sql = "select add_user,dist_order from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and dist_order = ?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1,distOrder);
+				rs = pstmt.executeQuery();
+				while(rs.next())
+				{
+					addUser = rs.getString("add_user")==null?"":rs.getString("add_user").trim();
+					addUsers.add(addUser);
+					gdistOrder = rs.getString("dist_order")==null?"":rs.getString("dist_order").trim();
+					gdistOrders.add(gdistOrder);
+				}
+				pstmt.close();
+				rs.close();
+				pstmt = null;
+				rs = null;
+				
+				
+				
+				if(addUsers.contains(chgUser))
+				{
+					for(int i = 0;i < addUsers.size(); i++)
+					{
+						
+						addUser = addUsers.get(i);
+						System.out.println("addUser>>>>>"+addUser);
+						
+						if(chgUser.equalsIgnoreCase(addUser))
+						{
+							sql = "select tran_id from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and dist_order = ? and add_user = ?";
+							pstmt1=conn.prepareStatement(sql);
+							pstmt1.setString(1,distOrder);
+							pstmt1.setString(2,addUser);
+							rs1 = pstmt1.executeQuery();
+							if(rs1.next())
+							{
+
+								tranid = rs1.getString(1) == null ? "":rs1.getString(1);
+
+							}
+							pstmt1.close();
+							rs1.close();
+							pstmt1 = null;
+							rs1 = null;
+						}
+					}
+					
+					
+				}
+				else
+				{
+					
 					sql = "select tran_id from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and dist_order = ?";
 					pstmt1=conn.prepareStatement(sql);
 					pstmt1.setString(1,distOrder);
@@ -1237,11 +1321,21 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 					pstmt1 = null;
 					rs1 = null;	
 					
+				
+					
+				}
+
+				
 				System.out.println("tranid FROM QUERY"+tranid);
 				
+				
+				chgUser = chgUser.trim();
 				if(currentColumn.trim().equalsIgnoreCase("itm_default"))
 				{
+					System.out.println("in itm default for>>> check itm_default");
+					System.out.println("FIND CHK ...>>>>>>.."+addUser+">>>>>>"+chgUser);
 					
+						System.out.println("in itm default for checkcccc itm_default");
 						sql = 	 "SELECT item.descr,location.descr,"   
 								+"distord_issdet.tran_id,"   
 								+"distord_issdet.line_no,"   
@@ -1297,6 +1391,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 								+"WHERE ( distord_issdet.item_code = item.item_code ) and "  
 								+"( distord_issdet.loc_code = location.loc_code ) and "  
 								+"( distord_issdet.dist_order = distorder_det.dist_order ) and "  
+								+"( distord_issdet.line_no_dist_order = distorder_det.line_no ) and "  
 								+" distord_issdet.tran_id = '"+tranid+"'";
 
 						pstmt = conn.prepareStatement(sql);