SET Fields

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

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

@@ -35,6 +35,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+
 @Stateless
 public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, DespatchWizRemote {
 
@@ -1195,175 +1196,168 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					String lineNoAdd="",lnNoSord="",quantity="",rate1="",conQtyStd="",itemDescr="",itemCodeOrd="";
 					String unitRate="",taxClass="",taxChap="",taxEnv="",netTotAmt="",quntyStduom="",
 							siteCodeDet="",unitStd="", noArt="", convRtuomStduom="",netAmt="",rateStduom="";
-					System.out.println("Form 3 itm_default_add called.................");
+					System.out.println("Form 3 itm_default_add called BLANK.................");
 					int lineNo1=0;
 					double rateClg=0;					
 				  
-					//String str=new DespatchAct().actionDefault(dom2, dom1, objContext, xtraParams);
-					//System.out.println("str------------->>["+str+"]");
-				/*	String xmlString=new DespatchAct().actionDefault(dom1,dom2,objContext,xtraParams);
-					System.out.println("return string from actionDefault---->>["+xmlString+"]");
-					valueXmlString.append(xmlString);*/
-					sql = "select max(line_no)  "
-							+ "from despatchdet where sord_no = ?";
-					pstmt=conn.prepareStatement(sql);
-					pstmt.setString(1,sorderNo);
-					rs = pstmt.executeQuery();
-					if(rs.next())
-					{
-						lineNoAdd = checkNull(rs.getString(1));						
-					}
-					
-					
-					pstmt.close();
-					rs.close();
-					pstmt = null;
-					rs = null;
-					 if(lineNoAdd.length() > 0){
-					 lineNo1=Integer.parseInt(lineNoAdd);
-					 lineNo1++;
-					 }else{
-					  lineNo1=1;
-					 }
-					//item_descr
-					sql = "select line_no,item_code,item_code__ord,quantity,rate,unit,conv__qty_stduom,unit__rate,tax_class,tax_chap,tax_env,pack_code,rate__clg,quantity__stduom," +
-							"net_tot_amt,net_amt,site_code,unit__std,no_art,rate__stduom,conv__rtuom_stduom from sorddet where sale_order = ? order by line_no";
-					pstmt = conn.prepareStatement(sql);
-					pstmt.setString(1,sorderNo);
-					rs = pstmt.executeQuery();
-				   if( rs.next() )
-				   {
-					   lnNoSord = checkNull(rs.getString("line_no"));	
-						itemCode = rs.getString("item_code") == null ? " " : rs.getString("item_code");
-						itemCodeOrd = rs.getString("item_code__ord") == null ? " " : rs.getString("item_code__ord");
-						quantity = rs.getString("quantity") == null ? "0" : rs.getString("quantity")  ;
-						rate1 = rs.getString("rate")== null ? " " : rs.getString("rate");
-						unit = rs.getString("unit") == null ? " " : rs.getString("unit");
-						conQtyStd = rs.getString("conv__qty_stduom") == null ? " " : rs.getString("conv__qty_stduom");
-						unitRate = rs.getString("unit__rate") == null ? " " : rs.getString("unit__rate");
-						taxClass = rs.getString("tax_class") == null ? " " : rs.getString("tax_class");
-						taxChap = rs.getString("tax_chap") == null ? " " : rs.getString("tax_chap");
-						taxEnv = rs.getString("tax_env") == null ? " " : rs.getString("tax_env");
-						packCode = rs.getString("pack_code") == null ? " " : rs.getString("pack_code");
-						rateClg = rs.getDouble("rate__clg");
-						quntyStduom = rs.getString("quantity__stduom") == null ? "0" : rs.getString("quantity__stduom");
-						netTotAmt = rs.getString("net_tot_amt") == null ? " " : rs.getString("net_tot_amt");
-						siteCodeDet = rs.getString("site_code") == null ? " " : rs.getString("site_code");	
-						unitStd = rs.getString("unit__std") == null ? " " : rs.getString("unit__std");	
-						noArt = checkNull(rs.getString("no_art"));	
-						rateStduom = rs.getString("rate__stduom");	
-						convRtuomStduom = rs.getString("conv__rtuom_stduom");	
-						netAmt = rs.getString("net_amt");	
-				   } 
-				   pstmt.close();
-					rs.close();
-					pstmt = null;
-					rs = null;
-				   itemDescr=checkNull(getColumnDescr(conn, "descr", "item", "item_code", itemCode));
-				   
-					
-				   System.out.println("lnNoSord-------->>["+lnNoSord+"]");
-				   System.out.println("lineNo1-------->>["+lineNo1+"]");
-				   System.out.println("despIdNew-------->>["+despIdNew+"]");
-				  
 				   valueXmlString.append("<Detail3 domID='" +lineNo1+ "'  objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
 					valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
 					
 					
 					//valueXmlString.append("<desp_id><![CDATA["+ despIdNew +"]]></desp_id>");
-					valueXmlString.append("<sord_no><![CDATA["+ sorderNo +"]]></sord_no>");
-					valueXmlString.append("<line_no><![CDATA["+ lineNo1 +"]]></line_no>");					
-					valueXmlString.append("<line_no__sord><![CDATA["+ lnNoSord +"]]></line_no__sord>");					
+					valueXmlString.append("<sord_no><![CDATA[]]></sord_no>");
+					valueXmlString.append("<line_no><![CDATA[]]></line_no>");					
+					valueXmlString.append("<line_no__sord><![CDATA[]]></line_no__sord>");					
 					
 					valueXmlString.append("<lot_no><![CDATA[]]></lot_no>");					
 					valueXmlString.append("<lot_sl><![CDATA[]]></lot_sl>");					
 					valueXmlString.append("<loc_code><![CDATA[]]></loc_code>");					
 					valueXmlString.append("<exp_lev><![CDATA[]]></exp_lev>");					
-					//valueXmlString.append("<remarks><![CDATA["+ "generated from sorder "+"]]></remarks>");					
-					valueXmlString.append("<rate><![CDATA["+rate1 +"]]></rate>");					
-					valueXmlString.append("<item_code__ord><![CDATA["+ itemCodeOrd +"]]></item_code__ord>");					
-					//valueXmlString.append("<item_code><![CDATA["+ itemCode +"]]></item_code>");					
-					//valueXmlString.append("<quantity><![CDATA["+ quantity.trim() +"]]></quantity>");					
-					valueXmlString.append("<unit><![CDATA["+ unit+"]]></unit>");					
-					valueXmlString.append("<conv__qty_stduom><![CDATA["+ conQtyStd +"]]></conv__qty_stduom>");					
-					valueXmlString.append("<unit__rate><![CDATA["+ unitRate +"]]></unit__rate>");				
-					valueXmlString.append("<tax_class><![CDATA["+taxClass.trim() +"]]></tax_class>");				
-					valueXmlString.append("<tax_chap><![CDATA["+taxChap +"]]></tax_chap>");				
-					valueXmlString.append("<tax_env><![CDATA["+ taxEnv+"]]></tax_env>");					
-					valueXmlString.append("<rate__clg><![CDATA["+ rateClg +"]]></rate__clg>");					
-					valueXmlString.append("<tot_net_amt><![CDATA["+ netTotAmt.trim()+"]]></tot_net_amt>");					
-					valueXmlString.append("<site_code><![CDATA["+ siteCodeDet.trim()+"]]></site_code>");					
 										
+					valueXmlString.append("<rate><![CDATA[]]></rate>");					
+					valueXmlString.append("<item_code__ord><![CDATA[]]></item_code__ord>");					
 										
-					valueXmlString.append("<quantity__stduom><![CDATA["+ quntyStduom.trim()+"]]></quantity__stduom>");					
-					valueXmlString.append("<pack_code><![CDATA["+ packCode.trim()+"]]></pack_code>");
-					valueXmlString.append("<unit__std><![CDATA["+ unitStd+"]]></unit__std>");
-					//valueXmlString.append("<CHG_USER><![CDATA["+ userId +"]]></CHG_USER>");
-					//valueXmlString.append("<CHG_TERM><![CDATA["+ termId +"]]></CHG_TERM>");
-					//valueXmlString.append("<CHG_DATE><![CDATA["+ today +"]]></CHG_DATE>");
-					valueXmlString.append("<no_art><![CDATA["+ noArt+"]]></no_art>");
-					valueXmlString.append("<rate__stduom><![CDATA["+ rateStduom +"]]></rate__stduom>");
-					valueXmlString.append("<conv__rtuom_stduom><![CDATA["+ convRtuomStduom +"]]></conv__rtuom_stduom>");
-					valueXmlString.append("<tot_net_amt><![CDATA["+ netAmt +"]]></tot_net_amt>");
+					valueXmlString.append("<unit><![CDATA[]]></unit>");					
+					valueXmlString.append("<conv__qty_stduom><![CDATA[]]></conv__qty_stduom>");					
+					valueXmlString.append("<unit__rate><![CDATA[]]></unit__rate>");				
+					valueXmlString.append("<tax_class><![CDATA[]]></tax_class>");				
+					valueXmlString.append("<tax_chap><![CDATA[]]></tax_chap>");				
+					valueXmlString.append("<tax_env><![CDATA[]]></tax_env>");					
+					valueXmlString.append("<rate__clg><![CDATA[]]></rate__clg>");					
+					valueXmlString.append("<tot_net_amt><![CDATA[]]></tot_net_amt>");					
+					valueXmlString.append("<site_code><![CDATA[]]></site_code>");					
 					
 					
+					valueXmlString.append("<quantity__stduom><![CDATA[]]></quantity__stduom>");					
+					valueXmlString.append("<pack_code><![CDATA[]]></pack_code>");
+					valueXmlString.append("<unit__std><![CDATA[]]></unit__std>");
 					
+					valueXmlString.append("<no_art><![CDATA[]]></no_art>");
+					valueXmlString.append("<rate__stduom><![CDATA[]]></rate__stduom>");
+					valueXmlString.append("<conv__rtuom_stduom><![CDATA[]]></conv__rtuom_stduom>");
+					valueXmlString.append("<tot_net_amt><![CDATA[]]></tot_net_amt>");
 					
 					valueXmlString.append("</Detail3>");					
 					
-					
 				}
 
 				else if(currentColumn.trim().equalsIgnoreCase("lot_sl"))
 				{
-					String lineNoAdd="",lnNoSord="",quantity="",rate1="",conQtyStd="",itemDescr="",itemCodeOrd="";
-					String unitRate="",taxClass="",taxChap="",taxEnv="",netTotAmt="",quntyStduom="",avalyn="",siteCodeMfg="",
-							siteCodeDet="",unitStd="", noArt="", convRtuomStduom="",netAmt="",rateStduom="",packInstr="";
-					String expLev="1.";
+					String lineNoAdd="",lnNoSord="",itemDescr="",itemCodeOrd="";
+					String unitRate="",taxClass="",taxChap="",taxEnv="",netTotAmt="",avalyn="",siteCodeMfg="",
+							siteCodeDet="",unitStd="",noArt="",packInstr="",unit1="",unitStd1="",statusL="";
+					String expLev="",qcLockValueL="";
+					ArrayList qtyFact=new ArrayList();
 					System.out.println("Form 3 itm_default_add called.................");
 					int lineNo1=0;
-					double rateClg=0;
+					double rateClg=0,taxAmt=0,rateStd=0,quntyStduom=0,ordQuantity=0,rate1=0,convQtyStduom=0,rateStduom=0,
+							convRtuomStduom=0,quantity=0,inputQty=0,costRate=0,packQty=0;
+					DistCommon distCommon = new DistCommon();
 					System.out.println("Form 3 lot_sl item change1111111222..............");
 					System.out.println("EDIT fLAG----->>["+editFlag+"]");
 					String lotSlL="",siteCodeL="",dimension="",holdQtyS="HOLD";
-					double qtyStk=0,palletWt=0,cAllocQty=0,holdQty=0,allocQty=0,actualQty=0;					
+					double qtyStk=0,palletWt=0,cAllocQty=0,holdQty=0,allocQty=0,actualQty=0,netAmt=0,discountL=0, conv = 0;					
 					lotSlL=checkNull(genericUtility.getColumnValue("lot_sl", dom2,"3"));
 					System.out.println("lotSlL--->2222["+lotSlL+"]");
 					siteCodeL=getColumnDescr(conn, "site_code", "sorder", "sale_order", sorderNo);
 					avalyn=getColumnDescr(conn, "available_yn", "sorder", "sale_order", sorderNo);
 					avalyn=avalyn==null ? "N" : avalyn.trim();
 					//ADDED nEW
-					
+					sql = "select max(line_no)  "
+							+ "from despatchdet where sord_no = ?";
+					pstmt=conn.prepareStatement(sql);
+					pstmt.setString(1,sorderNo);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						lineNoAdd = checkNull(rs.getString(1));						
+					}				
+					pstmt.close();
+					rs.close();
+					pstmt = null;
+					rs = null;
+					 if(lineNoAdd.length() > 0){
+					 lineNo1=Integer.parseInt(lineNoAdd);
+					 lineNo1++;
+					 }else{
+					  lineNo1=1;
+					 }
+					//rate__std,rate__stduom
 					String currDomStr = genericUtility.serializeDom(dom);
 					System.out.println("currDomStr--------->>["+currDomStr+"]");
-					sql = "select line_no,item_code,item_code__ord,quantity,rate,unit,conv__qty_stduom,unit__rate,tax_class,tax_chap,tax_env,pack_code,rate__clg,quantity__stduom," +
-							"net_tot_amt,net_amt,site_code,unit__std,no_art,rate__stduom,conv__rtuom_stduom from sorddet where sale_order = ? order by line_no";
+					sql = "select sorddet.line_no,"
+							+ "sorditem.item_code,"
+							+ "sorddet.item_code__ord,"
+							+"sorddet.quantity as ord_qty, "
+							+ "sorditem.quantity - sorditem.qty_desp as quantity,"
+							+ "sorddet.rate as rate,"
+							+ "sorddet.unit,"
+							+ "sorddet.conv__qty_stduom,"
+							+ "sorddet.unit__rate,"
+							+"sorddet.status, "		   
+							
+							+ "sorddet.tax_amt,"
+							+ "sorddet.tax_class,"
+							+ "sorddet.tax_chap,"
+							+ "sorddet.tax_env,"
+							+ "sorddet.pack_code,"
+							+ "sorddet.rate__clg,"
+							+ "sorddet.quantity__stduom,"
+							+ "sorddet.net_tot_amt,"
+							+ "sorddet.net_amt,"
+							+ "sorddet.site_code,"
+							+ "sorddet.unit__std,"
+							+ "sorddet.no_art,"
+							+ "sorddet.rate__std,"
+							+ "sorddet.rate__stduom,"
+							+ "sorddet.conv__rtuom_stduom,"
+							+ "sorddet.pack_qty,"
+							+ "sorddet.discount, "
+							
+							 +"sorditem.exp_lev "
+							+ "from sorddet,sorditem where sorddet.sale_order = sorditem.sale_order "
+							+ "and sorditem.line_no = sorddet.line_no"
+							+" AND SORDITEM.SALE_ORDER = ?"
+						    +" AND SORDITEM.LINE_TYPE = ? "
+						    +" ORDER BY SORDITEM.LINE_NO, SORDITEM.EXP_LEV " ;
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,sorderNo);
+					pstmt.setString(2,"I");
 					rs = pstmt.executeQuery();
 				   if( rs.next() )
 				   {
-					   lnNoSord = rs.getString("line_no");	
+					   lnNoSord = checkNull(rs.getString("line_no"));						  
 						itemCode = rs.getString("item_code") == null ? " " : rs.getString("item_code");						
 						itemCodeOrd = rs.getString("item_code__ord") == null ? " " : rs.getString("item_code__ord");						
-						quantity = rs.getString("quantity") == null ? "0" : rs.getString("quantity")  ;
-						rate1 = rs.getString("rate")== null ? " " : rs.getString("rate");
-						unit = rs.getString("unit") == null ? " " : rs.getString("unit");
-						conQtyStd = rs.getString("conv__qty_stduom") == null ? " " : rs.getString("conv__qty_stduom");
+						quantity = rs.getDouble("quantity");						
+						ordQuantity = rs.getDouble("ord_qty");						
+						rate1 = rs.getDouble("rate");					
+						unit1 = checkNull(rs.getString("unit"));					
+						unitStd1=checkNull(rs.getString("unit__std"));						
+						convQtyStduom = rs.getDouble("conv__qty_stduom");						
 						unitRate = rs.getString("unit__rate") == null ? " " : rs.getString("unit__rate");
+					
+						taxAmt=rs.getDouble("tax_amt");						
 						taxClass = rs.getString("tax_class") == null ? " " : rs.getString("tax_class");						
 						taxChap = rs.getString("tax_chap") == null ? " " : rs.getString("tax_chap");						
 						taxEnv = rs.getString("tax_env") == null ? " " : rs.getString("tax_env");						
 						packCode = rs.getString("pack_code") == null ? " " : rs.getString("pack_code");
+					
 						rateClg = rs.getDouble("rate__clg");						
-						quntyStduom = rs.getString("quantity__stduom") == null ? "0" : rs.getString("quantity__stduom");
+						rateStd = rs.getDouble("rate__std");						
+						quntyStduom = rs.getDouble("quantity__stduom");						
 						netTotAmt = rs.getString("net_tot_amt") == null ? " " : rs.getString("net_tot_amt");						
 						siteCodeDet = rs.getString("site_code") == null ? " " : rs.getString("site_code");						
 						unitStd = rs.getString("unit__std") == null ? " " : rs.getString("unit__std");						
 						noArt = checkNull(rs.getString("no_art"));						
-						rateStduom = rs.getString("rate__stduom");	
-						convRtuomStduom = rs.getString("conv__rtuom_stduom");	
-						netAmt = rs.getString("net_amt");
+						rateStduom = rs.getDouble("rate__stduom");				
+						convRtuomStduom = rs.getDouble("conv__rtuom_stduom");
+						
+						netAmt = rs.getDouble("net_amt");						
+						packQty = rs.getDouble("pack_qty");						
+						discountL=rs.getDouble("discount");						
+						expLev=checkNull(rs.getString("exp_lev"));	
+						statusL=checkNull(rs.getString("status"));
 						
 				   } 
 				   pstmt.close();
@@ -1371,57 +1365,101 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					pstmt = null;
 					rs = null;
 				  
-				   
+					inputQty=quantity;
 					
 				   System.out.println("lnNoSord lotSl item change@#-------->>["+lnNoSord+"]"); 
+				   if (!unit1.equals(unitStd1))
+						//if (unit1 == null)
+						{
+							System.out.println("Calling getConvQuantity...........");
+							System.out.println("unitStd1 :"+unitStd1+" \nunit1 :"+unit1+" \nitemCode :"+itemCode+" \nqtyStd :"+quantity+" \nconv :"+conv); 
+							qtyFact = distCommon.getConvQuantityFact(unitStd1, unit1, itemCode, quantity, conv, conn);
+							System.out.println("qtyFact.get(1) :"+qtyFact.get(1));
+							System.out.println("qtyFact.get(1) :"+qtyFact.get(2));
+						}
+						else
+						{
+							qtyFact.add(Integer.toString(1));
+							qtyFact.add(Double.toString(quantity));
+						}
+					System.out.println("qtyFact.size() :"+qtyFact.size());
+					conv = (Double.parseDouble(qtyFact.get(0).toString()));
+					convQtyStduom = (Double.parseDouble(qtyFact.get(0).toString())); //Gulzar - 23/01/08
+					System.out.println("conv :"+conv);
+					inputQty = (Double.parseDouble(qtyFact.get(1).toString()));		
 					
+					discountL=(discountL/100) * ( inputQty *  rateStduom ); 
+				 
+					double[] noArtInfo = getNoArt(siteCodeDet , custCode , itemCode , packCode , Double.parseDouble(qtyFact.get(1).toString()) , "B" , 0 , 0 , conn); 
+					System.out.println("getNoArt111 :: "+noArtInfo[0]+" "+noArtInfo[1]+" "+noArtInfo[2]);
 					
 				   valueXmlString.append("<Detail3 domID='" +lineNo1+ "'  objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
 					 valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
 				  
 					 
 					valueXmlString.append("<desp_id><![CDATA["+ despIdNew +"]]></desp_id>");
+					valueXmlString.append("<sord_no><![CDATA["+ sorderNo +"]]></sord_no>");		
+					valueXmlString.append("<line_no__sord><![CDATA["+ lnNoSord +"]]></line_no__sord>");
 					
-					
-					valueXmlString.append("<lot_no><![CDATA[]]></lot_no>");	                  				
+					/*valueXmlString.append("<lot_no><![CDATA[]]></lot_no>");	                  				
 					valueXmlString.append("<lot_sl><![CDATA[]]></lot_sl>");					
-					valueXmlString.append("<loc_code><![CDATA[]]></loc_code>");					
+					valueXmlString.append("<loc_code><![CDATA[]]></loc_code>");	*/				
 						
 					valueXmlString.append("<exp_lev><![CDATA["+expLev +"]]></exp_lev>");	
 					//valueXmlString.append("<remarks><![CDATA["+ "generated from sorder "+"]]></remarks>");					
-					valueXmlString.append("<rate><![CDATA["+rate1 +"]]></rate>");					
+							
 					valueXmlString.append("<item_code__ord><![CDATA["+ itemCodeOrd +"]]></item_code__ord>");					
 					//valueXmlString.append("<item_code><![CDATA["+ itemCode +"]]></item_code>");					
 					//valueXmlString.append("<quantity><![CDATA["+ quantity.trim() +"]]></quantity>");					
 					valueXmlString.append("<unit><![CDATA["+ unit+"]]></unit>");					
-					valueXmlString.append("<conv__qty_stduom><![CDATA["+ conQtyStd +"]]></conv__qty_stduom>");					
+					valueXmlString.append("<conv__qty_stduom><![CDATA["+ convQtyStduom +"]]></conv__qty_stduom>");					
 					valueXmlString.append("<unit__rate><![CDATA["+ unitRate +"]]></unit__rate>");	
+					
+					valueXmlString.append("<tax_amt><![CDATA["+taxAmt+"]]></tax_amt>");
 					valueXmlString.append("<tax_class><![CDATA["+taxClass.trim() +"]]></tax_class>");				
 					valueXmlString.append("<tax_chap><![CDATA["+taxChap +"]]></tax_chap>");				
 					valueXmlString.append("<tax_env><![CDATA["+ taxEnv+"]]></tax_env>");					
 					valueXmlString.append("<rate__clg><![CDATA["+ rateClg +"]]></rate__clg>");	
+					//disc_amt,conf_diff_amt,cost_rate
+					valueXmlString.append("<sorddet_rate><![CDATA["+rate1 +"]]></sorddet_rate>");			
+					valueXmlString.append("<rate__std><![CDATA["+ rateStd +"]]></rate__std>");
+					valueXmlString.append("<rate__stduom><![CDATA["+ rateStduom +"]]></rate__stduom>");
+					
+					
 					valueXmlString.append("<tot_net_amt><![CDATA["+ netTotAmt.trim()+"]]></tot_net_amt>");					
 					valueXmlString.append("<site_code><![CDATA["+ siteCodeDet.trim()+"]]></site_code>");
 					
-					valueXmlString.append("<quantity__stduom><![CDATA["+ quntyStduom.trim()+"]]></quantity__stduom>");					
+					
+					valueXmlString.append("<quantity__ord><![CDATA["+ ordQuantity+"]]></quantity__ord>");
+					valueXmlString.append("<quantity__stduom><![CDATA["+ quntyStduom+"]]></quantity__stduom>");
+					valueXmlString.append("<pack_qty><![CDATA["+ packQty+"]]></pack_qty>");
 					valueXmlString.append("<pack_code><![CDATA["+ packCode.trim()+"]]></pack_code>");
 					valueXmlString.append("<unit__std><![CDATA["+ unitStd+"]]></unit__std>");
 					valueXmlString.append("<CHG_USER><![CDATA["+ chgUser +"]]></CHG_USER>");
 					valueXmlString.append("<CHG_TERM><![CDATA["+ chgTerm +"]]></CHG_TERM>");
 					valueXmlString.append("<CHG_DATE><![CDATA["+ currAppdate +"]]></CHG_DATE>");
 					valueXmlString.append("<no_art><![CDATA["+ noArt +"]]></no_art>");
-					valueXmlString.append("<rate__stduom><![CDATA["+ rateStduom +"]]></rate__stduom>");
+					
 					valueXmlString.append("<conv__rtuom_stduom><![CDATA["+ convRtuomStduom +"]]></conv__rtuom_stduom>");
 					valueXmlString.append("<tot_net_amt><![CDATA["+ netAmt +"]]></tot_net_amt>");						
 					
-					
+					valueXmlString.append("<disc_amt><![CDATA["+ discountL +"]]></disc_amt>");
 					
 					
 					//Addd New End
 					
 
-					sql = "select loc_code,lot_no,item_code,quantity,gross_weight,net_weight,tare_weight,no_art,pack_instr,dimension,"
-							+ "hold_qty,alloc_qty,site_code__mfg,mfg_date,exp_date,retest_date from stock where site_code = ? and lot_sl = ? and quantity > 0";
+					// Commented - Gulzar - 23/01/08
+					//noArt = new Double((Double.parseDouble(qtyFact.get(1).toString())) / qtyPerArt).intValue();
+					// End Comment - Gulzar - 23/01/08
+
+					// Added - Gulzar - 23/01/08
+					
+					
+					
+					sql = "select loc_code,lot_no,item_code,quantity,gross_weight,net_weight,tare_weight,"
+							+ "no_art,pack_instr,dimension,hold_qty,alloc_qty,site_code__mfg,mfg_date,exp_date,rate,"
+							+ "retest_date from stock where site_code = ? and lot_sl = ? and quantity > 0";
 					pstmt1=conn.prepareStatement(sql);
 					pstmt1.setString(1,siteCodeL);
 					pstmt1.setString(2,lotSlL);
@@ -1449,6 +1487,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						
 						packInstr = checkNull(rs1.getString("pack_instr"));
 						dimension = checkNull(rs1.getString("dimension"));
+						costRate = rs1.getDouble("rate");
 						
                     }
 					pstmt1.close();
@@ -1501,11 +1540,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					if(expiryDate !=null){
 					valueXmlString.append("<exp_date>").append("<![CDATA[").append(sdf.format(expiryDate).toString()).append("]]>").append("</exp_date>");
 					}
-					if(expiryDate !=null){
+					if(retestDate !=null){
 						valueXmlString.append("<retest_date>").append("<![CDATA[").append(sdf.format(retestDate).toString()).append("]]>").append("</retest_date>");
 					}		
 					
-					
+					qcLockValueL=checkNull(getColumnDescr(conn, "var_value", "disparm", "var_name", "QUARNTINE_LOCKCODE"));					
+					valueXmlString.append("<lock_code><![CDATA["+ qcLockValueL +"]]></lock_code>");
+					valueXmlString.append("<status><![CDATA["+ statusL +"]]></status>");
+					valueXmlString.append("<cost_rate><![CDATA["+ costRate +"]]></cost_rate>");
 					valueXmlString.append("<lot_sl><![CDATA["+ lotSlL +"]]></lot_sl>");
 					if(holdQty > 0){
 						valueXmlString.append("<lot_status><![CDATA["+ holdQtyS +"]]></lot_status>");
@@ -1803,8 +1845,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		
 		valueXmlString.append("<freight><![CDATA["+ frtAmt +"]]></freight>");
 		valueXmlString.append("<insurance><![CDATA["+ insurance +"]]></insurance>");
+		;
 		
-		valueXmlString.append("<eff_date><![CDATA["+ currAppdate +"]]></eff_date>");
 		
 		if(licenceNo1.length() == 0){
 			sql="select c.drug_lic_no_1,c.drug_licno1_upto from sorder s,customer c	"
@@ -1864,7 +1906,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		
 		
 		valueXmlString.append("<gp_ser>").append("<![CDATA["+gpSer +"]]>").append("</gp_ser>");
-		
+		valueXmlString.append("<eff_date><![CDATA["+ currAppdate +"]]></eff_date>");
 		valueXmlString.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>"); 
 		valueXmlString.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
 		valueXmlString.append("<chg_date>").append("<![CDATA[" +currAppdate +"]]>").append("</chg_date>");
@@ -2025,4 +2067,245 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		}
 		return str.trim();
 	}
+	private double[] getNoArt(String siteCode , String custCode , String itemCode , String packCode , double qty , String qtyType , double shipperQty , double integralQty, Connection conn)
+	{
+
+		String tempSql = "";
+		String tempSql1 = "";
+		String tempSql2 = "";
+		ResultSet rsTemp = null;
+		ResultSet rsTemp1 = null;
+		ResultSet rsTemp2 = null;
+
+		Statement stmt = null;
+		double capacity = 0d;
+		double reoQty = 0d;
+		double shipperQty1 = 0d;
+		double remainder = 0d;
+		double integralQty1 = 0d;
+		double result[] = new double[3];
+		double noArt1 = 0d, noArt2 = 0d, noArt = 0d;
+		try
+		{
+			stmt = conn.createStatement();
+			if (qtyType.equals("S"))
+			{
+				tempSql = "SELECT (CASE WHEN CAPACITY IS NULL THEN 0 ELSE CAPACITY END) AS CAPACITY FROM PACKING WHERE PACK_CODE = '" + packCode + "'";
+				System.out.println("SQL :: "+tempSql);
+				rsTemp = stmt.executeQuery(tempSql);
+				if (rsTemp.next())
+				{
+					capacity = rsTemp.getDouble("CAPACITY");
+				}
+				else
+				{
+					capacity = 0d;
+				}
+				tempSql = "";
+				rsTemp.close();
+
+				tempSql = "SELECT  REO_QTY " + 
+							" FROM SITEITEM WHERE SITE_CODE = '" + siteCode + "' " +  //by jaimin 
+							" AND ITEM_CODE = '" + itemCode + "' ";
+				System.out.println("SQL :: "+tempSql);
+				rsTemp = stmt.executeQuery(tempSql);
+				if (rsTemp.next())
+				{
+					reoQty = rsTemp.getDouble("REO_QTY");
+				}
+				else
+				{
+					tempSql1 = "SELECT REO_QTY FROM ITEM  WHERE ITEM_CODE = '"+ itemCode +"' ";
+					System.out.println("SQL :: "+tempSql1);
+					rsTemp1 = stmt.executeQuery(tempSql1);
+					if (rsTemp1.next())
+					{
+						reoQty = rsTemp1.getDouble("REO_QTY");
+					}
+					rsTemp1.close();
+					tempSql1 = "";
+				}
+				tempSql = "";
+				rsTemp.close();
+
+				if ( capacity > 0 )
+				{
+					shipperQty1 = capacity;
+				}
+				else
+				{
+					shipperQty1 = reoQty;
+				}
+				if ( shipperQty1 > 0 )
+				{
+					noArt = (qty - (qty % shipperQty1)) / shipperQty1;
+				}
+				else
+				{
+					noArt =1;
+				}
+			}		
+			else if ( qtyType.equals("I") )
+			{
+				tempSql = "SELECT INTEGRAL_QTY FROM CUSTOMERITEM WHERE CUST_CODE = '"+ custCode +"' "
+							 +" AND ITEM_CODE = '"+ itemCode +"' ";
+				System.out.println("SQL :: "+tempSql);
+				rsTemp = stmt.executeQuery(tempSql);
+				if (rsTemp.next())
+				{
+					integralQty1 = rsTemp.getDouble("INTEGRAL_QTY");
+				}
+				else
+				{
+					tempSql1 = "SELECT INTEGRAL_QTY FROM SITEITEM WHERE SITE_CODE = '"+ siteCode +"' AND "
+									+" ITEM_CODE = '"+ itemCode +"' ";
+					System.out.println("SQL :: "+tempSql1);
+					rsTemp1 = stmt.executeQuery(tempSql1);
+					if (rsTemp1.next())
+					{
+						integralQty1 = rsTemp1.getDouble("INTEGRAL_QTY");
+					}
+					else
+					{
+						tempSql2 = "SELECT INTEGRAL_QTY FROM ITEM WHERE ITEM_CODE = '"+ itemCode +"' ";
+						System.out.println("SQL :: "+tempSql2);
+						rsTemp2 = stmt.executeQuery(tempSql2);
+						if ( rsTemp2.next() )
+						{
+							integralQty1 = rsTemp2.getDouble("INTEGRAL_QTY");
+						}
+						rsTemp2.close();
+						tempSql2 = "";
+					}
+					rsTemp1.close();
+					tempSql1 = "";
+				}
+				tempSql = "";
+				rsTemp.close();
+				
+				if ( integralQty1 > 0 )
+				{
+					noArt = (qty - (qty % integralQty1)) / integralQty1;
+				}
+				else
+				{
+					noArt = 1;
+				}
+			}
+			else if ( qtyType.equals("B") )
+			{
+				tempSql = "SELECT (CASE WHEN CAPACITY IS NULL THEN 0 ELSE CAPACITY END) AS CAPACITY FROM PACKING WHERE PACK_CODE = '"+ packCode +"'";
+				System.out.println("SQL :: "+tempSql);
+				rsTemp = stmt.executeQuery(tempSql);
+				if (rsTemp.next())
+				{
+					capacity = rsTemp.getDouble("CAPACITY");
+				}
+				else
+				{
+					capacity = 0d;
+				}
+				tempSql = "";
+				rsTemp.close();
+
+				tempSql = "SELECT REO_QTY "
+							 +" FROM SITEITEM "
+							 +" WHERE SITE_CODE = '"+ siteCode +"' " //jaimin
+							 +" AND ITEM_CODE = '"+ itemCode +"' ";
+				System.out.println("SQL :: "+tempSql);
+				rsTemp = stmt.executeQuery(tempSql);
+				if (rsTemp.next())
+				{
+					reoQty = rsTemp.getDouble("REO_QTY");
+				}
+				else
+				{
+					tempSql1 = "SELECT REO_QTY FROM ITEM WHERE ITEM_CODE = '"+ itemCode +"' ";
+					System.out.println("SQL :: "+tempSql1);
+					rsTemp1 =stmt.executeQuery(tempSql1);
+					if (rsTemp1.next())
+					{
+						reoQty = rsTemp1.getDouble("REO_QTY");
+					}
+					rsTemp1.close();
+					tempSql1 = "";
+				}
+				tempSql = "";
+				rsTemp.close();
+
+
+				if ( capacity > 0 )
+				{
+					shipperQty1 = capacity;
+				}
+				else
+				{
+					shipperQty1 = reoQty;
+				}
+				if ( shipperQty1 > 0 )
+				{
+					noArt1 = (qty - (qty % shipperQty1)) / shipperQty1;
+					remainder = ( qty % shipperQty1 );
+				}
+
+				tempSql = "SELECT INTEGRAL_QTY FROM CUSTOMERITEM WHERE CUST_CODE = '"+ custCode +"' "
+							+" AND ITEM_CODE = '"+ itemCode +"' ";
+				System.out.println("SQL :: "+tempSql);
+				rsTemp = stmt.executeQuery(tempSql);
+				if (rsTemp.next())
+				{
+					integralQty1 = rsTemp.getDouble("INTEGRAL_QTY");
+				}
+				else
+				{
+					tempSql1 =  "SELECT INTEGRAL_QTY "
+						+"  FROM SITEITEM WHERE SITE_CODE = '"+ siteCode +"' "
+						+" 	AND ITEM_CODE = '"+ itemCode +"' ";
+					System.out.println("SQL :: "+tempSql1);
+					rsTemp1 = stmt.executeQuery(tempSql1);
+					if ( rsTemp1.next() )
+					{
+						integralQty1 = rsTemp1.getDouble("INTEGRAL_QTY");
+					}
+					else
+					{
+						tempSql2 = "SELECT INTEGRAL_QTY FROM ITEM WHERE ITEM_CODE = '"+ itemCode +"' ";
+						System.out.println("SQL :: "+tempSql2);
+						rsTemp2 = stmt.executeQuery(tempSql1);
+						if ( rsTemp2.next() )
+						{
+							integralQty1 = rsTemp2.getDouble("INTEGRAL_QTY");
+						}
+						tempSql2 = "";
+						rsTemp2.close();
+					}
+					tempSql1 = "";
+					rsTemp1.close();
+				}
+				if ( integralQty1 > 0 )
+				{
+					noArt2 = (remainder - (remainder % integralQty1)) / integralQty1;
+				}
+				if ( noArt2 > 0 )
+				{
+					noArt2 = 1;
+				}
+				noArt = noArt1 + noArt2;
+			}
+			else
+			{
+				noArt = 0;
+			}			
+		}
+		catch (Exception e)
+		{
+			System.out.println("Exception in getNoArt :: "+e.getMessage());
+			e.printStackTrace();
+		}
+		result[0] = noArt;
+		result[1] = shipperQty1;
+		result[2] = integralQty1;
+		return result;
+	
+	}
 }