unconfirm claim quantity set properly

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

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

@@ -1258,7 +1258,8 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 						}
 /////////////////////////////////////////////////////////////////////////////////////////////////////						
 					}
-					if (currentColumn.trim().equals( "itm_defaultedit" ))
+					//if (currentColumn.trim().equals( "itm_defaultedit" ))
+					if (currentColumn.trim().equals( "lot_no" ))
 					{
 						itemCode = genericUtility.getColumnValue( "item_code", dom );
 						siteCode = genericUtility.getColumnValue( "site_code", dom1 );
@@ -1956,6 +1957,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 				pStmt.close();
 				pStmt = null;
 /////////////////////////////////////////////////////////////////////////////////////////////////////
+				/*
 				// 27/05/10 manoharan bill_no, bill_date and discount to be carried forward
 				NodeList detail2List = null;
 				Node detailNode = null;
@@ -1964,6 +1966,8 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 				double curQty = 0;
 				detail2List = dom2.getElementsByTagName("Detail2");
 				System.out.println("manohar unconfirm quantity abefore [" + unconfQty + "] detail2List.getLength() [" + detail2List.getLength() + "]");
+				unconfQty = 0;
+				curQty = 0;
 				if (detail2List.getLength() > 1)
 				{
 
@@ -2032,19 +2036,21 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 
 						}
 						// compare the item_code and lot_no if matches add to the current quantity
-						System.out.println("manohar comparing line_no [ " + tempLineNo + "] item [" + tempItemCode + "] lot [" + tempLotNo + "]");
-						if (lotNo.trim().equals(tempLotNo.trim()) || itemCode.trim().equals(tempItemCode.trim()) || !tempLineNo.equals(lineNo) )
+						System.out.println("manohar comparing line_no [ " + lineNo + "] item [" + itemCode + "] lot [" + lotNo + "]");
+						System.out.println("manohar comparing tempLineNo [ " + tempLineNo + "] tempItemCode [" + tempItemCode + "] tempLotNo [" + tempLotNo + "]");
+						if (lotNo.trim().equals(tempLotNo.trim()) && itemCode.trim().equals(tempItemCode.trim()) && !tempLineNo.equals(lineNo) )
 						{
 							dTempQty = Double.parseDouble(tempQty);
 							curQty += dTempQty;
 							System.out.println("manohar line_no [ " + tempLineNo + "] item [" + tempItemCode + "] lot [" + tempLotNo + "] qty ["+ dTempQty+ "]");
 						}
 						//
-}
+					}
 						
 				}
 				unconfQty +=  curQty;
 				System.out.println("manohar unconfirm quantity after [" + unconfQty + "]");
+				*/
 /////////////////////////////////////////////////////////////////////////////////////////////////////						
 				/* sql = "select ('"+unconfQty+"' - (case when b.quantity is null then 0 else b.quantity end)) as unconfQty " 
 				     +" from charge_back a, charge_back_det b "
@@ -2078,7 +2084,7 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 				itmChangeString.append("<sale_qty>").append("<![CDATA["+ saleQty + "]]>").append("</sale_qty>");
 				itmChangeString.append("<sale_ret_qty>").append("<![CDATA["+ saleRetQty + "]]>").append("</sale_ret_qty>");
 				itmChangeString.append("<conf_claimed>").append("<![CDATA["+ getRequiredDecimal(confQty,3) + "]]>").append("</conf_claimed>");
-				itmChangeString.append("<unconf_claimed>").append("<![CDATA["+ getRequiredDecimal(unconfQty,3) + "]]>").append("</unconf_claimed>");
+				//itmChangeString.append("<unconf_claimed>").append("<![CDATA["+ getRequiredDecimal(unconfQty,3) + "]]>").append("</unconf_claimed>");
 			}
 		}
 		catch(Exception e)