Skip to content

B
business-java
Commit d7cd0c29 authored by pjain's avatar pjain
Browse files
Options

changed by sankara on 23/04/14 udated for wms live 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94989 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 13b9daaf
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 13 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpIC.java
View file @ d7cd0c29
......@@ -151,6 +151,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
String locInvStat = "";
String altLotNo="";
String pordSiteCode = "";
java.util.Date tranDate = null;
String prdCode = "";
int currentFormNo = 0, cnt = 0;
int counter = 0;
......@@ -176,6 +178,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
PreparedStatement pstmtLocCode =null; //added by Ashish
ResultSet rsLocCode =null; //added by Ashish
//String tranID = "";
double pndRcpQty = 0.0;
try
{
......@@ -184,7 +188,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
conn = connDriver.getConnectDB("DriverValidator");
connDriver = null;
p = appConnect.getProperty();
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
if ( objContext != null && objContext.trim().length() > 0 )
{
......@@ -259,7 +263,26 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
//changes made by gulzar - 25/11/11 -
//if porcp is confirmed for the entered asn_no then system should validate
confirmed = "";
sql = "SELECT CONFIRMED FROM PORCP WHERE ASN_NO = ? ";
//Changed By Pragyan
sql = "SELECT SUM(QUANTITY-DLV_QTY) AS QTY FROM PORDDET WHERE PURC_ORDER IN (SELECT PURC_ORDER FROM ASN_HDR WHERE ASN_NO = ?) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, asnNo);
rs = pstmt.executeQuery();
if (rs.next())
{
//confirmed = checkNull(rs.getString("CONFIRMED"));
pndRcpQty = rs.getDouble(1);
}
if(!(pndRcpQty > 0))
{
errList.add( "PORCPCONF" );
errFields.add( childNodeName.toLowerCase() );
}
/*sql = "SELECT CONFIRMED FROM PORCP WHERE ASN_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, asnNo);
......@@ -273,7 +296,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
errList.add( "PORCPCONF" );
errFields.add( childNodeName.toLowerCase() );
}
}*/
//End changes gulzar - 25/11/11
}
}
......@@ -419,6 +442,60 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
errList.add( "VTCPORDS" );
errFields.add( childNodeName.toLowerCase() );
}
else //added by kunal on 15-feb-14 for period code
{
System.out.println("364 site code ="+siteCode);
if (genericUtility.getColumnValue("tran_date", currDom) != null)
{
tranDate = sdf1.parse(genericUtility.getColumnValue("tran_date", currDom));
sql = "select code from period where ? between fr_date and to_date";
pstmt = conn.prepareStatement(sql);
pstmt.setDate(1, new java.sql.Date(tranDate.getTime()));
rs = pstmt.executeQuery();
if (rs.next())
{
prdCode = rs.getString(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select count(*) from period_stat where site_code = ? and prd_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
pstmt.setString(2, prdCode);
rs = pstmt.executeQuery();
if (rs.next())
{
count = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (count == 0)
{
errList.add( "VTSITEPD" );
errFields.add( childNodeName.toLowerCase() );
break;
}
// nvo_functions_adv.nf_check_period('SAL',mdate1,msite_code)
errCode = nfCheckPeriod("IC", tranDate, siteCode);
System.out.println("425 Error Code = " + errCode);
if (errCode != null && errCode.trim().length() > 0)
{
errList.add(errCode );
errFields.add( childNodeName.toLowerCase() );
}
}
}//end
}
......@@ -1745,7 +1822,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
"EXCH_RATE__OTHCH, FREIGHT_STATUS, OCTROI_NO, POST_TYPE, GP_SER, PARENT__TRAN_ID, REV__TRAN, "+
"SHIPMENT_ID, WORKFLOW_STATUS, GIT_REF, FN_GET_VOUCHNO, UDF__STR1, POST_PROV, LOT_NO, "+
"ANAL_CODE, TRANSFER_FLAG, SHELF_LIFE__TYPE, FRT_AMT__FIXED, FRT_AMT__QTY, TOT_AMT,RECIEPT_TYPE "+
"FROM PORCP WHERE PURC_ORDER = ? ";
"FROM PORCP WHERE PURC_ORDER = ? AND CASE WHEN CONFIRMED IS NULL THEN 'N' ELSE CONFIRMED END = 'N' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, purcOrder );
rs = pstmt.executeQuery();
......@@ -2204,7 +2281,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
purcOrder = checkNull(genericUtility.getColumnValue("purc_order", allDom, "2"));
sql = "SELECT TRAN_ID FROM PORCP WHERE PURC_ORDER = ?";
sql = "SELECT TRAN_ID FROM PORCP WHERE PURC_ORDER = ? AND CASE WHEN PORCP.CONFIRMED IS NULL THEN 'N' ELSE PORCP.CONFIRMED END = 'N'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
......@@ -2234,9 +2311,14 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
scanLocCode = genericUtility.getColumnValue( "loc_code", hdrDom );
if( tranId != null && tranId.trim().length() > 0 )
{
sql = "SELECT MAX(PORCPDET.LINE_NO) AS MAX_LINE FROM PORCPDET WHERE TRAN_ID = ? ";
//Changed By Pragyan 21-APR-14 To check confirmed flag
//sql = "SELECT MAX(PORCPDET.LINE_NO) AS MAX_LINE FROM PORCPDET WHERE TRAN_ID = ? ";
sql = "SELECT MAX(PORCPDET.LINE_NO) AS MAX_LINE FROM PORCPDET PORCPDET,PORCP PORCP WHERE "
+" PORCP.TRAN_ID = PORCPDET.TRAN_ID AND "
+" PORCP.TRAN_ID = ? AND CASE WHEN PORCP.CONFIRMED IS NULL THEN 'N' ELSE PORCP.CONFIRMED END = 'N'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -2261,9 +2343,13 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
"ACCT_CODE__PROV_DR, PORCPDET.CCTR_CODE__PROV_DR, PORCPDET.ACCT_CODE__PROV_CR, PORCPDET.CCTR_CODE__PROV_CR, PORCPDET.FORM_NO, PORCPDET."+
"RETEST_DATE, PORCPDET.ASSETINSTALL_QTY, PORCPDET.BATCH_SIZE, PORCPDET.DUTY_PAID, PORCPDET.SAMPLE_QTY, PORCPDET.DAMAGE_QTY, PORCPDET."+
"SHELF_LIFE__TYPE, PORCPDET.REJC_QTY, PORCPDET.SH_QTY, ITEM.DESCR ITEM_DESCR, PORCPDET.QC_REQD, ITEM.SITE_CODE,PORCPDET.PARTIAL_YN "+
"FROM PORCPDET PORCPDET, ITEM ITEM WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.ITEM_CODE = ITEM.ITEM_CODE ORDER BY PORCPDET.TRAN_ID, PORCPDET.LINE_NO ";
//Changed By Pragyan 21-APR-14 To check confirmed flag
//"FROM PORCPDET PORCPDET, ITEM ITEM WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.ITEM_CODE = ITEM.ITEM_CODE ORDER BY PORCPDET.TRAN_ID, PORCPDET.LINE_NO ";
"FROM PORCPDET PORCPDET, ITEM ITEM,PORCP PORCP WHERE PORCP.TRAN_ID = PORCPDET.TRAN_ID AND PORCPDET.TRAN_ID = ? AND CASE WHEN PORCP.CONFIRMED IS NULL THEN 'N' ELSE PORCP.CONFIRMED END = 'N' AND PORCPDET.ITEM_CODE = ITEM.ITEM_CODE ORDER BY PORCPDET.TRAN_ID, PORCPDET.LINE_NO ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
String retestDate = "";
......@@ -2462,6 +2548,9 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
*/
}
asnNo = checkNull(genericUtility.getColumnValue("asn_no", hdrDom));
System.out.println(" ASN NO PORCP IC --------------["+asnNo+"]");
//Changed by Rohan on 17-June-13 for getting inv stat of location.start
//sql = "SELECT case when loc_type is null then ' ' else loc_type end from location where loc_code = ? ";
pgrlInvStat = distComm.getDisparams("999999","PGRL_INVSTAT",conn);
......@@ -2483,7 +2572,9 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
sql = "SELECT SHIPPER_SIZE, GROSS_WEIGHT, NET_WEIGHT FROM ITEM_LOT_PACKSIZE WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? ";
pstmtItemLotPack = conn.prepareStatement(sql);
scanLocCode = genericUtility.getColumnValue( "loc_code", hdrDom );
sql = "SELECT ADET.NO_PALLET,PDET.LINE_NO, PDET.ITEM_CODE, PDET.QUANTITY, PDET.UNIT, PDET.RATE, "+
//Changhed By Pragyan 21-apr-14 to take the quantity from asn detail
//sql = "SELECT ADET.NO_PALLET,PDET.LINE_NO, PDET.ITEM_CODE, PDET.QUANTITY, PDET.UNIT, PDET.RATE, "+
sql = "SELECT ADET.NO_PALLET,PDET.LINE_NO, PDET.ITEM_CODE, ADET.QUANTITY, PDET.UNIT, PDET.RATE, "+
"PDET.DISCOUNT, PDET.TAX_AMT, PDET.TOT_AMT, PDET.LOC_CODE, "+
"PDET.REQ_DATE, PDET.DLV_QTY, PDET.STATUS, PDET.STATUS_DATE, "+
"PDET.UNIT__RATE, PDET.CONV__QTY_STDUOM, PDET.CONV__RTUOM_STDUOM, "+
......@@ -2496,6 +2587,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
"AND ASN_HDR.TRAN_ID = ADET.TRAN_ID "+
"AND PDET.PURC_ORDER = ? "+
"AND case when item.loc_type is null then ' ' else item.loc_type end = '" + locType + "' " +
"AND ASN_HDR.ASN_NO = ? " +
"AND PDET.LINE_NO = ADET.LINE_NO__ORD "+
"AND PDET.ITEM_CODE = ITEM.ITEM_CODE " ;
//Commented by Manoj to Show Unscanned records in Edit mode also
......@@ -2503,6 +2595,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
pstmt.setString(2, asnNo);
rs = pstmt.executeQuery();
//domID = 0;//Gulzar on 30/12/11
while( rs.next())
......@@ -2646,10 +2740,16 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
extraArtForLastPallet=(int)noArt;
//domID = maxLine; //added by Kunal on 01/09/12
int i=0 ;
//Changed By Pragyan 21-apr-14 to remove only specific lot
//Added by Manoj dtd 03/09/2012 to show unscanned records in edit mode
pstmt1=conn.prepareStatement("select count(*) from porcpdet a where a.purc_order=? and line_no__ord=?");
//pstmt1=conn.prepareStatement("select count(*) from porcpdet a where a.purc_order=? and line_no__ord=?");
pstmt1=conn.prepareStatement("select count(*) from porcpdet a , porcp p where a.purc_order=? and a.line_no__ord=? and a.lot_no = ? " +
" and p.tran_id = a.tran_id and case when p.confirmed is null then 'N' else p.confirmed end = 'N'");
pstmt1.setString(1,purcOrder);
pstmt1.setString(2,lineNoOrd);
//Changed By Pragyan 21-apr-14 to remove only specific lot
pstmt1.setString(3,lotNo);
rs1=pstmt1.executeQuery();
if(rs1.next())
{
......@@ -2659,6 +2759,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
rs1=null;
pstmt1.close();
pstmt1=null;
for(;i< totalNoOfPallet ;i++)
{
......
webitm-wms/ibase/webitm/ejb/wms/PoRcpPos.java
View file @ d7cd0c29
......@@ -60,6 +60,9 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
int totOrdDet = 0;
int ordDetScaned = 0;
String asnNo="";
String sSQL = "";
//Changed by Rohan on 26/02/13 for define variables.start
double sumQty=0.0;
double shipperSize = 0.0;
......@@ -69,8 +72,10 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
Document dom = null;
String purcOrderDb = "",sql1 = "";
PreparedStatement pstmt = null,pstmt1 = null;;
ResultSet rs = null , rs1 = null;
PreparedStatement pstmt = null,pstmt1 = null,pstmtAsn = null,pstmtPorcp = null;
ResultSet rs = null , rs1 = null,rsAsn = null,rsPorcp = null;
PoRcpConf porcpConf = new PoRcpConf();
ConnDriver connDriver = null;
......@@ -82,6 +87,8 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
double rcpgrossWeight=0;
double rcpnetWeight=0;
double rcptareWeight=0;
double asnQty = 0.0,porcpQty = 0.0;
try
{
......@@ -476,6 +483,8 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
//adding validation BY SHAMIM
lineNoOrd="";
qtyDb=0.0;
//Changed By Pragyan 21-APR-14 comapre quantity from the ASN Detail.start
/*
Map<String, Double> qtyMap1 = new HashMap<String, Double>();
sql = "select sum(quantity),line_no from porddet where purc_order= ? group by line_no";
pstmt = conn.prepareStatement(sql);
......@@ -506,7 +515,7 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
if(key.equals(lineNoPOrd))
{
//sumQty+=Double.parseDouble(genericUtility.getColumnValueFromNode("quantity",dom.getElementsByTagName("Detail3").item(i))); // CHANGE BY CPATIL
/*Added By Ashish on 03/Aug/12 [START]*/
Added By Ashish on 03/Aug/12 [START]
String scannedQtyStr = genericUtility.getColumnValueFromNode("quantity",dom.getElementsByTagName("Detail3").item(i));
double scannedQty = 0.0 ,scannedPartQty =0.0;
int scannedNoArt=0;
......@@ -533,7 +542,7 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
scannedQty = getQuantityOnPackSize( scannedItemCode , scannedLotNo ,scannedNoArt ,scannedPartQty ,conn);
}
sumQty+=scannedQty;
/*Added By Ashish Sonawane on 03/Aug/12 [END]*/
Added By Ashish Sonawane on 03/Aug/12 [END]
}
}
System.out.println("@@@@@@ sumQty: ["+sumQty+"]::::qtyMap.get(key):["+qtyMap.get(key)+"]");
......@@ -544,7 +553,78 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
}
}
*/
toConfirm = true;
sSQL = "SELECT ITEM_CODE,LOT_NO,QUANTITY FROM ASN_DET WHERE TRAN_ID IN (SELECT"
+ " TRAN_ID FROM ASN_HDR WHERE ASN_NO = ? )";
pstmtAsn = conn.prepareStatement(sSQL);
pstmtAsn.setString(1, asnNo);
rsAsn = pstmtAsn.executeQuery();
sSQL = "SELECT SUM(QUANTITY) FROM PORCPDET WHERE TRAN_ID = ? AND ITEM_CODE = ? AND LOT_NO = ? ";
pstmtPorcp = conn.prepareStatement(sSQL);
while(rsAsn.next())
{
asnQty = rsAsn.getDouble("QUANTITY");
pstmtPorcp.setString(1, tranId);
pstmtPorcp.setString(2,rsAsn.getString("ITEM_CODE"));
pstmtPorcp.setString(3,rsAsn.getString("LOT_NO"));
rsPorcp = pstmtPorcp.executeQuery();
porcpQty = 0.0;
if(rsPorcp.next())
{
porcpQty = rsPorcp.getDouble(1);
}
if(rsPorcp != null)
{
rsPorcp.close();
rsPorcp =null;
}
if(porcpQty != asnQty)
{
toConfirm = false;
break;
}
}
if(rsAsn != null)
{
rsAsn.close();
rsAsn =null;
}
if(pstmtAsn != null)
{
pstmtAsn.close();
pstmtAsn =null;
}
if(pstmtPorcp != null)
{
pstmtPorcp.close();
pstmtPorcp =null;
}
//Changed By Pragyan 21-APR-14 comapre quantity from the ASN Detail.end
if(toConfirm)
{
System.out.println("@@@@@ Calling Confirm method..................");
......@@ -616,6 +696,28 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
pstmt.close();
pstmt = null;
}
if(rsAsn != null)
{
rsAsn.close();
rsAsn =null;
}
if(pstmtAsn != null)
{
pstmtAsn.close();
pstmtAsn =null;
}
if(pstmtPorcp != null)
{
pstmtPorcp.close();
pstmtPorcp =null;
}
//Added by manoj dtd 21/08/2012
conn.close();
conn=null;
......
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