updated for new changes for available

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

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

@@ -603,6 +603,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 					{
 						locCode = genericUtility.getColumnValue("loc_code",dom2);
 						tranId = genericUtility.getColumnValue("tran_id",dom2);
+						distOrder = genericUtility.getColumnValue("dist_order",dom2);
 						if (locCode == null || locCode.trim().length() == 0)
 						{
 							errCode = "DIDOLCNULL";
@@ -637,13 +638,30 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							pstmt = null;
 							rs = null;
 
-						
-						/*	if(aval.equalsIgnoreCase("N"))
+							sql = "select case when avaliable_yn is null then 'N' else avaliable_yn end from distorder where dist_order = ?";
+							pstmt=conn.prepareStatement(sql);
+							pstmt.setString(1,distOrder);
+							rs = pstmt.executeQuery();
+							if(rs.next())
 							{
-                                errCode = "DIDOAVLN";
+								avalyn =  rs.getString("AVAILABLE_YN")==null?"":rs.getString("AVAILABLE_YN").trim();
+							}
+							pstmt.close();
+							rs.close();
+							pstmt = null;
+							rs = null;
+						
+							
+							if(avalyn.equalsIgnoreCase("N") && "Y".equalsIgnoreCase(aval)){
+								errCode = "VTAVAIL";
+								errString = getErrorString("loc_code",errCode,userId);
+								break;
+								
+							}else if(avalyn.equalsIgnoreCase("Y") && "N".equalsIgnoreCase(aval)){
+								errCode = "VTAVAIL";
 								errString = getErrorString("loc_code",errCode,userId);
 								break;
-							}*/
+							}
 							
 						}
 
@@ -741,7 +759,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 		int count = 0;
 		double minputQty = 0d, remQuantity = 0d, stockQty = 0d, integralQty = 0d;
 		double grossPer = 0d,netPer = 0d,grossWt = 0d,tarePer = 0d,netWt = 0d,tareWt =0d, rateClgVal = 0d, rate2 = 0d;
-		double disAmount = 0d, shipperQty = 0d,discount =0;
+		double disAmount = 0d, shipperQty = 0d,discount =0,netAmt = 0,taxAmt=0;
 		int  minShelfLife = 0, noArt1 = 0;
 		int mLineNoDist =0;
 		double qtyConfirm =0,qtyShipped =0,lcQtyOrderAlt =0,lcFact =0;
@@ -985,7 +1003,6 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							}
 							
 							
-							
 					}
 						else
 						{
@@ -1759,6 +1776,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 									qtyConfirm = rs.getDouble("QTY_CONFIRM");
 									qtyShipped = rs.getDouble("QTY_SHIPPED");
 									discount =	rs.getDouble("DISCOUNT");
+									netAmt =	rs.getDouble("NET_AMT");
+									taxAmt =	rs.getDouble("TAX_AMT");
 									remQuantity = qtyConfirm - qtyShipped;
 									System.out.println("calling getDetails");
 									valueXmlString.append(getDetails(siteCode,mLineNoDist,distOrder,tranType,conn));
@@ -1833,6 +1852,12 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 									valueXmlString.append("<discount protect=\"0\">").append("<![CDATA[" + discount + "]]>").append("</discount>");
 									setNodeValue( dom, "discount", getAbsString(""+discount));
 									
+									valueXmlString.append("<net_amt protect=\"0\">").append("<![CDATA[" + netAmt + "]]>").append("</net_amt>");
+									setNodeValue( dom, "net_amt", getAbsString(""+netAmt));
+									
+									valueXmlString.append("<tax_amt protect=\"0\">").append("<![CDATA[" + taxAmt + "]]>").append("</tax_amt>");
+									setNodeValue( dom, "tax_amt", getAbsString(""+taxAmt));
+									
 									sql = " SELECT LOC_CODE__DAMAGED, SUNDRY_CODE, PRICE_LIST, PRICE_LIST__CLG, SITE_CODE__SHIP "
 											+ " FROM DISTORDER WHERE DIST_ORDER = '"+distOrder+"' ";
 									pstmt1= conn.prepareStatement(sql);