Skip to content

B
business-java
Commit 235e4f5f authored by rtiwari's avatar rtiwari
Browse files
Options

update packing instr. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95144 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c1349a49
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 6 deletions
webitm-dis/ibase/webitm/ejb/dis/GenerateSaleOrderPrc.java
View file @ 235e4f5f
......@@ -9,6 +9,7 @@ import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.MasterStatefulLocal;
import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.servlet.DocumentHandlerServlet;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
......@@ -177,6 +178,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
errString = itmDBAccessEJB.getErrorString("","VTTNNTFD ","","",conn);
return errString;
}
DocumentHandlerServlet d = null;
sql = "select count(*) from sorder where TRAN_ID__PORCP = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -556,7 +558,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
String groupCode="";
String currCode1 ="",currCode2="",custCodeDlv="";
String taxEnv = "",purcOrder = "",tranCode="",pricelistTmp="",pricelistClgTmp="";
String packCode ="",convRtuomStduom="",rateStduom="",dlvTo="";
String packCode ="",convRtuomStduom="",rateStduom="",dlvTo="",packing="";
String lineno = "",noArt = "",netAmt = "",frtTerm="",deliveryTerm="",commpercon="",commPercOn2="";
String pin = "", stateCode = "",city = "",countCode = "",unitStd = "",salesPersTmp="",crTermTmp="",salesPersTmp1="",salesPersTmp2="";
String transmodeFromCust="",custCodeBil="",pricelist="",pricelistClg="",salespers="",salespers1="",salespers2="";
......@@ -1134,7 +1136,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("</Detail1>");
sql = "select line_no,item_code,quantity,rate,unit,conv__qty_stduom,unit__rate,tax_class,tax_chap,tax_env,pack_code,rate__clg,quantity__stduom,unit__std," +
"no_art,conv__rtuom_stduom,rate__stduom,NET_AMT,discount from porcpdet where tran_id = ? order by line_no";
"no_art,conv__rtuom_stduom,rate__stduom,NET_AMT,discount,pack_instr from porcpdet where tran_id = ? order by line_no";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -1158,6 +1160,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
discount = rs.getDouble("discount");
rateStduom = rs.getString("rate__stduom");
convRtuomStduom = rs.getString("conv__rtuom_stduom");
packing = rs.getString("pack_instr");
quntyStduom = rs.getString("quantity__stduom") == null ? "0" : rs.getString("quantity__stduom");
sql = " select min_shelf_life ,max_shelf_life "
......@@ -1372,6 +1375,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("<comm_perc_on_2><![CDATA["+ commPercOn1 +"]]></comm_perc_on_2>");
xmlBuff.append("<comm_perc_3><![CDATA["+ commPerc2 +"]]></comm_perc_3>");
xmlBuff.append("<comm_perc_on_3><![CDATA["+ commPercOn2 +"]]></comm_perc_on_3>");
xmlBuff.append("<pack_instr><![CDATA["+ packing +"]]></pack_instr>");
xmlBuff.append("</Detail2>");
}
lnno = 0;
......@@ -1511,7 +1515,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
double tarePer = 0d;
double grossWeight1 = 0d,tareWeight1 = 0d,netWeight1 = 0d;
DecimalFormat df = new DecimalFormat("#########.###");
String sqlTemp ="";
String sqlTemp = "";
String packing = "",packingStk="";
try
{
System.out.println("@@@@@@@ despatchOrder function called");
......@@ -1631,7 +1636,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("</Detail1>");
sql = "select line_no,item_code,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";
"net_tot_amt,net_amt,site_code,unit__std,no_art,rate__stduom,conv__rtuom_stduom,pack_instr from sorddet where sale_order = ? order by line_no";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
rs = pstmt.executeQuery();
......@@ -1657,6 +1662,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rateStduom = rs.getString("rate__stduom");
convRtuomStduom = rs.getString("conv__rtuom_stduom");
netAmt = rs.getString("net_amt");
packing = rs.getString("pack_instr");
sql ="select lot_sl,lot_no,loc_code from porcpdet where tran_id = ? and line_no = ? ";
pstmt1 = conn.prepareStatement(sql);
......@@ -1690,6 +1696,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
+"A.GROSS_WT_PER_ART, "
+"A.TARE_WT_PER_ART ,"
+"A.PALLET_WT, "
+"A.PACK_INSTR, "
+"A.ALLOC_QTY "
+"FROM STOCK A "
+"WHERE A.ITEM_CODE = '"+itemCode+"' "
......@@ -1708,6 +1715,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
netWeight = rs1.getDouble("NET_WEIGHT");
dimension = rs1.getString("DIMENSION");
palletWt = rs1.getDouble("PALLET_WT");
packingStk = rs1.getString("PACK_INSTR");
cAllocQty = rs1.getDouble("alloc_qty");
}
rs1.close();
......@@ -1751,7 +1759,10 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
System.out.println("stk > 0 :: grossWeight1:["+grossWeight1+"]netWeight1:["+netWeight1+"]tareWeight1:["+tareWeight1+"]");
}
// ADDED BY RITESH ON 26/05/13 END
if(packing == null || packing.trim().length() <=0)
{
packing = packingStk;
}
lnno ++;
System.out.println("--LINE NO--"+lnno);
xmlBuff.append("<Detail2 dbID='' domID=\"1\" objName=\"despatch\" objContext=\"2\">");
......@@ -1796,7 +1807,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("<tare_weight>").append("<![CDATA[").append(tareWeight1).append("]]>").append("</tare_weight>");
xmlBuff.append("<dimension><![CDATA["+ dimension +"]]></dimension>");
xmlBuff.append("<pallet_wt><![CDATA["+ palletWt +"]]></pallet_wt>");
xmlBuff.append("<pack_code><![CDATA["+ packCode +"]]></pack_code>");
xmlBuff.append("<pack_instr><![CDATA["+ packing +"]]></pack_instr>");
// ADDED BY RITESHON 26/05/13 END
xmlBuff.append("</Detail2>");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment