set nature and qty_stduom

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

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

@@ -706,16 +706,12 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		String tranid ="";
 		String rate = "";
 		double amount = 0;
-		int cnt = 0;
-
+		int cnt = 0,lineNo1=0;;
 		String tranCode = "",tranName="",transMode="";
 		StringBuffer detail2xml = new StringBuffer();
 		String tranDate = null;
-
 		PreparedStatement pstmt2 =null;
 		ResultSet rs2 = null,rs3 = null;
-
-
 		String unitAlt = null;
 		int count = 0;
 		double minputQty = 0d, remQuantity = 0d, stockQty = 0d, integralQty = 0d;
@@ -728,7 +724,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		
 		//Dadaso
 		String sql="",currencyCode="",exchRate1="",currCodeFrt="",currCodeIns="",currCodedlv="",stanCode="",custCode="",custCodeDlv="",siteCodeDesc="";
-		String stanCodeDlv="",dlvCity="",dlvPin="",countCodeDlv="",stanCodeInit="",status="",statusRemarks="",despIdNew="",
+		String stanCodeDlv="",dlvCity="",dlvPin="",countCodeDlv="",stanCodeInit="",status="",statusRemarks="",despIdNew="",natureLinkType="",
 				custCodeBil="",dlvAdd1="",dlvAdd2="",dlvAdd3="",despId="",remarksDes="",noArtDes="",sorderNo="",
 				siteCodeShip="",availableYn="",addUser="",chgUserL="",chgTermL="",lotslL="",lotStatus="HOLD";
 		ArrayList<String> addUsersList=new ArrayList<String>();
@@ -1238,7 +1234,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					String unitRate="",taxClass="",taxChap="",taxEnv="",netTotAmt="",quntyStduom="",
 							siteCodeDet="",unitStd="", noArt="", convRtuomStduom="",netAmt="",rateStduom="";
 					System.out.println("Form 3 itm_default_add called BLANK.................");
-					int lineNo1=0;
+					
 					double rateClg=0;					
 					sql = "select max(line_no)  "
 							+ "from despatchdet where sord_no = ?";
@@ -1247,18 +1243,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					rs = pstmt.executeQuery();
 					if(rs.next())
 					{
-						lineNoAdd = checkNull(rs.getString(1));						
+						lineNo1 = rs.getInt(1);						
 					}				
 					pstmt.close();
 					rs.close();
 					pstmt = null;
-					rs = null;
-					 if(lineNoAdd.length() > 0){
-					 lineNo1=Integer.parseInt(lineNoAdd);
+					rs = null;					
 					 lineNo1++;
-					 }else{
-					  lineNo1=1;
-					 }
+					 
 				   valueXmlString.append("<Detail3 domID='" +lineNo1+ "'  objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
 					valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
 					
@@ -1288,7 +1280,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					ArrayList qtyFact=new ArrayList();
 					ArrayList rateValue=new ArrayList();
 					System.out.println("Form 3 itm_default_add called.................");
-					int lineNo1=0,noArt=0;
+					int noArt=0;
 					DecimalFormat df = new DecimalFormat("#########.###");
 					double rateClg=0,taxAmt=0,rateStd=0,quntyStduom=0,ordQuantity=0,rate1=0,convQtyStduom=0,rateStduom=0,balQty=0,looseQty=0,
 							convRtuomStduom=0,quantity=0,inputQty=0,costRate=0,packQty=0,qtyPerArt=0,shipperQtyNew=0,integralQtyNew=0;
@@ -1314,13 +1306,9 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					pstmt.close();
 					rs.close();
 					pstmt = null;
-					rs = null;
-					 if(lineNoAdd.length() > 0){
-					 lineNo1=Integer.parseInt(lineNoAdd);
+					rs = null;					
 					 lineNo1++;
-					 }else{
-					  lineNo1=1;
-					 }
+					 System.out.println("lineNo1 lotSl----->>["+lineNo1+"]");
 					  valueXmlString.append("<Detail3 domID='"+lineNo1+"'  objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
 					  valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
 					
@@ -1497,8 +1485,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 							+ "sorddet.rate__stduom,"
 							+ "sorddet.conv__rtuom_stduom,"
 							+ "sorddet.pack_qty,"
-							+ "sorddet.discount, "
-							
+							+ "sorddet.discount, "  
+							+ "sorddet.nature,"
 							 +"sorditem.exp_lev "
 							+ "from sorddet,sorditem where sorddet.sale_order = sorditem.sale_order "
 							+ "and sorditem.line_no = sorddet.line_no"
@@ -1545,6 +1533,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						discountL=rs.getDouble("discount");						
 						//expLev=checkNull(rs.getString("exp_lev"));	
 						statusL=checkNull(rs.getString("status"));
+						natureLinkType=checkNull(rs.getString("nature"));
 						
 				   } 
 				   pstmt.close();
@@ -1642,7 +1631,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					valueXmlString.append("<sorddet_rate><![CDATA["+rate1 +"]]></sorddet_rate>");			
 					valueXmlString.append("<rate__std><![CDATA["+ rateStd +"]]></rate__std>");
 					
-					
+					valueXmlString.append("<line_type><![CDATA["+ natureLinkType +"]]></line_type>");
 					
 					valueXmlString.append("<tot_net_amt><![CDATA["+ netTotAmt.trim()+"]]></tot_net_amt>");					
 					valueXmlString.append("<site_code><![CDATA["+ siteCodeDet.trim()+"]]></site_code>");
@@ -1652,7 +1641,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					valueXmlString.append("<unit__std><![CDATA["+ unitStd+"]]></unit__std>");
 					
 					
-					valueXmlString.append("<quantity__stduom><![CDATA["+ quntyStduom+"]]></quantity__stduom>");
+					valueXmlString.append("<quantity__stduom><![CDATA["+ actualQty+"]]></quantity__stduom>");
 					valueXmlString.append("<pack_qty><![CDATA["+ packQty+"]]></pack_qty>");
 					valueXmlString.append("<pack_code><![CDATA["+ packCode.trim()+"]]></pack_code>");