After manualy confirmed disp and save issue done(Issue tracker=411)

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

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

@@ -2589,7 +2589,9 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 							"AND case when item.loc_type is null then ' '  else item.loc_type end = '" + locType + "' " +
 							"AND ASN_HDR.ASN_NO = ?  " +
 							"AND PDET.LINE_NO = ADET.LINE_NO__ORD   "+
-							"AND PDET.ITEM_CODE = ITEM.ITEM_CODE  " ;
+							//changed by Dhanraj on 18/07/14 for unconfirmed item only.
+							//"AND PDET.ITEM_CODE = ITEM.ITEM_CODE  " ;
+							 "AND PDET.ITEM_CODE = ITEM.ITEM_CODE AND PDET.DLV_QTY < ADET.QUANTITY " ;
 					//Commented by Manoj to Show Unscanned records in Edit mode also
 					//"AND PDET.LINE_NO NOT IN(SELECT LINE_NO__ORD FROM PORCPDET WHERE ASN_HDR.PURC_ORDER = PORCPDET.PURC_ORDER )";
 

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

@@ -116,7 +116,9 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
 			String lineNoOrd="";
 			double qtyDb=0.0;
 			asnNo=genericUtility.getColumnValue("asn_no", dom);
-			sql="select tran_id from porcp where asn_no=?";
+			//Changed by Dhanraj Thakare 18-07-2014 for confirmed afetr manual
+			//sql="select tran_id from porcp where asn_no=?";
+			sql="select tran_id from porcp where asn_no=? and confirmed='N'";
 			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1,asnNo);
 			rs=pstmt.executeQuery();
@@ -556,9 +558,23 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
 			*/
 			
 			toConfirm = true;
-			sSQL = "SELECT ITEM_CODE,LOT_NO,QUANTITY FROM ASN_DET WHERE TRAN_ID IN (SELECT" 
-					+ " TRAN_ID FROM ASN_HDR WHERE ASN_NO = ? )";
-			
+			//Changed by Dhanraj querey change for get unconfirm item code 18/07/14 start.
+			/*sSQL = "SELECT ITEM_CODE,LOT_NO,QUANTITY FROM ASN_DET WHERE TRAN_ID IN (SELECT" 
+					+ " TRAN_ID FROM ASN_HDR WHERE ASN_NO = ? )";*/
+			sSQL = " SELECT ASN_DET.ITEM_CODE,ASN_DET.LOT_NO,SUM(ASN_DET.QUANTITY-PORDDET.DLV_QTY) as QUANTITY " 
+					+ " FROM ASN_DET,PORDDET,ASN_HDR,PORDER WHERE "
+					+ " ASN_HDR.ASN_NO = ? "
+					+ " AND ASN_HDR.ASN_NO = PORDER.ASN_NO "
+					+ " AND PORDER.PURC_ORDER = PORDDET.PURC_ORDER "
+					+ " AND "
+					+ " ASN_DET.TRAN_ID = ASN_HDR.TRAN_ID "
+					+ " AND ASN_DET.LINE_NO__ORD = PORDDET.LINE_NO "
+					+ " AND (ASN_DET.QUANTITY-PORDDET.DLV_QTY) > 0 "
+					+ " AND "
+					+ " ASN_DET.ITEM_CODE = PORDDET.ITEM_CODE "
+					+ " GROUP BY "
+					+ " ASN_DET.ITEM_CODE,ASN_DET.LOT_NO ";
+			//Changed by Dhanraj querey change for get unconfirm item code 18/07/14 end.
 			pstmtAsn = conn.prepareStatement(sSQL);
 			pstmtAsn.setString(1, asnNo);
 			rsAsn = pstmtAsn.executeQuery();