Changed by Pragyan (Dhanraj) 13-08-2014 for receipt edit mode.

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

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

@@ -2608,7 +2608,9 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 							"AND PDET.LINE_NO = ADET.LINE_NO__ORD   "+
 							//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 " ;
+							"AND PDET.ITEM_CODE = ITEM.ITEM_CODE " ;
+					//Changed by Pragyan on 08-Aug-14 Remove Dlv_qty condition.
+							 //" 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 )";
 
@@ -2636,6 +2638,20 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 						lotNo = rs.getString("LOT_NO");
 						siteCodeMf=rs.getString("SITE_CODE");
 						System.out.println("@@@@siteCodeMf ["+siteCodeMf+"]");
+						
+						//Changed by Pragyan on 08-Aug-14 Add function  for get available for receipt .
+						HashMap dataHashMap = getAvilableQtyForReceipt(itemCode, lotNo, purcOrder,asnNo, quantity, conn);
+						
+						if(dataHashMap.size() > 0)
+						{
+							quantity = (Double)dataHashMap.get("REQ_SCAN_QTY");
+						}
+						
+						if(quantity <= 0.0)
+						{
+							System.out.println("Call Continue if the value :["+quantity+"]");
+							continue;
+						}
 						/*Added By Ashish Sonawane on 03/Aug/12 for condition when maintaining lot master is true [END] */
 						String isMaintainLotMaster =  distComm.getDisparams("999999","MAINTAIN_LOT_MASTER",conn);
 						System.out.println("isMaintainLotMaster :["+isMaintainLotMaster+"]");
@@ -3522,6 +3538,62 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 		}
 		return attribValue;
 	}
+	//Changed by Pragyan on 08-Aug-14 Add function  for get available for receipt .
+	private HashMap getAvilableQtyForReceipt(String itemCode,String lotNo,String purcCorder,String asnNo,double asnQty,Connection conn)
+	{
+		double qtyAvilForScan = 0.0;
+		String sSQL = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		int palletCount = 0;
+		HashMap rcpMap = new HashMap();
+		
+		
+		try
+		{
+			sSQL = "SELECT SUM(QUANTITY),COUNT(D.LOT_SL) FROM PORCPDET D,PORCP P WHERE D.TRAN_ID = P.TRAN_ID AND P.ASN_NO = ?" 
+					+" AND D.ITEM_CODE = ? AND  D.LOT_NO = ? AND P.PURC_ORDER = ? GROUP BY D.ITEM_CODE,D.LOT_NO ";
+			
+			pstmt = conn.prepareStatement(sSQL);
+			pstmt.setString(1, asnNo);
+			pstmt.setString(2, itemCode);
+			pstmt.setString(3, lotNo);
+			pstmt.setString(4, purcCorder);
+
+			rs = pstmt.executeQuery();
+			
+			if(rs.next())
+			{
+				qtyAvilForScan = qtyAvilForScan +  rs.getDouble(1);
+				palletCount = palletCount  +  rs.getInt(2);
+			}
+			
+			System.out.println("qtyAvilForScan before["+qtyAvilForScan+"]");
+			qtyAvilForScan = asnQty - qtyAvilForScan;
+			System.out.println("qtyAvilForScan after["+qtyAvilForScan+"]");
+			
+			rcpMap.put("REQ_SCAN_QTY", qtyAvilForScan) ;
+			rcpMap.put("REQ_PALLET_COUNT", palletCount) ;
+			
+			if(rs != null)
+			{
+				rs.close();
+				rs = null;
+			}
+			
+			if(pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+		}
+		
+		return rcpMap;
+	}
 
 
 

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

@@ -558,10 +558,11 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
 			*/
 			
 			toConfirm = true;
+			//Changed By Pragyan 07-Aug-14 To get the total ASN quantity po wize 
 			//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 " 
+			/*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 "
@@ -573,14 +574,23 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
 					+ " AND "
 					+ " ASN_DET.ITEM_CODE = PORDDET.ITEM_CODE "
 					+ " GROUP BY "
-					+ " ASN_DET.ITEM_CODE,ASN_DET.LOT_NO ";
+					+ " ASN_DET.ITEM_CODE,ASN_DET.LOT_NO ";*/
+			
+			sSQL =  " SELECT ITEM_CODE,LOT_NO,SUM(QUANTITY) AS QUANTITY  FROM ASN_DET WHERE TRAN_ID IN " 
+					+ "(SELECT TRAN_ID FROM ASN_HDR WHERE PURC_ORDER =  ? AND CONFIRMED ='Y')" 
+					+ " GROUP BY ITEM_CODE,LOT_NO ";
 			//Changed by Dhanraj querey change for get unconfirm item code 18/07/14 end.
 			pstmtAsn = conn.prepareStatement(sSQL);
-			pstmtAsn.setString(1, asnNo);
+			//Changed By Pragyan  07-Aug-14 To get the total PORCPDET QUANTITY 
+			//pstmtAsn.setString(1, asnNo);
+			pstmtAsn.setString(1, purcOrder);
 			rsAsn = pstmtAsn.executeQuery();
 			
-			
-			sSQL = "SELECT SUM(QUANTITY) FROM PORCPDET WHERE TRAN_ID = ? AND ITEM_CODE = ? AND LOT_NO = ? ";
+			//Changed By Pragyan  07-Aug-14 To get the total PORCPDET QUANTITY 
+			//sSQL = "SELECT SUM(QUANTITY) FROM PORCPDET WHERE TRAN_ID = ? AND ITEM_CODE = ? AND LOT_NO = ? ";
+			sSQL = "SELECT SUM(QUANTITY) FROM PORCPDET WHERE TRAN_ID IN (SELECT TRAN_ID FROM PORCP " 
+					+ " WHERE PURC_ORDER =  ? ) AND ITEM_CODE = ? AND LOT_NO = ? GROUP BY ITEM_CODE, LOT_NO";
+				
 			pstmtPorcp = conn.prepareStatement(sSQL);
 			
 			
@@ -588,7 +598,9 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
 			{
 				
 				asnQty = rsAsn.getDouble("QUANTITY");
-				pstmtPorcp.setString(1, tranId);
+				//Changed By Pragyan  07-Aug-14 To get the total PORCPDET QUANTITY 
+				//pstmtPorcp.setString(1, tranId);
+				pstmtPorcp.setString(1, purcOrder);
 				pstmtPorcp.setString(2,rsAsn.getString("ITEM_CODE"));
 				pstmtPorcp.setString(3,rsAsn.getString("LOT_NO"));