Request ID -D15DSUN001

Changes made for discount to be set on click of packing list button


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

webitm-dis/ibase/webitm/ejb/dis/adv/DistIssueAct.java

@@ -921,7 +921,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 		String itemCode = "",siteCode = "",packCode = "",distOrder = "",tranType = "",noArt = "";
 		String checkIntegralQty = "",lineNoOrd ="",sql = "",pickQtyStr = "", batchNo = "", grade = "", mfgDate1 = "";
 		String locCode = "",lotNo = "",lotSl = "",errCode = "", errString = "", expDate1 = null, retestDate1 = "";
-		String dimension = "",descr = "",dimension1 = "";
+		String dimension = "",descr = "",dimension1 = "",discountPer = "";;
 		String listType = "";
 		NodeList detailList = null;
 		Node currDetail = null;
@@ -1007,7 +1007,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 				valueXmlString.append("<dist_order isSrvCallOnChg='0' >").append("<![CDATA[").append(distOrder.trim()).append("]]>").append("</dist_order>\r\n");
 				valueXmlString.append("<line_no_dist_order isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(1).trim()).append("]]>").append("</line_no_dist_order>\r\n");
 
-				sql = "SELECT TAX_CLASS, TAX_CHAP, TAX_ENV, CASE WHEN RATE IS NULL THEN 0 ELSE RATE END, UNIT__ALT "
+				sql = "SELECT TAX_CLASS, TAX_CHAP, TAX_ENV, CASE WHEN RATE IS NULL THEN 0 ELSE RATE END, UNIT__ALT,DISCOUNT "
 						+"FROM DISTORDER_DET WHERE DIST_ORDER = ? AND LINE_NO = ? ";
 				pstmt1 = conn.prepareStatement(sql);
 				pstmt1.setString(1,distOrder) ;
@@ -1020,13 +1020,14 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 					taxEnv   = rs1.getString(3);
 					rate     = rs1.getDouble(4);
 					unitAlt   = rs1.getString(5);
+					discountPer = rs1.getString(6);
 
 				}
 				rs1.close();
 				rs1 = null;
 				pstmt1.close();
 				pstmt1 = null;
-
+				valueXmlString.append("<discount isSrvCallOnChg='0'>").append("<![CDATA[").append(discountPer).append("]]>").append("</discount>\r\n");
 				valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(2).trim()).append("]]>").append("</item_code>\r\n");
 				itemCode = (rs.getString(2)==null?" ":rs.getString(2)).trim() ;
 				//added by kunal ser item descr.