Skip to content

B
business-java
Commit 4ef8fb6e authored by vkadam's avatar vkadam
Browse files
Options

BATCH_ID validation commented. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97158 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5f1810ea
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 89 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAllocIc.java
View file @ 4ef8fb6e
......@@ -132,7 +132,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
else if(childNodeName.equalsIgnoreCase("site_code"))
{
......@@ -194,7 +193,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
pstmt.close();
pstmt = null;
}
}
else if(childNodeName.equalsIgnoreCase("site_code__ship"))
{
......@@ -236,40 +234,37 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
else if(childNodeName.equalsIgnoreCase("batch_id"))
{
batchId = genericUtility.getColumnValue("batch_id", dom);
System.out.println("Batch ID :- ----"+batchId);
if(batchId!=null && batchId.trim().length()>0){
// if(batchId!=null){
System.out.println("*****IN if VALIDATION *****");
sql="select count(*) as cnt from sord_alloc where batch_id=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,batchId);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt=rs.getInt("cnt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Batch id cnt at validation :- "+cnt);
if(cnt<=0)
{
errCode = "VTBCHIDINV";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
// VALLABH KADAM validation for BATCH_ID if it exist in SORD_ALLOC
// else if(childNodeName.equalsIgnoreCase("batch_id"))
// {
// batchId = genericUtility.getColumnValue("batch_id", dom);
// System.out.println("Batch ID :- ----"+batchId);
//
// if(batchId!=null && batchId.trim().length()>0){
// System.out.println("*****IN if VALIDATION *****");
// sql="select count(*) as cnt from sord_alloc where batch_id=?";
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,batchId);
// rs = pstmt.executeQuery();
// if(rs.next())
// {
// cnt=rs.getInt("cnt");
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
// System.out.println("Batch id cnt at validation :- "+cnt);
// if(cnt<=0)
// {
// errCode = "VTBCHIDINV";
// errList.add(errCode);
// errFields.add(childNodeName.toLowerCase());
// }
// }
// }// VALLABH KADAM validation BATCH_ID END
}
break;
case 2 :
......@@ -325,7 +320,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
//Changed by Rohan on 10/07/12 To addvalidation on hdr & Detail.end
}
}
else if(childNodeName.equalsIgnoreCase("site_code"))
{
......@@ -412,7 +406,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
else if(childNodeName.equalsIgnoreCase("line_no__sord"))
{
......@@ -463,7 +456,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
}
}
else if(childNodeName.equalsIgnoreCase("lot_no"))
{
lotNo = genericUtility.getColumnValue("lot_no", dom);
......@@ -504,9 +496,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
tempList.add(tempMap);
currentDetailMap.put("Detail2", tempList);
System.out.println(" current detail map "+currentDetailMap);
/*
if(rs != null)
{
......@@ -552,7 +541,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
//Changed by sumit on 21/08/12 checking for repeating detail end.
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
//Change by Rohan on 10/07/12 To check.end
......@@ -629,7 +617,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
break;
......@@ -842,8 +829,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
valueXmlString.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
valueXmlString.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
// end
}//end of if
else if(currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
{
......@@ -895,7 +880,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
pstmt=null;
activePickAllow=activePickAllow==null?"Y":activePickAllow;
valueXmlString.append("<active_pick_allow>").append("<![CDATA[" + activePickAllow + "]]>").append("</active_pick_allow>");
}
// added by cpatil on 25/06/13 start
else if(currentColumn.trim().equalsIgnoreCase("site_code__ship"))
......@@ -1146,7 +1130,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
+" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"
+"AND SORDITEM.LINE_TYPE = 'I'";
pstmt = conn.prepareStatement(getDataSql);
pstmt.setString(1, saleOrder);
pstmt.setString(2, lineNoSord);
......@@ -1284,7 +1267,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
{
pstmt.setString(11,partialResrvLoc);
}
rs = pstmt.executeQuery();
String lotSl = "";
locCode = "";
......@@ -1299,7 +1281,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
locCode = rs.getString("LOC_CODE");
locDescr = rs.getString("DESCR");
}
if(pendingQty < qtyAvail)
{
qtyAvail = pendingQty;
......@@ -1307,7 +1288,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
if("Y".equalsIgnoreCase(singleLot.trim()))
{
while(rs.next())
{
lotNo=rs.getString("LOT_NO");
......@@ -1351,7 +1331,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
break;
}
}
// Enumeration enu = Collections.enumeration(lotKey);
// while(enu.hasMoreElements())
// {
......@@ -1364,7 +1343,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
// break;
// }
// }
lotNo="";
lotSl="";
locCode="";
......@@ -1380,9 +1358,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
qtyAvail=Double.parseDouble(lotArray[4]);
//qtyAvail=pendingQty;
}
} // ADDED BY RITESH ON 30/06/14 END for issue no . 209
valueXmlString.append("<quantity>").append("<![CDATA[" + qtyAvail + "]]>").append("</quantity>");
valueXmlString.append("<lot_sl>").append("<![CDATA[" + lotSl + "]]>").append("</lot_sl>");
valueXmlString.append("<loc_code>").append("<![CDATA[" + locCode + "]]>").append("</loc_code>");
......@@ -1404,10 +1380,8 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
System.out.println("Set Quantity ["+quantityset+"]");
valueXmlString.append("<quantity>").append("<![CDATA[" + quantityset + "]]>").append("</quantity>");
}
valueXmlString.append("</Detail2>");
break;
}
valueXmlString.append("</Root>");
}
......@@ -1440,8 +1414,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
return valueXmlString.toString();
}
private String findValue(Connection conn, String columnName ,String tableName, String columnName2, String value) throws ITMException, RemoteException
{
PreparedStatement pstmt = null ;
......@@ -1472,7 +1444,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
System.out.println("returning String from findValue " + findValue);
return findValue;
}
private String errorType(Connection conn , String errorCode)
{
String msgType = "";
......@@ -1523,11 +1494,9 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
return input;
}
//Changed by sumit on 21/08/12 checking duplicate deatil start
private boolean checkDetail(Document allDom, Connection conn) throws ITMException
{
String itemCode = "", siteCode ="", locCode = "", lotSl = "", lotNo ="";
NodeList parentNodeList = null, childNodeList = null;
Node parentNode = null, childNode = null;
......@@ -1537,7 +1506,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
Map detailMap = new HashMap();
boolean isDupDetail = false;
String updateFlag = "";// added by sumit on 07/01/13
try {
parentNodeList = allDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength();
......@@ -1562,7 +1530,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
//System.out.println(" natribute ");
updateFlag = childNode.getAttributes().getNamedItem("updateFlag").getNodeValue();
System.out.println(" updateFlag suit ["+updateFlag+"]");
}
if( !"D".equalsIgnoreCase(updateFlag))
{
......@@ -1591,7 +1558,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
}
}
}
/*tempList.add(tempMap);
System.out.println(" detail arrayaList "+arryList);*/
......@@ -1606,7 +1572,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
System.out.println(" detailMap in checkdetail "+detailMap);
System.out.println(" isDupDetail "+isDupDetail);
}
}
catch (Exception e)
{
......@@ -1625,7 +1590,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
ResultSet rs = null;
double itmLen = 0,itmWidth = 0,itmHeight = 0,itemWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,lotWeight = 0;
HashMap dataVolumeMap = new HashMap();
try {
sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT,"
......@@ -1662,7 +1626,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
packSize = rs.getDouble("SHIPSIZE");
lotWeight = rs.getDouble("LOT_WEIGHT");
}
//packSize = (lotHeight * lotWidth * lotLen)/(itmLen * itmWidth * itmHeight);
/*itemSize = Math.floor(itmLen * itmWidth * itmHeight);
lotSize = Math.floor((lotHeight * lotWidth * lotLen));*/
......@@ -1679,20 +1642,14 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
} catch (Exception e) {
// TODO: handle exception
throw e;
}
finally
......@@ -1701,16 +1658,13 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
}
return dataVolumeMap;
}
//Changed by Rohan on 13-06-13 for bug fixing of quantity not greater than pending quantity.start
......@@ -1857,7 +1811,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
+" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"
+"AND SORDITEM.LINE_TYPE = 'I'";
pstmt = conn.prepareStatement(getDataSql);
pstmt.setString(1, saleOrder);
pstmt.setString(2, lineNoSord);
......@@ -1929,7 +1882,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF_CASE, STOCK.LOC_CODE ";
}
pstmt = conn.prepareStatement(sSingleLotSql + orderByStkStr);
pstmt.setString(1,itemCode);
pstmt.setString(2,siteCode);
......@@ -1947,14 +1899,12 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
{
pstmt.setString(10,partialResrvLoc);
}
rs = pstmt.executeQuery();
String lotSl = "";
locCode = "";
locDescr = "";
if("N".equalsIgnoreCase(singleLot))
{
if( rs.next())
{
qtyAvail = rs.getDouble("QTY_AVAIL_ALLOC"); //quantity
......@@ -1972,7 +1922,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
else
{
while(rs.next())
{
lotNo=rs.getString("LOT_NO");
......@@ -2011,7 +1960,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
Iterator<String> lot=lotKey.iterator();
while(lot.hasNext())
{
String lotKeyVal=lot.next();
System.out.println("lotKeyVal::"+lotKeyVal);
double qty=Double.parseDouble(""+stockLot.get(lotKeyVal));
......@@ -2034,7 +1982,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
// break;
// }
// }
lotNo="";
lotSl="";
locCode="";
......@@ -2048,11 +1995,8 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
locCode=lotArray[2];
locDescr=lotArray[3];
qtyAvail=Double.parseDouble(lotArray[4]);
//qtyAvail=pendingQty;
}
}
System.out.println(" @@@ 30-06-14");
stockDetail.put("qtyAvail", qtyAvail);
......@@ -2061,7 +2005,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
stockDetail.put("locCode", locCode);
stockDetail.put("locDescr", locDescr);
//System.out.println(" stock detail :->"+stockDetail);
}
catch(Exception e)
{
......@@ -2091,14 +2034,11 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
private String getErrorString(String str ) {
if(str == null)
{
str ="";
}
return str;
// TODO Auto-generated method stub
}
}
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