POD Validation for line no trace, changes in line no trace pop help and...

POD Validation for line no trace, changes in line no trace pop help and Defaukt button logic. Change in coding default from inv_line_no to line_no.


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

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

@@ -473,9 +473,49 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 							errCode = "VTRMKSG";  //Remarks length exceed than specified.
 							errList.add( errCode );
 							errFields.add( childNodeName.toLowerCase() );	
+						}				
 						}
-						
-						
+					if (childNodeName.equalsIgnoreCase("line_no__trace"))
+					{
+						lineNoTrace = genericUtility.getColumnValue("line_no__trace", dom2);
+						System.out.println("Current Line no trace &&&&:-["+lineNoTrace+"]");
+						if (lineNoTrace == null || lineNoTrace.trim().length() <= 0)
+						{
+							errCode = "VTBLNKLNTR";// Duplicate line_no__trace
+							                       // for Sales Return.
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						} else
+						{
+							int length = dom2.getElementsByTagName("Detail2").getLength();
+							System.out.println("length  $$$$$$$ ="+length);
+							for (int i = 0; i < dom2.getElementsByTagName("Detail2").getLength()-1; i++)
+							{
+								updateStatus = checkNull(getCurrentUpdateFlag(dom2.getElementsByTagName("Detail2").item(i)));
+								System.out.println("Update Status $$$$$$$$$$:-["+updateStatus+"]");
+								if (!updateStatus.equalsIgnoreCase("D") && length > 1)
+								{
+									System.out.println("Enter in IF ");
+									lineNoTrace1 = checkNull(genericUtility.getColumnValueFromNode("line_no__trace", dom2.getElementsByTagName("Detail2").item(i))).trim();
+									System.out.println("Current Line no trace In loop &&&&:-["+lineNoTrace1+"]");
+									System.out.println("itemCode1======>" + lineNoTrace1);
+									if (lineNoTrace.equalsIgnoreCase(lineNoTrace1))
+									{
+										cntItem++;
+										System.out.println("cntItem==" + cntItem);
+									}
+								}
+								if (cntItem > 0)
+								{
+									errCode = "VTDUPILNTR";// Duplicate
+									                       // line_no__trace for
+									                       // Sales Return.
+									errList.add(errCode);
+									errFields.add(childNodeName.toLowerCase());
+								}
+							}
+						}
+
 					}
 					if(childNodeName.equalsIgnoreCase("bil_date"))
 					{
@@ -1024,8 +1064,12 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 						System.out.println("id1----->["+id1+"]");
 						
 						if(lineNoTrace.length() > 0 && invoiceID1.length() > 0){
-						sql1="select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount " +
-								"from invoice_trace where invoice_id = ? and inv_line_no = ?";
+//						sql1="select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount " +
+//								"from invoice_trace where invoice_id = ? and inv_line_no = ?";								// VALLABH KADAM 23/DES/14
+																															// Change [inv_line_no] to [line_no]
+																															// to get proper data in Pop help
+							sql1 = "select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount "
+									+ "from invoice_trace where invoice_id = ? and line_no = ?";
 						pstmt=conn.prepareStatement(sql1);
 						pstmt.setString(1, invoiceID1);
 						pstmt.setString(2, lineNoTrace);

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

@@ -126,8 +126,12 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 				
 				if(objContext !=null)
 				{
-					sql="select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount " +
-							"from invoice_trace where invoice_id = ? order by line_no";
+//					sql="select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount " +
+//							"from invoice_trace where invoice_id = ? order by line_no";								VALLABH KADAM 23/DEC/14
+																													// SELECT [line_no] on place of [inv_line_no]
+					
+					sql="select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,line_no,desp_id,discount" +
+							" from invoice_trace where invoice_id = ? order by line_no";
 					pstmt=conn.prepareStatement(sql);
 					pstmt.setString(1, invoiceID);
 					rs=pstmt.executeQuery();
@@ -141,7 +145,7 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 						lotSl=rs.getString(4);
 						itemSerPorm=rs.getString(5);
 						itemCode=rs.getString(6);
-						invLineNo=rs.getInt(7);
+						invLineNo=rs.getInt(7);													//VALLABH KADAM 22/DES/14 select invLineNo = [line_no]
 						despachID=rs.getString(8);
 						discount=rs.getDouble(9);
 						lotNo=lotNo ==null ? "" : lotNo.trim();