updated for hold qty add

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

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

@@ -599,9 +599,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							pstmt = null;
 							rs = null;
 
-							if(aval.equalsIgnoreCase("Y"))
-							{
-								sql = "select AVAILABLE_YN from distord_iss where tran_id = ?";
+						/*	sql = "select AVAILABLE_YN from distord_iss where tran_id = ?";
 							pstmt=conn.prepareStatement(sql);
 							pstmt.setString(1,tranId);
 							rs = pstmt.executeQuery();
@@ -612,24 +610,16 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							pstmt.close();
 							rs.close();
 							pstmt = null;
-								rs = null;
-
+							rs = null;*/
 
 							
-								if(!aval.equalsIgnoreCase(avalyn))
+							if(aval.equalsIgnoreCase("N"))
 							{
-									errCode = "VTAVAIL";
-									errString = getErrorString("loc_code",errCode,userId);
-									break;
-								}
-							}
-							else
-							{
-								
                                 errCode = "DIDOAVLN";
 								errString = getErrorString("loc_code",errCode,userId);
 								break;
 							}
+							
 						}
 
 					}
@@ -2072,7 +2062,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 					if(lotSl != null && lotSl.trim().length() > 0)
 					{
 						//item_code,no_art,quantity,amount,net_amt,discount,tax_amt,gross_weight,tare_weight,net_weight
-						sql = "select LOC_CODE,LOT_NO,ITEM_CODE,QUANTITY,GROSS_WEIGHT,NET_WEIGHT,TARE_WEIGHT,NO_ART,ALLOC_QTY from stock where site_code = ? AND LOT_SL = ? AND QUANTITY > 0";
+						sql = "select LOC_CODE,LOT_NO,ITEM_CODE,QUANTITY,GROSS_WEIGHT,NET_WEIGHT,TARE_WEIGHT,NO_ART,ALLOC_QTY,HOLD_QTY from stock where site_code = ? AND LOT_SL = ? AND QUANTITY > 0";
 						pstmt1=conn.prepareStatement(sql);
 						pstmt1.setString(1,siteCode);
 						pstmt1.setString(2,lotSl);
@@ -2089,6 +2079,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							tareWeight = rs1.getDouble("tare_weight");
 							noOfArt = rs1.getDouble("no_art");
 							allQty = rs1.getDouble("alloc_qty");
+							holdQty = rs1.getDouble("hold_qty");
 							
                         }
 						pstmt1.close();
@@ -2144,7 +2135,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 						valueXmlString.append("<item_code protect=\"0\">").append("<![CDATA[" + itemCode + "]]>").append("</item_code>");
 						setNodeValue( dom, "item_code", getAbsString(""+itemCode)); 
 
-						setQty = squantity - allQty;
+						setQty = squantity - (allQty + holdQty);
 						
 						valueXmlString.append("<quantity protect=\"0\">").append("<![CDATA[" + setQty + "]]>").append("</quantity>");
 						setNodeValue( dom, "quantity", getAbsString(""+setQty));