W15FSUN008, Updated class file for Palletization for DomId.

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

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

@@ -1025,10 +1025,10 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 				System.out.println("lotNo 1st ----------->>["+lotNo+"]");
 				System.out.println("lotSl 1st ----------->>["+lotSl+"]");
 				
-				NodeList nodeList = allFormDataDom.getElementsByTagName("Detail3");
+				/*NodeList nodeList = allFormDataDom.getElementsByTagName("Detail3");
 				System.out.println("sds : "+nodeList.item(0).getNodeName());
 				domID =  nodeList.item(0).getAttributes().getNamedItem("domID").getNodeValue();
-				System.out.println("domID ::::::::::::::::: "+domID);
+				System.out.println("domID ::::::::::::::::: "+domID);*/
 	
 				if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
 				{
@@ -1060,7 +1060,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 							locCode = checkNullAndTrim(rs.getString("loc_code"));	
 							allocQty = rs.getDouble("alloc_qty");
 							
-							valueXmlString.append("<Detail3 domID='"+domID+"' selected=\"Y\">\r\n");
+							valueXmlString.append("<Detail3 domID='"+lineNo+"' selected=\"Y\">\r\n");
 							valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); 
 	
 							valueXmlString.append( "<tran_id><![CDATA[" ).append( tranId ).append( "]]></tran_id>\r\n" );
@@ -1087,26 +1087,29 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 				{	
 					System.out.println("--------------inside itm_default_add  ----------------------");
 
+					lineNo = getMaxLineNo(tranId, palletNo, loginSite, conn);
+					System.out.println("lineNo in itm_default_add :::::::::::::: " + lineNo);
 					
-					if( tranId != null && tranId.trim().length() > 0 )
+					if( tranId != null && tranId.trim().length() > 0 ) // edit mode
 					{	
-						lineNo = getMaxLineNo(tranId, conn);
-				        valueXmlString.append("<Detail3 domID='"+lineNo+"' 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( tranId ).append( "]]></tran_id>\r\n" );
-						valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).append( "]]></line_no>\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='"+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[" ).append( domID ).append( "]]></line_no>\r\n" );
+						//valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
 					}
 					
+					valueXmlString.append( "<line_no><![CDATA[]]></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" );
@@ -1145,25 +1148,30 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 						locCode = checkNullAndTrim(rs.getString("loc_code"));	
 						allocQty = rs.getDouble("alloc_qty");
 						
+						lineNo = getMaxLineNo(tranId, palletNo, loginSite, conn);
+						System.out.println("lineNo in lot_sl :::::::::::::: " + lineNo);
+						
 						if( tranId != null && tranId.trim().length() > 0 )
 						{
-							lineNo = getMaxLineNo(tranId, conn);
+							
 							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" );
+							//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='"+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[]]></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[" ).append( itemCode ).append( "]]></item_code>\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" );
@@ -1234,7 +1242,7 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 		return inputVal;
 	}
 
-	private int getMaxLineNo(String tranId, Connection conn) throws Exception
+	private int getMaxLineNo(String tranId, String palletNo, String siteCode, Connection conn) throws Exception
 	{	
 		
 		ResultSet rs = null;
@@ -1242,24 +1250,45 @@ public class PalletizationIC extends ValidatorEJB implements PalletizationICLoca
 		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())
+		if( tranId != null && tranId.trim().length() > 0 ) // edit mode
+		{
+			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; }
+		}
+		else // add mode
 		{
-			lineNo = rs.getInt("line_no");	
+			sql = "select max(line_no)+1 as line_no from pallet_det det, pallet_hdr hdr where " 
+				+ " hdr.pallet_no = ? and hdr.confirmed = ? and hdr.site_code = ? and hdr.tran_id = det.tran_id ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, palletNo);		
+			pstmt.setString(2, "N");	
+			pstmt.setString(3, siteCode);	
+			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(pstmt != null) { pstmt.close(); pstmt = null; }
-        if(rs != null) { rs.close(); rs = null; }
+		
 		
 		if(lineNo == 0)
         {
         	lineNo = 1;
         }
-
+		System.out.println("return lineNo from getMaxLineNo :::::::::::::::::; "+lineNo);
 		return lineNo;
 	}
 	
+	
 }