Nature column added on default button

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

webitm-dis/src/ibase/webitm/ejb/dis/adv/DespatchAct.java

@@ -4125,6 +4125,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		double OrdQty = 0;
 		ResultSet rsTemp =null;
 		DecimalFormat df = new DecimalFormat("#########.###");
+		String lineType="",nature="";
 		//Statement stmtTemp = null;
 		// End Addition - Gulzar - 23/01/08
 		try
@@ -4385,6 +4386,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				+"SORDER.ORDER_TYPE, "//Added by Gulzar - 23/01/08
 				+"SORDER.CUST_CODE, "//Added by Gulzar - 23/01/08
 				+"SORDDET.QUANTITY AS ORD_QTY "
+				+",SORDITEM.NATURE ,SORDITEM.LINE_TYPE  " //ADDED BY NANDKUMAR GADKARI ON 27/09/19
 				+"FROM SORDDET LEFT OUTER JOIN PACKING ON SORDDET.PACK_CODE = PACKING.PACK_CODE LEFT OUTER JOIN UOM ON SORDDET.UNIT = UOM.UNIT,  "
 				+"SORDER, "
 				+"SORDITEM  "
@@ -4574,6 +4576,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					// End Comment - Gulzar - 23/01/08
 					 ***/
 
+				//	added by nandkumar gadkari on 27-09-19--------start----------------
+					nature  = rs.getString("NATURE") == null ? "" : (rs.getString("NATURE")).trim();
+					lineType = rs.getString("LINE_TYPE") == null ? "": (rs.getString("LINE_TYPE")).trim();
+					// C and P nature added by nandkumar gadkari on 06/08/19
+					
+					//added by nandkumar gadkari on 27-09-19--------end----------------
 					sql1 = "SELECT SORDALLOC.LOT_NO, "   
 						+"SORDALLOC.LOT_SL, "   
 						+"SORDALLOC.QTY_ALLOC, "   
@@ -5411,6 +5419,25 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 									valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity_real>\r\n");  // chg6 01-08-10
 									valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity__stduom>\r\n");
 									setNodeValue( dom, "quantity__stduom", qtyFact.get(1).toString() );
+//									added by nandkumar gadkari on 27-09-19--------start----------------
+									if(!"B".equalsIgnoreCase(lineType))
+									{
+										if("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature) || "S".equalsIgnoreCase(nature) || "I".equalsIgnoreCase(nature) || "V".equalsIgnoreCase(nature) || "P".equalsIgnoreCase(nature) )
+										{
+												valueXmlString.append("<line_type isSrvCallOnChg='0'>").append("<![CDATA["+nature+"]]>").append("</line_type>");
+												setNodeValue(dom, "line_type", (nature));
+										}
+										else
+										{
+											valueXmlString.append("<line_type isSrvCallOnChg='0'>").append("<![CDATA["+lineType+"]]>").append("</line_type>");
+										}
+										if("C".equalsIgnoreCase(nature))//added by nandkumar gadkari on 19/08/19
+										{
+											valueXmlString.append("<line_type isSrvCallOnChg='0'>").append("<![CDATA["+nature+"]]>").append("</line_type>");
+											setNodeValue(dom, "line_type", (nature));
+										}
+									}
+//									added by nandkumar gadkari on 27-09-19--------END----------------
 									valueXmlString.append("</Detail>\r\n");
 									// End Addition - Piyush - 24/12/07
 									System.out.println( "manohar 28/10/10 final string :: " + valueXmlString.toString() );
@@ -5543,7 +5570,25 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 								valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n");
 								valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity_real>\r\n");
 								valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(inputQty * convQtyStduom).append("]]>").append("</quantity__stduom>\r\n");
-
+								//added by nandkumar gadkari on 27-09-19--------start----------------
+								if(!"B".equalsIgnoreCase(lineType))
+								{
+									if("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature) || "S".equalsIgnoreCase(nature) || "I".equalsIgnoreCase(nature) || "V".equalsIgnoreCase(nature) || "P".equalsIgnoreCase(nature) )
+									{
+											valueXmlString.append("<line_type isSrvCallOnChg='0'>").append("<![CDATA["+nature+"]]>").append("</line_type>");
+											setNodeValue(dom, "line_type", (nature));
+									}
+									else
+									{
+										valueXmlString.append("<line_type isSrvCallOnChg='0'>").append("<![CDATA["+lineType+"]]>").append("</line_type>");
+									}
+									if("C".equalsIgnoreCase(nature))//added by nandkumar gadkari on 19/08/19
+									{
+										valueXmlString.append("<line_type isSrvCallOnChg='0'>").append("<![CDATA["+nature+"]]>").append("</line_type>");
+										setNodeValue(dom, "line_type", (nature));
+									}
+								}
+//								added by nandkumar gadkari on 27-09-19--------END----------------
 								/*
 								valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStduomrt).append("]]>").append("</rate__stduom>\r\n");
 								 */