Skip to content

B
business-java
Commit 298328f7 authored by manohar's avatar manohar
Browse files
Options

MF89SUN092 various bugs rectified 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91590 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9d245e02
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 72 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/InvPackAct.java
View file @ 298328f7
......@@ -530,6 +530,9 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
ConnDriver connDriver = new ConnDriver();
GenericUtility genericUtility = GenericUtility.getInstance();
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
PreparedStatement pstmt = null; // 12/03/12 manoharan
String locDescr = "";
double tareTmp = 0, grossTmp = 0, netTmp = 0;
try
{
conn = connDriver.getConnectDB("DriverITM");
......@@ -601,22 +604,53 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
{
retNumber = 1;
}
// 12/03/12 manoharan
sql = "SELECT DESCR FROM LOCATION WHERE LOC_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCode);
rs = pstmt.executeQuery();
if (rs.next())
{
locDescr = rs.getString(1)==null?"":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
for (int i = 0; i < Integer.parseInt(noArt); i++)
{
lotSl = String.valueOf(Long.parseLong(lotSl)+1);
System.out.println("lotSl :"+lotSl);
// 12/03/12 manoharan itemchanged should not happen for any column as it is working very slow
valueXmlString.append("<Detail>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<pack_code>").append("<![CDATA[").append(packCode).append("]]>").append("</pack_code>\r\n");
valueXmlString.append("<grosswt_pack>").append("<![CDATA[").append(grossWtPack).append("]]>").append("</grosswt_pack>\r\n");
valueXmlString.append("<tarewt_pack>").append("<![CDATA[").append(tareWtPack).append("]]>").append("</tarewt_pack>\r\n");
valueXmlString.append("<gross_weight>").append("<![CDATA[").append(grossWt).append("]]>").append("</gross_weight>\r\n");
valueXmlString.append("<tare_weight>").append("<![CDATA[").append(tareWt).append("]]>").append("</tare_weight>\r\n");
valueXmlString.append("<qty_pack>").append("<![CDATA[").append(qtyPack).append("]]>").append("</qty_pack>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[").append(qtyPack).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<no_art>").append("<![CDATA[").append(1).append("]]>").append("</no_art>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append(lotSl).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n");
valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<pack_code isSrvCallOnChg='0'>").append("<![CDATA[").append(packCode).append("]]>").append("</pack_code>\r\n");
valueXmlString.append("<grosswt_pack isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWtPack).append("]]>").append("</grosswt_pack>\r\n");
valueXmlString.append("<tarewt_pack isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWtPack).append("]]>").append("</tarewt_pack>\r\n");
valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWt).append("]]>").append("</gross_weight>\r\n");
valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWt).append("]]>").append("</tare_weight>\r\n");
valueXmlString.append("<qty_pack isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyPack).append("]]>").append("</qty_pack>\r\n");
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyPack).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(1).append("]]>").append("</no_art>\r\n");
valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(lotSl).append("]]>").append("</lot_sl>\r\n");
// 12/03/12 manoharan additional values set
if (tareWt == null)
{
tareWt = "0";
}
if (grossWt == null)
{
grossWt = "0";
}
tareTmp = Double.parseDouble(tareWt);
grossTmp = Double.parseDouble(grossWt);
netTmp = grossTmp - tareTmp;
valueXmlString.append("<net_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(netTmp).append("]]>").append("</net_weight>\r\n");
valueXmlString.append("<location_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(locDescr).append("]]>").append("</location_descr>\r\n");
// end 12/03/12 manoharan
if (!checkIsNumber(str))
{
packInst = str + String.valueOf(retNumber);
......@@ -625,7 +659,7 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
{
packInst = String.valueOf(retNumber);
}
valueXmlString.append("<pack_instr>").append("<![CDATA[").append(packInst).append("]]>").append("</pack_instr>\r\n");
valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(packInst).append("]]>").append("</pack_instr>\r\n");
valueXmlString.append("</Detail>\r\n");
retNumber = retNumber + 1;
}//end for
......
webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnFormSplit.java
View file @ 298328f7
......@@ -136,7 +136,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
pstmt.setString(1,"S");
pstmt.setString(2,tranId);
pstmt.executeQuery();
pstmt.executeUpdate();
retString = itmDBAccessLocal.getErrorString("","VTSRSPLIT","");
......@@ -482,6 +482,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
pstmt2 = null;
rs2.close();
rs2 = null;
// 26/11/11 manoharan salesperson to be set
sql1 = "select curr_code,cust_code__bil,price_list,trans_mode, price_list__clg, sales_pers from customer where cust_code = ?";
// end 26/11/11 manoharan salesperson to be set
......@@ -515,7 +516,28 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
pstmt2 = null;
rs2.close();
rs2 = null;
sql1 = "select sales_pers from customer_series where cust_code = ? and item_ser = ?";
// end 26/11/11 manoharan salesperson to be set
pstmt2 = conn.prepareStatement(sql1);
pstmt2.setString(1,custCd);
pstmt2.setString(2,itemSerDet);
rs2 = pstmt2.executeQuery();
String salesPersTmp = "";
if(rs2.next())
{
salesPersTmp = rs2.getString("sales_pers") == null ? " " : rs2.getString("sales_pers");
}
pstmt2.close();
pstmt2 = null;
rs2.close();
rs2 = null;
if (salesPersTmp != null && salesPersTmp.trim().length() > 0 )
{
salesPers = salesPersTmp;
}
sql2 ="select unit,unit__rate from item where item_code = ?";
pstmt2 = conn.prepareStatement(sql2);
pstmt2.setString(1,itemCode);
......@@ -686,8 +708,8 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
xmlBuff.append("<group0>");
xmlBuff.append("<description>").append("Group0 description").append("</description>");
xmlBuff.append("<Header0>");
//xmlBuff.append("<objName><![CDATA[").append("salesreturn").append("]]></objName>");
xmlBuff.append("<objName><![CDATA[").append("salesreturn_split_tr").append("]]></objName>");
xmlBuff.append("<objName><![CDATA[").append("salesreturn").append("]]></objName>");
//xmlBuff.append("<objName><![CDATA[").append("salesreturn_split_tr").append("]]></objName>");
xmlBuff.append("<pageContext><![CDATA[").append("1").append("]]></pageContext>");
xmlBuff.append("<objContext><![CDATA[").append("1").append("]]></objContext>");
xmlBuff.append("<editFlag><![CDATA[").append("A").append("]]></editFlag>");
......
webitm-mfg/ibase/webitm/ejb/mfg/adv/WOrderIssueAct.java
View file @ 298328f7
......@@ -21,7 +21,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.StringTokenizer;
import java.text.DecimalFormat;
import javax.ejb.CreateException;
import javax.ejb.SessionBean;
import javax.xml.transform.OutputKeys;
......@@ -303,7 +303,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
sql = "select w.LOT_NO__ISSUE,b.CONSIDER_LOT_NO__ISSUE from workorder w, workorder_bill b "
+ " where w.work_order = b.work_order "
+ " and w.work_order = ? "
+ " and b.emp_lev = ? ";
+ " and b.exp_lev = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, workOrder);
pstmt.setString(2, expLev);
......@@ -1232,7 +1232,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
lotNo = genericUtility.getColumnValue("lot_no", dom);
lotSl = genericUtility.getColumnValue("lot_sl", dom);
quantity = Double.parseDouble(genericUtility.getColumnValue("quantity", dom));
System.out.println("Manohar quantity [" + quantity + "]");
System.out.println("Manohar 14/03/12 quantity [" + quantity + "]");
expLev = genericUtility.getColumnValue("exp_lev", dom);
System.out.println("expLev ::: " + expLev);
reasCode = genericUtility.getColumnValue("reas_code", dom);
......@@ -1601,7 +1601,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
System.out.println("effDate ::: " + effDate + "dimension ::: " + dimension + "trimWidth ::: " + trimWidth);
rs = pstmt.executeQuery();
remainingQty = quantity;
while (rs.next())
{
stkLocCode = rs.getString(1);
......@@ -1617,8 +1617,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
allocQty = rs.getString(11);
packCode = rs.getString(12);
remainingQty = quantity;
System.out.println("stkQtyLot ::: " + stkQtyLot + "criteria ::: " + criteria);
System.out.println("manohar stkQtyLot [" + stkQtyLot + "] remainingQty [" + remainingQty + "] criteria [" + criteria + "]");
if (stkQtyLot >= remainingQty)
{
if (criteria != null && criteria.equalsIgnoreCase("W"))
......@@ -1888,7 +1888,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
}
catch (Exception e){}
}
System.out.println("valueXmlString return from WOrderIssueActEJB :"+valueXmlString.toString());
System.out.println("valueXmlString return from WOrderIssueActEJB.actionAllocate ["+valueXmlString.toString() + "]");
return valueXmlString.toString();
}
......@@ -2765,6 +2765,23 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
}
// added by chandni shah - 21-Dec-2011
public double getReqDecimal(double actVal, int prec)
{
String fmtStr = "############0";
String strValue = null;
double retVal = 0;
if (prec > 0)
{
fmtStr = fmtStr + "." + "000000000".substring(0, prec);
}
DecimalFormat decFormat = new DecimalFormat(fmtStr);
retVal = Double.parseDouble(decFormat.format(actVal));
if (Math.abs(retVal) == 0)
{
retVal = 0;
}
return retVal;
}
public ArrayList getDetails(String woCode) throws ITMException
{
PreparedStatement pstmt = null, pstmt1 = null;
......@@ -2776,8 +2793,8 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
String trackShelfLife = null;
String itemCode = null,siteCode = null;
Timestamp currDate =null;
double qtyPer = 0;
double qtyPer = 0, minQty = 0, woQty = 0, batchQty = 0;
String reqType = "";
try
{
ConnDriver connDriver = new ConnDriver();
......@@ -2798,11 +2815,13 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
if(woCode!=null)
{
sql =" select b.item_code,b.descr,a.site_code, sum(c.qty_per) qty_per from workorder a ,item b, bomdet c "
sql =" select b.item_code,b.descr,a.site_code,c.req_type, sum(c.qty_per) qty_per, "
+ " sum(c.min_qty), a.quantity,d.batch_qty from workorder a ,item b, bomdet c, bom d "
+" where c.item_code = b.item_code "
+ " and c.bom_code = a.bom_code "
+ " and d.bom_code = a.bom_code "
+" and a.work_order = ? "
+ " group by b.item_code,b.descr,a.site_code ";
+ " group by b.item_code,b.descr,a.site_code,c.req_type, a.quantity,d.batch_qty ";
System.out.println("MainQuery:::"+sql);
pstmt1 = conn.prepareStatement(sql);
......@@ -2817,8 +2836,25 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
thisBean.itemCode = rs.getString(1);
thisBean.descr = rs.getString(2);
siteCode = rs.getString(3);
thisBean.qtyPer = rs.getDouble(4);
reqType = rs.getString(4);
thisBean.qtyPer = rs.getDouble(5);
minQty = rs.getDouble(6);
woQty = rs.getDouble(7);
batchQty = rs.getDouble(8);
if ("S".equals(reqType))
{
thisBean.qtyPer = woQty / batchQty * rs.getDouble(5);
}
else if ("P".equals(reqType))
{
thisBean.qtyPer = rs.getDouble(5) / batchQty * woQty;
}
if (thisBean.qtyPer < minQty)
{
thisBean.qtyPer = minQty;
}
thisBean.qtyPer = getReqDecimal(thisBean.qtyPer, 3);
pstmt = conn.prepareStatement("select nvl(track_shelf_life,'N') from item where item_code = ?") ;
pstmt.setString(1,itemCode);
ResultSet rs1 = pstmt.executeQuery();
......
webitm-mfg/ibase/webitm/ejb/mfg/adv/WoStockBean.java
View file @ 298328f7
......@@ -14,7 +14,7 @@ import javax.ejb.*;
public class WoStockBean
{
public String itemCode = "",descr = "",workOrder = "",allockQty = "";
public double stkQty = 0.0,nonStkQty = 0.0;
public double stkQty = 0.0,nonStkQty = 0.0, qtyPer = 0;
public void setWorkOrder(String workOrderJsp)
{
......@@ -46,6 +46,10 @@ public class WoStockBean
for (int i=0; i<stkWoRetArr.size(); i++ )
{
stkParms = (WOrderIssueAct.woStockDtlParams)(stkWoRetArr.get(i));
System.out.println("stkParms.stkQty [" + stkParms.stkQty + "]");
System.out.println("stkParms.nonStkQty [" + stkParms.nonStkQty + "]");
System.out.println("stkParms.allockQty [" + stkParms.allockQty + "]");
System.out.println("stkParms.qtyPer [" + stkParms.qtyPer + "]");
stkWoBean = new WoStockBean();
stkWoBean.itemCode = stkParms.itemCode;
......@@ -54,6 +58,7 @@ public class WoStockBean
stkWoBean.stkQty = stkParms.stkQty;
stkWoBean.nonStkQty = stkParms.nonStkQty;
stkWoBean.allockQty = stkParms.allockQty;
stkWoBean.qtyPer = stkParms.qtyPer;
thisBeanArray.add(stkWoBean);
}
......
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