RATE STDOUM is set from sales order instead of stock.

 quantity__ord / rate__std / line_type / part_no also set from required tables


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

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

@@ -1395,6 +1395,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 				else if(currentColumn.trim().equalsIgnoreCase("lot_sl"))
 				{
 					String sOrdItemLineNo = "", expLvl ="" ;		// Added by Sandesh 29-Sep-2014
+					String lineType = "",partNo = "";							// Added by Sandesh 6-Oct-2014
+					double qtyOrd = 0;								// Added by Sandesh 6-Oct-2014
 					String lineNoAdd="",lnNoSord="",itemDescr="",itemCodeOrd="";
 					String unitRate="",taxClass="",taxChap="",taxEnv="",netTotAmt="",avalyn="",siteCodeMfg="",
 							siteCodeDet="",unitStd="",packInstr="",unit1="",unitStd1="",statusL="",qtyDetailStr="";
@@ -1481,7 +1483,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					
 					//-------- Added by Sandesh 29-Sep-2014 as per suggestion by Manoharan sir -------------
 					
-					sql = "select line_no,exp_lev from sorditem where sale_order = ? and item_code = ? and item_flag = 'I'";
+					sql = "select line_no,exp_lev,line_type from sorditem where sale_order = ? and item_code = ? and item_flag = 'I'";
 					
 					pstmt1=conn.prepareStatement(sql);
 					pstmt1.setString(1,sorderNo);
@@ -1492,8 +1494,10 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					{
 						sOrdItemLineNo = rs1.getString("line_no");
 						expLvl = rs1.getString("exp_lev");
+						lineType = rs1.getString("line_type");	// Added by Sandesh 6-Oct-2014
 						
 						System.out.println("Getting values from SORDITEM => line_no : "+sOrdItemLineNo+" exp_lev : "+expLvl);
+						System.out.println("Values from SORDITEM => lineType : "+lineType);	// Added by Sandesh 6-Oct-2014
 					}
 
 					if(pstmt1!=null){
@@ -1544,7 +1548,43 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					
 					valueXmlString.append("<quantity_inv><![CDATA["+actualQty +"]]></quantity_inv>");
 					valueXmlString.append("<quantity_real><![CDATA["+ actualQty +"]]></quantity_real>");
-					valueXmlString.append("<quantity__ord><![CDATA["+ actualQty +"]]></quantity__ord>");
+					
+					//-------- Added by Sandesh 06-Oct-2014 -------------
+					
+					sql = "select sum(case when quantity is null then 0 else quantity end) "+
+							" from sorditem where sale_order = ? and line_no = ? and line_type  <> 'B'";
+					
+					pstmt1=conn.prepareStatement(sql);
+					pstmt1.setString(1,sorderNo);
+					pstmt1.setString(2,sOrdItemLineNo);
+
+					rs1 = pstmt1.executeQuery();
+					if(rs1.next())
+					{
+						qtyOrd = rs1.getDouble(1);
+						
+						System.out.println("Getting sum(qtyOrd) from SORDITEM => "+qtyOrd);
+					}
+
+					if(pstmt1!=null){
+						pstmt1.close();
+						pstmt1 = null;
+					}
+					if(rs1!=null){
+						rs1.close();
+						rs1 = null;
+					}
+					
+					partNo = getColumnDescr(conn, "MFR_PART_NO", "item", "item_code", itemCode);
+					partNo = partNo==null ? "":partNo;
+					System.out.println("partNo : "+partNo+" for despatchdet from item "+itemCode);
+					valueXmlString.append("<part_no><![CDATA["+ partNo+"]]></part_no>");
+					
+					
+					//-------------------- 06-Oct-2014  -----------------
+					
+					//valueXmlString.append("<quantity__ord><![CDATA["+ actualQty +"]]></quantity__ord>");	// Commented sandesh 6-Oct-2014
+					valueXmlString.append("<quantity__ord><![CDATA["+ qtyOrd +"]]></quantity__ord>");	// Commented sandesh 6-Oct-2014
 					
 					valueXmlString.append("<gross_weight><![CDATA["+ grossWeight+"]]></gross_weight>");
 					valueXmlString.append("<nett_weight><![CDATA["+ netWeight+"]]></nett_weight>");
@@ -1758,7 +1798,9 @@ 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("<line_type><![CDATA["+ natureLinkType +"]]></line_type>");	// Commented by Sandesh 2-Oct-2014 
+					valueXmlString.append("<line_type><![CDATA["+ lineType +"]]></line_type>");	// Commented by Sandesh 2-Oct-2014
+					
 					
 					valueXmlString.append("<tot_net_amt><![CDATA["+ netTotAmt.trim()+"]]></tot_net_amt>");					
 					valueXmlString.append("<site_code><![CDATA["+ siteCodeDet.trim()+"]]></site_code>");
@@ -1782,7 +1824,9 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					System.out.println("rateValue------>>["+rateValue+"]");
 					
 					valueXmlString.append("<conv__rtuom_stduom>").append(rateValue.get(0).toString()).append("</conv__rtuom_stduom>\r\n");
-					valueXmlString.append("<rate__stduom>").append(rateValue.get(1).toString()).append("</rate__stduom>\r\n");
+					//valueXmlString.append("<rate__stduom>").append(rateValue.get(1).toString()).append("</rate__stduom>\r\n");	// Commented by Sandesh 6-Oct-2014
+					valueXmlString.append("<rate__stduom>").append(rateStduom).append("</rate__stduom>\r\n");						// Added by Sandesh 6-Oct-2014
+						
 					
 					
 					valueXmlString.append("<tot_net_amt><![CDATA["+ netAmt +"]]></tot_net_amt>");