W15FSUN008, Updated class file for Palletization for line no.

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

webitm-wms/ibase/webitm/ejb/wms/PalletizationIC.java

@@ -1049,7 +1049,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							valueXmlString.append( "<tran_id><![CDATA[" ).append( tranId ).append( "]]></tran_id>\r\n" );
 							valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
 							valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
-							valueXmlString.append( "<item_descr><![CDATA[" ).append( descr ).append( "]]></item_descr>\r\n" );
+							valueXmlString.append( "<item_descr><![CDATA[" ).append("(" + descr + ")").append( "]]></item_descr>\r\n" );
 							valueXmlString.append( "<site_code><![CDATA[" ).append( loginSite ).append( "]]></site_code>\r\n" );
 							valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
 							valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
@@ -1065,43 +1065,45 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 					}
 				}
 				
+				/*sql = "select max(line_no)+1 as line_no from pallet_det where tran_id = ? ";	
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, tranId);				
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{ 							
+					lineNo = rs.getInt("line_no");	
+				}
+				if(pstmt != null) { pstmt.close(); pstmt = null; }
+		        if(rs != null) { rs.close(); rs = null; }
+		        
+		        if(lineNo == 0)
+		        {
+		        	lineNo = 1;
+		        }*/
+		        
 				if(currentColumn.trim().equalsIgnoreCase("itm_default_add"))
 				{	
 					System.out.println("--------------inside itm_default_add  ----------------------");
 
+					lineNo = getMaxLineNo(tranId, conn);
 					if( tranId != null && tranId.trim().length() > 0 )
 					{	
-						sql = "select max(line_no)+1 as line_no from pallet_det where tran_id = ? ";	
-						pstmt = conn.prepareStatement(sql);
-						pstmt.setString(1, tranId);				
-						rs = pstmt.executeQuery();
-						if(rs.next())
-						{ 							
-							lineNo = rs.getInt("line_no");	
-						}
-						if(pstmt != null) { pstmt.close(); pstmt = null; }
-				        if(rs != null) { rs.close(); rs = null; }
-				        
-				        if(lineNo == 0)
-				        {
-				        	lineNo = 1;
-				        }
 						
 				        valueXmlString.append("<Detail3 domID='"+lineNo+"' selected=\"N\">\r\n");
 						valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
 						
 						valueXmlString.append( "<tran_id><![CDATA[" ).append( tranId ).append( "]]></tran_id>\r\n" );
-						valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
+						
 					}
 					else
 					{
-						valueXmlString.append("<Detail3 domID='"+domID+"' selected=\"N\">\r\n");
+						valueXmlString.append("<Detail3 domID='"+lineNo+"' selected=\"N\">\r\n");
 						valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
 						
 						valueXmlString.append( "<tran_id><![CDATA[]]></tran_id>\r\n" );
-						valueXmlString.append( "<line_no><![CDATA[]]></line_no>\r\n" );
+						//valueXmlString.append( "<line_no><![CDATA[]]></line_no>\r\n" );
 					}
-					
+					valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
 					valueXmlString.append( "<item_code><![CDATA[]]></item_code>\r\n" );
 					valueXmlString.append( "<item_descr><![CDATA[]]></item_descr>\r\n" );
 					valueXmlString.append( "<site_code><![CDATA[" ).append( loginSite ).append( "]]></site_code>\r\n" );
@@ -1116,12 +1118,15 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 					
 				}
 				
-				else if(currentColumn.trim().equalsIgnoreCase("lot_sl"))
+				if(currentColumn.trim().equalsIgnoreCase("lot_sl"))
 				{
 					System.out.println("--------------inside lot_sl  ----------------------");
 					
+					lineNo = getMaxLineNo(tranId, conn);
+					
 					sql = "select s.item_code, i.descr, s.quantity, s.unit, s.no_art, s.loc_code from stock s, item i " 
-						+ "where s.lot_no = ? and s.lot_sl = ? and s.site_code =  ? and (s.quantity - (s.alloc_qty + s.hold_qty ))  > 0 " 
+						+ "where s.lot_no = ? and s.lot_sl = ? and s.site_code =  ? " 
+						+ "and (s.quantity - (s.alloc_qty + s.hold_qty ))  > 0 " 
 						+ "and s.item_code = i.item_code ";	
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, lotNo);
@@ -1139,10 +1144,6 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 
 						if( tranId != null && tranId.trim().length() > 0 )
 						{
-							if(lineNo == 0)
-					        {
-					        	lineNo = 1;
-					        }
 							
 							valueXmlString.append("<Detail3 domID='"+lineNo+"' selected=\"N\">\r\n");
 							valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
@@ -1152,15 +1153,15 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 						}
 						else
 						{
-							valueXmlString.append("<Detail3 domID='"+domID+"' selected=\"N\">\r\n");
+							valueXmlString.append("<Detail3 domID='"+lineNo+"' selected=\"N\">\r\n");
 							valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
 							
 							valueXmlString.append( "<tran_id><![CDATA[" ).append( "" ).append( "]]></tran_id>\r\n" );
-							valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
+							valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\r\n" );
 						}
 
 						valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
-						valueXmlString.append( "<item_descr><![CDATA[" ).append("(" + descr + ")").append( "]]></item_descr>\r\n" );
+						valueXmlString.append( "<item_descr><![CDATA[" ).append( descr ).append( "]]></item_descr>\r\n" );
 						valueXmlString.append( "<site_code><![CDATA[" ).append( loginSite ).append( "]]></site_code>\r\n" );
 						valueXmlString.append( "<loc_code><![CDATA[" ).append( locCode ).append( "]]></loc_code>\r\n" );
 						valueXmlString.append( "<lot_no><![CDATA[" ).append( lotNo ).append( "]]></lot_no>\r\n" );
@@ -1237,6 +1238,32 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 		return inputVal;
 	}
 
+	private int getMaxLineNo ( String tranId, Connection conn) throws Exception
+	{	
+		
+		ResultSet rs = null;
+		PreparedStatement pstmt = null;
+		String sql = "";
+		int lineNo = 0;
+		
+		sql = "select max(line_no)+1 as line_no from pallet_det where tran_id = ? ";
+		pstmt = conn.prepareStatement(sql);
+		pstmt.setString(1, tranId);		
+		rs= pstmt.executeQuery();
+		if(rs.next())
+		{
+			lineNo = rs.getInt("line_no");	
+		}
+		if(pstmt != null) { pstmt.close(); pstmt = null; }
+        if(rs != null) { rs.close(); rs = null; }
+		
+		if(lineNo == 0)
+        {
+        	lineNo = 1;
+        }
+
+		return lineNo;
+	}
 	/*private boolean isScanningDone(String tranId, String itemCode, String loginSite, String locationCode, String lotNo, String lotSl, String palletNo, Connection conn) throws ITMException,Exception	
 	{
 		ResultSet rs = null;