Commit 76ec5023 authored by rtiwari's avatar rtiwari

UPDATED


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94148 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 771e49ba
...@@ -293,6 +293,8 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -293,6 +293,8 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
retTabSepStrBuff.append("<lot_sl>").append("<![CDATA[" + rs.getString("lot_sl") +"]]>").append("</lot_sl>"); retTabSepStrBuff.append("<lot_sl>").append("<![CDATA[" + rs.getString("lot_sl") +"]]>").append("</lot_sl>");
retTabSepStrBuff.append("<actual_qty>").append("<![CDATA[" + df.format(issQty) +"]]>").append("</actual_qty>"); retTabSepStrBuff.append("<actual_qty>").append("<![CDATA[" + df.format(issQty) +"]]>").append("</actual_qty>");
retTabSepStrBuff.append("<actual_propqty>").append("<![CDATA[" + df.format(allocQty) +"]]>").append("</actual_propqty>");
sql = "select INTEGRAL_QTY from item where item_code = ?"; sql = "select INTEGRAL_QTY from item where item_code = ?";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
...@@ -346,7 +348,6 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -346,7 +348,6 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
//} //}
}while(rs.next()); }while(rs.next());
retTabSepStrBuff.append("</Header0>"); retTabSepStrBuff.append("</Header0>");
retTabSepStrBuff.append("</group0>"); retTabSepStrBuff.append("</group0>");
retTabSepStrBuff.append("</DocumentRoot>"); retTabSepStrBuff.append("</DocumentRoot>");
...@@ -456,12 +457,12 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -456,12 +457,12 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
String allocQty="",itemCode=""; String allocQty="",itemCode="";
String errString = null,sql=""; String errString = null,sql="";
String siteCode="",explev="",lineno="",lotno="",lotsl="",locCodeFr="",reasCode=""; String siteCode="",explev="",lineno="",lotno="",lotsl="",locCodeFr="",reasCode="";
String worder = "",locCodeTo="",remarks="",tranId=""; String worder = "",locCodeTo="",remarks="",tranId="",locCodeFrom="";
Connection connOne = null; Connection connOne = null;
ConnDriver connDriver = null; ConnDriver connDriver = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
double actualQty =0.0,trfedQty = 0.0,allocQty2=0.0; double actualQty =0.0,trfedQty = 0.0,allocQty2=0.0,actualPropQty=0.0;
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
String childNodeName = ""; String childNodeName = "";
Node parentNode = null; Node parentNode = null;
...@@ -473,7 +474,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -473,7 +474,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
int elements = 0; int elements = 0;
boolean allocqtyflag = false; boolean allocqtyflag = false;
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
double integralQty = 0.0; double integralQty = 0.0,batchQuantity=0.0,issueQtyDet=0.0;
DecimalFormat df = new DecimalFormat("0.000"); DecimalFormat df = new DecimalFormat("0.000");
try try
{ {
...@@ -487,6 +488,9 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -487,6 +488,9 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
parentNodeList = detailDom.getElementsByTagName("Detail2"); parentNodeList = detailDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength(); parentNodeListLength = parentNodeList.getLength();
System.out.println("parentNodeListLength------------------->"+parentNodeListLength); System.out.println("parentNodeListLength------------------->"+parentNodeListLength);
String batchQuantityStr = checkNull(genericUtility.getColumnValue("batch_quantity", headerDom));
batchQuantity = Double.parseDouble(batchQuantityStr);
System.out.println(" batchQuantity ::"+batchQuantity);
for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++) for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
{ {
parentNode = parentNodeList.item(selectedRow); parentNode = parentNodeList.item(selectedRow);
...@@ -594,6 +598,16 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -594,6 +598,16 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
} }
} }
} }
if (childNodeName.equals("loc_code"))
{
if(childNode !=null)
{
if(childNode.getFirstChild() != null)
{
locCodeFrom = childNode.getFirstChild().getNodeValue();
}
}
}
if (childNodeName.equals("work_order")) if (childNodeName.equals("work_order"))
{ {
worder = childNode.getFirstChild().getNodeValue(); worder = childNode.getFirstChild().getNodeValue();
...@@ -618,6 +632,16 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -618,6 +632,16 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
} }
} }
} }
if (childNodeName.equals("actual_propqty"))
{
if(childNode !=null)
{
if(childNode.getFirstChild() != null)
{
actualPropQty = Double.parseDouble(childNode.getFirstChild().getNodeValue());
}
}
}
if (childNodeName.equals("allocated_qty")) if (childNodeName.equals("allocated_qty"))
{ {
if(childNode !=null) if(childNode !=null)
...@@ -644,12 +668,35 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -644,12 +668,35 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println(" amount values "+actualQty+"::"+trfedQty+"::"+allocQty2); System.out.println(" amount values "+actualQty+"::"+trfedQty+"::"+allocQty2);
//if(Double.parseDouble(df.format(actualQty - trfedQty)) >= Double.parseDouble(df.format(allocQty2))) // sql = "SELECT ISSUE_QTY FROM INV_ALLOC_DET WHERE tran_id = ? and item_code = ? and lot_no = ? and lot_sl = ? and loc_code = ? and site_code = ? ";
if((Double.parseDouble(df.format(actualQty - trfedQty)) >= Double.parseDouble(df.format(allocQty2))) || (Double.parseDouble(df.format((allocQty2 + trfedQty)-actualQty)) <= integralQty)) // pstmt = connOne.prepareStatement(sql);
{ // pstmt.setString(1, tranId);
errString = allocStockToWo(lineno,siteCode,itemCode,lotno,lotsl,allocQty,reasCode,locCodeFr,explev,locCodeTo,worder,remarks,tranId,xtraParams,connOne); // pstmt.setString(2, itemCode);
// pstmt.setString(3, lotno);
// pstmt.setString(4, lotsl);
// pstmt.setString(5, locCodeFrom);
// pstmt.setString(6, siteCode);
// rs = pstmt.executeQuery();
// if ( rs.next() )
// {
// issueQtyDet = rs.getDouble(1);
// }
// if(rs != null)
// rs.close();
// rs = null;
// if(pstmt != null)
// pstmt.close();
// pstmt = null;
//if((Double.parseDouble(df.format(actualQty - trfedQty)) >= Double.parseDouble(df.format(allocQty2))) || (Double.parseDouble(df.format((allocQty2 + trfedQty)-actualQty)) <= integralQty))
// if((Double.parseDouble(df.format(actualQty - trfedQty)) >= Double.parseDouble(df.format(allocQty2))) || (Double.parseDouble(df.format((allocQty2 + trfedQty)-issueQtyDet)) <= integralQty))
if(actualQty > 0.0)
{
if((Double.parseDouble(df.format(actualQty - trfedQty)) >= Double.parseDouble(df.format(allocQty2))) || (Double.parseDouble(df.format(allocQty2 - actualPropQty)) <= integralQty))
{
errString = allocStockToWo(tranId,lineno,siteCode,itemCode,lotno,lotsl,allocQty,reasCode,locCodeFr,explev,locCodeTo,worder,remarks,tranId,actualPropQty,actualQty,batchQuantity,xtraParams,connOne);
System.out.println("err String from STOCKTRANS ="+errString); System.out.println("err String from STOCKTRANS ="+errString);
} }
}
else else
{ {
allocqtyflag = true; allocqtyflag = true;
...@@ -759,7 +806,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -759,7 +806,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
} }
return errString; return errString;
} }
private String allocStockToWo(String lineno,String siteCode,String itemCode,String lotno,String lotsl,String allocQty,String reasCode,String locCodeFr,String explev,String locCodeTo,String worder,String remarks,String tranIdInvAlloc,String xtraParams,Connection connOne) throws RemoteException, ITMException private String allocStockToWo(String tranId,String lineno,String siteCode,String itemCode,String lotno,String lotsl,String allocQty,String reasCode,String locCodeFr,String explev,String locCodeTo,String worder,String remarks,String tranIdInvAlloc,double actualPropQty,double actualQty,double batchQuantity,String xtraParams,Connection connOne) throws RemoteException, ITMException
{ {
String userId = ""; String userId = "";
String termId = ""; String termId = "";
...@@ -795,6 +842,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -795,6 +842,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
String ediOption = ""; String ediOption = "";
String dataStr = ""; String dataStr = "";
String chgTerm = ""; String chgTerm = "";
double totWoQty= 0.0;
double grossRate = 0d; double grossRate = 0d;
double convQtyStduom = 0d; double convQtyStduom = 0d;
double batchSize = 0d; double batchSize = 0d;
...@@ -804,6 +852,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -804,6 +852,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
double stkQuantity = 0,holdQuantity = 0; double stkQuantity = 0,holdQuantity = 0;
double holdQty = 0; double holdQty = 0;
double potencyPerc=0,grossWeight=0,tareWeight=0,netWeight=0; double potencyPerc=0,grossWeight=0,tareWeight=0,netWeight=0;
DecimalFormat df = new DecimalFormat("0.000");
try try
...@@ -835,7 +884,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -835,7 +884,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select item_code,site_code,bom_code,lot_no,lot_sl,ref_no,ord_date,no_art " + sql = "select quantity,item_code,site_code,bom_code,lot_no,lot_sl,ref_no,ord_date,no_art " +
" from workorder where work_order = ? "; " from workorder where work_order = ? ";
pstmt = connOne.prepareStatement(sql); pstmt = connOne.prepareStatement(sql);
...@@ -843,6 +892,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -843,6 +892,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
totWoQty = Double.parseDouble(df.format(rs.getDouble("quantity")));
orddate = rs.getDate("ord_date"); orddate = rs.getDate("ord_date");
noArt = rs.getString("no_art")==null?"0":rs.getString("no_art"); noArt = rs.getString("no_art")==null?"0":rs.getString("no_art");
} }
...@@ -1112,10 +1162,17 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -1112,10 +1162,17 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
stockMap.put("actual_rate", actualRate); stockMap.put("actual_rate", actualRate);
} }
if(rs != null)
rs.close();
rs = null;
if(pstmt != null)
pstmt.close();
pstmt = null;
boolean isError = false; boolean isError = false;
errList = allocTransfer(siteCode,itemCode,locCodeFr , errList = allocTransfer(siteCode,itemCode,locCodeFr ,
lotno,lotsl,locCodeTo ,lotno,lotsl, lotno,lotsl,locCodeTo ,lotno,lotsl,
quantity,stockMap, xtraParams , connOne ); actualPropQty,stockMap, xtraParams , connOne );
System.out.println("from alloc transfer=="+errList.toString()); System.out.println("from alloc transfer=="+errList.toString());
retString = errList.get(0).toString() ; retString = errList.get(0).toString() ;
System.out.println("FROM allocTransfer 0 : "+retString); System.out.println("FROM allocTransfer 0 : "+retString);
...@@ -1126,11 +1183,161 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr ...@@ -1126,11 +1183,161 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
stockMap.clear(); stockMap.clear();
if(isError == false) if(isError == false)
{ {
System.out.println(" STOCK ALLOCATED SUCCESSFULL");
StockTransferConf stconf = new StockTransferConf(); StockTransferConf stconf = new StockTransferConf();
retString = stconf.confirm(tranIdForIssue,xtraParams,""); retString = stconf.confirm(tranIdForIssue,xtraParams,"");
System.out.println("retString from confirmStocktrans :: @:: "+retString);//CONFSUCC System.out.println("retString from confirmStocktrans :: @:: "+retString);//CONFSUCC
if(retString.indexOf("CONFSUCC") > -1)
{
int count = 0,recIn=0 ;
sql = " select count(*) from inv_alloc_det where tran_id = ? and item_code = ? and lot_no = ? and lot_sl = ? and loc_code = ? and site_code = ? ";
pstmt = connOne.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setString(2,itemCode);
pstmt.setString(3,lotno);
pstmt.setString(4,lotsl);
pstmt.setString(5,locCodeTo);
pstmt.setString(6,siteCode);
rs = pstmt.executeQuery();
if ( rs.next() )
{
count = rs.getInt(1);
}
if(rs != null)
rs.close();
rs = null;
if(pstmt != null)
pstmt.close();
pstmt = null;
if(count == 0)
{
if( batchQuantity == totWoQty)
{
sql = " update inv_alloc_det set loc_code = ? where tran_id = ? and item_code = ? and lot_no = ? and lot_sl = ? and loc_code = ? and site_code = ? ";
pstmt = connOne.prepareStatement(sql);
pstmt.setString(1,locCodeTo);
pstmt.setString(2,tranId);
pstmt.setString(3,itemCode);
pstmt.setString(4,lotno);
pstmt.setString(5,lotsl);
pstmt.setString(6,locCodeFr);
pstmt.setString(7,siteCode);
pstmt.executeUpdate();
if(pstmt != null)
pstmt.close();
pstmt = null;
}else
{
int maxlineNo = 0;
sql = " select max(line_no) as max_line_no from inv_alloc_det where tran_id = ? ";
pstmt = connOne.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if ( rs.next() )
{
maxlineNo = rs.getInt(1);
}
System.out.println("maxlineNo::"+maxlineNo);
if(rs != null)
rs.close();
rs = null;
if(pstmt != null)
pstmt.close();
pstmt = null;
sql = " Insert into inv_alloc_det(TRAN_ID,LINE_NO,SITE_CODE,ITEM_CODE,LOT_NO,LOT_SL,QUANTITY,REMARKS,REAS_CODE,LOC_CODE,EXP_LEV,ISSUE_QTY)" +
" values (?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt = connOne.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setInt(2,maxlineNo+1);
pstmt.setString(3,siteCode);
pstmt.setString(4,itemCode);
pstmt.setString(5,lotno);
pstmt.setString(6,lotsl);
pstmt.setDouble(7,actualPropQty);
pstmt.setString(8,remarks);
pstmt.setString(9,reasCode);
pstmt.setString(10,locCodeTo);
pstmt.setString(11,explev);
pstmt.setDouble(12,actualPropQty);
pstmt.executeUpdate();
if(pstmt != null)
pstmt.close();
pstmt = null;
sql = " update inv_alloc_det set quantity = ? where tran_id = ? and item_code = ? and lot_no = ? and lot_sl = ? and loc_code = ? and site_code = ? ";
System.out.println(" SQL::update"+sql);
pstmt = connOne.prepareStatement(sql);
pstmt.setDouble(1,(actualQty - actualPropQty));
pstmt.setString(2,tranId);
pstmt.setString(3,itemCode);
pstmt.setString(4,lotno);
pstmt.setString(5,lotsl);
pstmt.setString(6,locCodeFr);
pstmt.setString(7,siteCode);
pstmt.executeUpdate();
if(pstmt != null)
pstmt.close();
pstmt = null;
}
}
else
{
System.out.println("batch qty is dufferent");
sql = " update inv_alloc_det set quantity = ? where tran_id = ? and item_code = ? and lot_no = ? and lot_sl = ? and loc_code = ? and site_code = ? ";
System.out.println(" SQL::update"+sql);
pstmt = connOne.prepareStatement(sql);
pstmt.setDouble(1,(actualQty - actualPropQty));
pstmt.setString(2,tranId);
pstmt.setString(3,itemCode);
pstmt.setString(4,lotno);
pstmt.setString(5,lotsl);
pstmt.setString(6,locCodeFr);
pstmt.setString(7,siteCode);
pstmt.executeUpdate();
if(pstmt != null)
pstmt.close();
pstmt = null;
double lcToqty=0.0;
sql = " select quantity from inv_alloc_det where tran_id = ? and item_code = ? and lot_no = ? and lot_sl = ? and loc_code = ? and site_code = ? ";
pstmt = connOne.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setString(2,itemCode);
pstmt.setString(3,lotno);
pstmt.setString(4,lotsl);
pstmt.setString(5,locCodeTo);
pstmt.setString(6,siteCode);
rs = pstmt.executeQuery();
if ( rs.next() )
{
lcToqty = rs.getDouble(1);
}
if(rs != null)
rs.close();
rs = null;
if(pstmt != null)
pstmt.close();
pstmt = null;
sql = "update inv_alloc_det set quantity = ? ,ISSUE_QTY = ? where tran_id = ? and item_code = ? and lot_no = ? and lot_sl = ? and loc_code = ? and site_code = ? ";
pstmt = connOne.prepareStatement(sql);
pstmt.setDouble(1,(lcToqty + actualPropQty));
pstmt.setDouble(2,(lcToqty + actualPropQty));
pstmt.setString(3,tranId);
pstmt.setString(4,itemCode);
pstmt.setString(5,lotno);
pstmt.setString(6,lotsl);
pstmt.setString(7,locCodeTo);
pstmt.setString(8,siteCode);
pstmt.executeUpdate();
if(pstmt != null)
pstmt.close();
pstmt = null;
} }
} }
}
}
// if((retString != null ) && retString.indexOf("Success") > -1 || retString.indexOf("CONFSUCC") >-1) // if((retString != null ) && retString.indexOf("Success") > -1 || retString.indexOf("CONFSUCC") >-1)
// { // {
......
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