Bug fixing for setting quantity in case of replacement and status column values

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

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

@@ -1408,7 +1408,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							valueXmlString.append("<line_no__invtrace protect =\"0\">").append("<![CDATA["+""+"]]>").append("</line_no__invtrace>");
 							valueXmlString.append("<item_code protect =\"1\">").append("<![CDATA["+""+"]]>").append("</item_code>");
 						}
-						valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+""+"]]>").append("</status>");
+						valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+"S"+"]]>").append("</status>");
 						valueXmlString.append("<cost_rate protect =\"1\">").append("<![CDATA["+""+"]]>").append("</cost_rate>");
 						if ("w_salesreturn_retn".equalsIgnoreCase(winName))
 						{
@@ -1424,7 +1424,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						}
 						else if ("w_salesreturn_repl".equalsIgnoreCase(winName))
 						{
-							valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[P]]>").append("</ret_rep_flag>");
+							valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[P]]>").append("</ret_rep_flag>");
+							valueXmlString.append("<status>").append("<![CDATA[S]]>").append("</status>");
+							setNodeValue( dom, "status", "S" );
+							setNodeValue( dom, "ret_rep_flag", "P" );
 							tranId = genericUtility.getColumnValue("tran_id", dom1);
 							slineNo = genericUtility.getColumnValue("line_no", dom);
 							
@@ -1583,7 +1586,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								}
 							}
 						}
-						valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+""+"]]>").append("</status>");
+						//valueXmlString.append("<status protect =\"0\">").append("<![CDATA["+""+"]]>").append("</status>");
 						if ("D".equals(retOpt))
 						{
 							valueXmlString.append("<ret_rep_flag protect =\"1\">").append("<![CDATA[P]]>").append("</ret_rep_flag>");
@@ -2912,7 +2915,10 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						priceListClg = genericUtility.getColumnValue("price_list__clg", dom1);
 						fullRet = genericUtility.getColumnValue("full_ret", dom1);
 						itemCode = genericUtility.getColumnValue("item_code", dom);
-						lotNo = genericUtility.getColumnValue("item_code", dom);
+						// 16/04/10 manoharan wrong column value taken
+						//lotNo = genericUtility.getColumnValue("item_code", dom);
+						lotNo = genericUtility.getColumnValue("lot_no", dom);
+						// end 16/04/10 manoharan
 						tranDate = genericUtility.getColumnValue("tran_date", dom1);
 						siteCode = genericUtility.getColumnValue("site_code", dom1);
 						invoiceId = genericUtility.getColumnValue("invoice_id", dom1);
@@ -3392,7 +3398,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						if( rs.next() )
 						{
 							cnt = rs.getInt(1);
-						}
+						}
+						mcount =cnt; // 19/04/10 manoharan
 						rs.close();
 						pstmt.close();
 						pstmt = null;
@@ -3626,7 +3633,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									+" where item_code = ? "; //:mitem_code;
 
 								pstmt = conn.prepareStatement( sqlStr );
-								pstmt.setString( 1, mitemCode );
+								pstmt.setString( 1, itemCode );
 								
 								rs = pstmt.executeQuery();
 								
@@ -7750,7 +7757,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 					}
 					System.out.println("quantity :: "+quantity);
 				}
-			}
+			}
+			System.out.println("quantity :: "+quantity);
 			rs.close();
 			pstmt.close();
 			pstmt = null;
@@ -7780,7 +7788,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 			{
 				//conv = distCommon.convertBox(itemCode, unitPack, unit);
 				//gf_conv_qty( asUnitFrom, asUnitTo, asItemCode,1);
-				quantity = distCommon.convQtyFactor( unit.trim(), unitPack.trim(), itemCode, 1, conn );
+				//quantity = distCommon.convQtyFactor( unit.trim(), unitPack.trim(), itemCode, 1, conn );
+				quantity = distCommon.convQtyFactor( unit.trim(), unitPack.trim(), itemCode, quantity, conn );
 				//quantity = quantity - (quantity % conv);
 			}
 			utilMethods = null;