Discount and discount amt. to be set from sorddet line item to despatch detail line item.

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

webitm-dis/src/ibase/webitm/ejb/dis/PostOrdDespatchGen.java

@@ -296,7 +296,7 @@ public class PostOrdDespatchGen
 				 taxClass=rs.getString("TAX_CLASS");
 				 taxChap=rs.getString("TAX_CHAP");
 				 taxEnv=rs.getString("TAX_ENV");
-
+				 discount = rs.getDouble("DISCOUNT");//Added By Pavan Rane 22OCT19[set discount in despatchdet]
 
 			  /*System.out.println("saleOrder=====" + saleOrder);
 				
@@ -1413,11 +1413,22 @@ public class PostOrdDespatchGen
 						}
 						else
 						{
-							discAmt=0;
-							tempMapSord.put("disc_amt", discAmt);
+							//Added By Pavan Rane 22OCT19 start [set discount Amt in despatchdet]
+							if( applyPrice== null || applyPrice.trim().length() == 0 )
+							{							
+								discAmt = ((discount/100) * ((Double)tempMapSord.get("quantity__stduom") * (Double)tempMapSord.get("rate__stduom")));								
+								//System.out.println("@@@@@4444 discAmt["+discAmt+"]");
+								tempMapSord.put("disc_amt", discAmt);
+							}
+							else
+							{							
+								discAmt=0;
+								tempMapSord.put("disc_amt", discAmt);
+							}
+							//Pavan Rane 22OCT19 end [set discount Amt in despatchdet]
 						}
 						// sordList=new ArrayList();
-
+						tempMapSord.put("discount", discount);//Added By Pavan Rane 22OCT19 end [set discount in despatchdet]
 						tempMapSord.put("sord_no", saleOrder);
 						
 						//ADDED BY NANDKUMAR GADKARI ON 06/08/19------------------START----------------------------------
@@ -2036,6 +2047,9 @@ public class PostOrdDespatchGen
 						xmlBuff.append("<site_code><![CDATA[" + sordDetMap.get("site_code").toString() + "]]></site_code>");
 						xmlBuff.append("<rate__clg><![CDATA[" + (Double)sordDetMap.get("rate__clg") + "]]></rate__clg>");
 						xmlBuff.append("<disc_amt><![CDATA[" + (Double)sordDetMap.get("disc_amt") + "]]></disc_amt>");
+						//Added By Pavan Rane 22OCT19 start [set discount in despatchdet]
+						xmlBuff.append("<discount><![CDATA[" + (Double)sordDetMap.get("discount") + "]]></discount>");
+						//Pavan Rane 22OCT19 end [set discount in despatchdet]
 						xmlBuff.append("<cost_rate><![CDATA[" + (Double)sordDetMap.get("cost_rate") + "]]></cost_rate>");
 						xmlBuff.append("<cust_item__ref><![CDATA[" + sordDetMap.get("cust_item__ref").toString() + "]]></cust_item__ref>");
 						if(sordDetMap.get("retest_date") != null)