Commit a65f4387 authored by dpawar's avatar dpawar

Merge DDUK code


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99124 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1e9a1ebb
...@@ -17,6 +17,7 @@ import java.util.Date; ...@@ -17,6 +17,7 @@ import java.util.Date;
import javax.ejb.*; import javax.ejb.*;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.xml.parsers.*; import javax.xml.parsers.*;
import org.w3c.dom.*; import org.w3c.dom.*;
import ibase.ejb.*; import ibase.ejb.*;
...@@ -28,6 +29,7 @@ import ibase.webitm.ejb.dis.DistCommon; ...@@ -28,6 +29,7 @@ import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.wms.CommonWmsUtil; import ibase.webitm.utility.wms.CommonWmsUtil;
import javax.xml.transform.*; import javax.xml.transform.*;
import javax.xml.transform.dom.*; import javax.xml.transform.dom.*;
import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactory;
...@@ -36,7 +38,9 @@ import javax.xml.transform.stream.StreamSource; ...@@ -36,7 +38,9 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerConfigurationException;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import java.net.InetAddress; import java.net.InetAddress;
@javax.ejb.Stateless @javax.ejb.Stateless
...@@ -154,10 +158,16 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -154,10 +158,16 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
NodeList parentList = null; NodeList parentList = null;
NodeList childList = null; NodeList childList = null;
String resrvLocInvstat = ""; String resrvLocInvstat = "";
String casePickInvstat = "",deepStoreLoc = ""; String casePickInvstat = "",deepStoreLoc = "",activePickInvstat = "";
java.util.Date tranDateDt = null; java.util.Date tranDateDt = null;
String prdCode = ""; String prdCode = "";
double qtyDiffItem = 0;
double stockQuantity = 0;
double stockWeigth = 0;
double stockVolume = 0;
StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>"); StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
String errorType = "", errCode = ""; String errorType = "", errCode = "";
ArrayList errList = new ArrayList(); ArrayList errList = new ArrayList();
...@@ -172,6 +182,12 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -172,6 +182,12 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
String lpnNoto=""; //Added By Ashish on 24/Aug/12 for partial Grl Location. [WM2ESUN009] String lpnNoto=""; //Added By Ashish on 24/Aug/12 for partial Grl Location. [WM2ESUN009]
PreparedStatement pstmtQtyVal =null; //Added By Ashish on 01/Sep/12 for partial Grl Location. [WM2ESUN009] PreparedStatement pstmtQtyVal =null; //Added By Ashish on 01/Sep/12 for partial Grl Location. [WM2ESUN009]
ResultSet rsQtyVal = null; //Added By Ashish on 01/Sep/12 for partial Grl Location. [WM2ESUN009] ResultSet rsQtyVal = null; //Added By Ashish on 01/Sep/12 for partial Grl Location. [WM2ESUN009]
String locCodefr = "";
// Changed by Jagruti, on 18-08-2015, Request ID: D15EKAT001
ArrayList<String> invstatOverrideList = new ArrayList<String>();
String invstatOverride = "";
// End by Jagruti, on 18-08-2015, Request ID: D15EKAT001
try try
{ {
...@@ -186,7 +202,6 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -186,7 +202,6 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
{ {
currentFormNo = Integer.parseInt( objContext ); currentFormNo = Integer.parseInt( objContext );
} }
parentList = currDom.getElementsByTagName( "Detail" + currentFormNo ); parentList = currDom.getElementsByTagName( "Detail" + currentFormNo );
childList = null; childList = null;
noOfParent = parentList.getLength(); noOfParent = parentList.getLength();
...@@ -365,6 +380,129 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -365,6 +380,129 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
// Added by Manish on 05/11/15 for DDWMS merging // Added by Manish on 05/11/15 for DDWMS merging
projectName = distCommon.getDisparams("999999","PROJECT",conn); projectName = distCommon.getDisparams("999999","PROJECT",conn);
if("DDUK".equalsIgnoreCase(projectName))
{
if( "item_code".equalsIgnoreCase( childNodeName ) )
{
itemCode = genericUtility.getColumnValue("item_code", allDom, "2" );
System.out.println("LPN Number=====>"+lpnNo);
// added by cpatil on 14-08-12 start
if(itemCode == null || itemCode.trim().length() == 0)
{
//changes by Dadaso pawar on 13/02/15 [Start]
//errList.add( "NULLLPNNO" );
errList.add( "VTITMNULL" );//Item code can not be null , Please specify appropriate Item code
//changes by Dadaso pawar on 13/02/15 [End]
errFields.add( childNodeName.toLowerCase() );
}
else
{
siteCode = genericUtility.getColumnValue("site_code", hdrDom );
System.out.println("siteCode Number=====>"+siteCode);
//Changed by Rohan on 21/07/12 for check stock that present only on grl location
//sql = "SELECT QUANTITY FROM STOCK WHERE SITE_CODE = ? AND LOT_SL = ? ";
sql = "SELECT QUANTITY FROM STOCK WHERE SITE_CODE = ? AND item_code = ? AND LOC_CODE in (select loc_code from location where inv_stat = ? ) and quantity > 0";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, siteCode );
pstmt.setString( 2, itemCode );
//Changed by Rohan on 21/07/12 for check stock that present only on grl location
pstmt.setString(3, grlLoc );
rs = pstmt.executeQuery();
if( rs.next() )
{
quantity = rs.getDouble(1);
}
else
{
//Changed by Rohan on 21/07/12 to change messages type
//errList.add( "VTSTK2" );
/*Added by Ashish Sonawane on 23/Aug/12 for allowing partial grl location [WM2ESUN009][START]*/
String sqlPartial ="SELECT QUANTITY FROM STOCK WHERE SITE_CODE = ? AND item_code = ? AND LOC_CODE in (select loc_code from location where inv_stat = ? ) and quantity > 0";
pstmtPgrl = conn.prepareStatement( sqlPartial );
pstmtPgrl.setString( 1, siteCode );
pstmtPgrl.setString( 2, itemCode );
pstmtPgrl.setString(3, partialGrlLoc);
rsPgrl = pstmtPgrl.executeQuery();
if(rsPgrl.next())
{
quantity = rsPgrl.getDouble(1);
}
else
{
//changes by Dadaso pawar on 13/02/15 [Start]
//errList.add( "VTLPNNTVAL" );
errList.add( "VTITNGRL" );//Item code not exist in general receiving location
//changes by Dadaso pawar on 13/02/15 [End]
errFields.add( childNodeName.toLowerCase() );
}
rsPgrl.close(); rsPgrl = null;
pstmtPgrl.close(); pstmtPgrl = null;
/*Added by Ashish Sonawane on 23/Aug/12 for allowing partial grl location [WM2ESUN009][END]*/
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if( quantity == 0 )
{
errList.add( "VTSTK2" );
errFields.add( childNodeName.toLowerCase() );
}
//End changed by Gulzar on 5/12/2012
}// end of else
}
//changed by wasim to validate scanned location in form 2 on 18-05-2015 [START].
else if( "loc_code".equalsIgnoreCase( childNodeName ) )
{
locCodefr = genericUtility.getColumnValue("loc_code", allDom, "2" );
itemCode = genericUtility.getColumnValue("item_code", allDom, "2" );
//changed by wasim on 01-05-2015 to check if location code is null [START]
if( locCodefr == null || locCodefr.trim().length() == 0 )
{
System.out.println("Location not entered");
errList.add( "NULLLOCCD" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by wasim on 01-05-2015 to check if location code is null [END]
else if(locCodefr.equals("GRL") || locCodefr.equals("PGRL"))
{
System.out.println("Location code scanned is"+locCodefr);
}
else
{
System.out.println("Wrong location code is scanned"+locCodefr);
errList.add( "VTGRLPGRL" );
errFields.add( childNodeName.toLowerCase() );
}
//sql = "select * from stock WHERE LOC_CODE = ? and item_code = ?";
sql = "select * from stock WHERE LOC_CODE = ? and item_code = ? and quantity > 0 ";// this is to check if quantity is 0 for item at that location.
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodefr );
pstmt.setString( 2, itemCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
System.out.println("Item exist in"+locCode);
}
else
{
System.out.println("item does not exist in"+locCode);
errList.add( "VTWRGLOC" );
errFields.add( childNodeName.toLowerCase() );
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
}
if( "lpn_no".equalsIgnoreCase( childNodeName ) && !"DDUK".equalsIgnoreCase(projectName) ) if( "lpn_no".equalsIgnoreCase( childNodeName ) && !"DDUK".equalsIgnoreCase(projectName) )
{ {
lpnNo = genericUtility.getColumnValue("lpn_no", allDom, "2" ); lpnNo = genericUtility.getColumnValue("lpn_no", allDom, "2" );
...@@ -454,6 +592,16 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -454,6 +592,16 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
String isPartial=""; String isPartial="";
String scannedQuantity=""; String scannedQuantity="";
double scannedQuantityD= 0.0; double scannedQuantityD= 0.0;
//changed by Wasim on 14-04-2015 start.
double locWeigth = 0d;
double locVolume = 0d;
double itemVolume = 0d;
double itemWeight = 0d;
double totalItemWeigth = 0d;
double totalItemVolume = 0d;
//Added by Jagruti on 19-8-2015
String overrideInvst = "";
//changed by Wasim on 14-04-2015 end.'
childList = parentList.item( 0 ).getChildNodes(); childList = parentList.item( 0 ).getChildNodes();
noOfChilds = childList.getLength(); noOfChilds = childList.getLength();
for ( int ctr = 0; ctr < noOfChilds; ctr++ ) //Loop for each node of current detail for ( int ctr = 0; ctr < noOfChilds; ctr++ ) //Loop for each node of current detail
...@@ -481,7 +629,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -481,7 +629,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
partialGrlLoc = discommon.getDisparams("999999","PGRL_INVSTAT",conn); partialGrlLoc = discommon.getDisparams("999999","PGRL_INVSTAT",conn);
partialResrvLoc = discommon.getDisparams("999999","PRSRV_INVSTAT",conn); partialResrvLoc = discommon.getDisparams("999999","PRSRV_INVSTAT",conn);
/*Added by Ashish Sonawane on 23/Aug/12 for allowing partial grl location [WM2ESUN009][END]*/ /*Added by Ashish Sonawane on 23/Aug/12 for allowing partial grl location [WM2ESUN009][END]*/
projectName = distCommon.getDisparams("999999","PROJECT",conn);
itemCode = genericUtility.getColumnValue("item_code", allDom, "3" ); itemCode = genericUtility.getColumnValue("item_code", allDom, "3" );
locCode = genericUtility.getColumnValue("loc_code__fr", allDom, "3" ); locCode = genericUtility.getColumnValue("loc_code__fr", allDom, "3" );
siteCode = genericUtility.getColumnValue("site_code", hdrDom ); siteCode = genericUtility.getColumnValue("site_code", hdrDom );
...@@ -523,7 +671,17 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -523,7 +671,17 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
if("DDUK".equalsIgnoreCase(projectName))
{
//changes by Dadaso pawar on 13/02/15 [Start]
if(locCodeTo == null || locCodeTo.length() == 0)
{
errList.add( "VMLOCCNULL" ); //Location code to can not be null
errFields.add( childNodeName.toLowerCase() );
break;
}
}
//changes by Dadaso pawar on 13/02/15 [End]
if( !locTypeLocation.equalsIgnoreCase(locTypeItem) ) if( !locTypeLocation.equalsIgnoreCase(locTypeItem) )
{ {
errList.add( "VMLOCTYP1" ); errList.add( "VMLOCTYP1" );
...@@ -542,6 +700,182 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -542,6 +700,182 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
} }
//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.end //Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.end
//DD@@
if("DDUK".equalsIgnoreCase(projectName))
{
// Changed by Jagruti, to bypass the weight & volume on 18-08-2015, Request ID: D15EKAT001
overrideInvst = checkNullAndTrim(distCommon.getDisparams("999999","OVERRIDE_INVSTAT",conn));
System.out.println("overrideInvst------->>["+overrideInvst+"]");
String [] arrayInvstat = overrideInvst.split(",");
for(int i=0;i < arrayInvstat.length;i++)
{
invstatOverrideList.add(arrayInvstat[i]);
System.out.println("invstatOverrideList in array after spliting :::::: " +invstatOverrideList.add(arrayInvstat[i]));
}
sql = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCodeTo);
rs = pstmt.executeQuery();
if(rs.next())
{
invstatOverride = checkNull(rs.getString("INV_STAT"));
}
if (pstmt != null){pstmt.close();pstmt = null;}
if (rs != null){rs.close();rs = null;}
if(invstatOverrideList.contains(invstatOverride))
{
System.out.println("locCodeTo is same as that of OVERRIDE_INVSTAT variable ::::::: ");
}
else
{
// End by Jagruti, to bypass the weight & volume on 18-08-2015, Request ID: D15EKAT001
sql = "SELECT SUM(QUANTITY) FROM STOCK WHERE ITEM_CODE <> ? AND SITE_CODE = ?"
+ " AND LOC_CODE = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, itemCode );
pstmt.setString( 2, siteCode );
pstmt.setString( 3, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
qtyDiffItem = rs.getDouble(1);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if(qtyDiffItem > 0)
{
errList.add( "INVLOCCODE" );
errFields.add( childNodeName.toLowerCase() );
break;
}
//changed by wasim to check GRL/PGRL location on 18-05-2015 [START]
if(checkNullAndTrim(locCode).equals("GRL"))
{
invStatList.add(casePickInvstat);
invStatList.add(resrvLocInvstat);
invStatList.add(deepStoreLoc);
}
else if(checkNullAndTrim(locCode).equals("PGRL"))
{
invStatList.add(activePickInvstat);
invStatList.add(partialResrvLoc);
}
//invStatList.add(casePickInvstat);
//invStatList.add(activePickInvstat);
//changed by wasim to check GRL/PGRL location on 18-05-2015 [END]
sql = "SELECT SINGLE_LOT_SL, ITEM_LOT_OPT, INV_STAT FROM LOCATION WHERE LOC_CODE = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
singleLotSl = checkNull(rs.getString("SINGLE_LOT_SL"));
itemLotOpt = checkNull(rs.getString("ITEM_LOT_OPT"));
invStat = checkNull(rs.getString("INV_STAT"));
}
else
{
errList.add( "INVLOCCODE" );
errFields.add( childNodeName.toLowerCase() );
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println("@@invStatLIst="+invStatList);
System.out.println("@@invStat="+invStat);
if(!(invStatList.contains(invStat.trim())))
{
errList.add( "VTLOCCODE8" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by Wasim on 14-04-2015 for checking weight and volume of item w.r.t suggested location start.
sql = "SELECT QUANTITY FROM STOCK WHERE ITEM_CODE = ? AND LOC_CODE = ? AND QUANTITY > 0";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, itemCode );
pstmt.setString( 2, locCodeTo );
rs = pstmt.executeQuery();
if( rs.next() )
{
stockQuantity = rs.getInt("QUANTITY");
HashMap itemVolMap = getItemVoumeMap(itemCode, "", conn);
itemVolume = (Double)itemVolMap.get("ITEM_SIZE");
itemWeight = (Double)itemVolMap.get("ITEM_WEIGHT");
HashMap locMap = new HashMap();
locMap = getLocationCapacity(locCodeTo,siteCode,conn);
locVolume = (Double)locMap.get("VOLUME");
locWeigth = (Double)locMap.get("MAX_WEIGHT");
totalItemWeigth = scannedQuantityD * itemWeight;
totalItemVolume = scannedQuantityD * itemVolume;
stockWeigth = stockQuantity * itemWeight;
stockVolume = stockQuantity * itemVolume;
System.out.println("In wfvaldata........");
System.out.println("Item Code is="+itemCode);
System.out.println("Single Item Weight="+itemWeight);
System.out.println("Single Item Volume="+itemVolume);
System.out.println("Total Item Weigth="+totalItemWeigth);
System.out.println("Total Item Volume="+totalItemVolume);
System.out.println("Stock Weigth="+stockWeigth);
System.out.println("Stock Volume="+stockVolume);
System.out.println("Suggested Location Weigth="+locWeigth);
System.out.println("Suggested Location Volume="+locVolume);
if((stockWeigth+totalItemWeigth) < locWeigth && (stockVolume+totalItemVolume) < locVolume)
{
System.out.println("Location is available"+locCodeTo);
}
else
{
System.out.println("Weigth and volume should be less than suggested location weight and volume.");
//changed by wasim on 01-06-2015 to insert data if location scanned in PGRL [START]
if(checkNullAndTrim(locCode).equals("GRL"))
{
System.out.println("Location code scanned is="+locCode);
errList.add( "VTWTVLM" );
errFields.add( childNodeName.toLowerCase() );
}
else
{
System.out.println("Location code scanned is="+locCode);
errList.add( "VTPGRLWT" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by wasim on 01-06-2015 to insert data if location scanned in PGRL [START]
}
}
else
{
System.out.println("Record Not Found");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
//changed by Wasim on 14-04-2015 for checking weight and volume of item w.r.t suggested location end.
} // Changed by Jagruti, to bypass the weight & volume on 18-08-2015, Request ID: D15EKAT001
}
else
{
sql = "SELECT HOLD_QTY FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ?" sql = "SELECT HOLD_QTY FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ?"
+ " AND LOC_CODE = ? AND lOT_NO = ? AND LOT_SL = ?"; + " AND LOC_CODE = ? AND lOT_NO = ? AND LOT_SL = ?";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
...@@ -848,6 +1182,9 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -848,6 +1182,9 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
} }
}//end of itemLotOpt == "1" }//end of itemLotOpt == "1"
}//else of singleLotSl =="Y" }//else of singleLotSl =="Y"
}// end project code condition
}//End of case "loc_code__to" }//End of case "loc_code__to"
}//End of for loop }//End of for loop
}//case 2 end }//case 2 end
...@@ -1079,6 +1416,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1079,6 +1416,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
//Changed by Ameya on 06/09/2012 for declare locType & locCode for Reserve location End //Changed by Ameya on 06/09/2012 for declare locType & locCode for Reserve location End
//ArrayList reservLocList = null; //ArrayList reservLocList = null;
String grlInvstat = ""; String grlInvstat = "";
String pgrlInvstat = "";
String resrvLocInvstat = ""; String resrvLocInvstat = "";
String resvLocCode = ""; String resvLocCode = "";
String stockSql = "",deepStoreLoc = "", casePickInvstat =""; String stockSql = "",deepStoreLoc = "", casePickInvstat ="";
...@@ -1121,7 +1459,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1121,7 +1459,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
DistCommon distCommon = new DistCommon(); DistCommon distCommon = new DistCommon();
projectName = distCommon.getDisparams("999999","PROJECT",conn);
if( objContext != null && objContext.trim().length() > 0 ) if( objContext != null && objContext.trim().length() > 0 )
{ {
currentFormNo = Integer.parseInt( objContext ); currentFormNo = Integer.parseInt( objContext );
...@@ -1187,6 +1525,9 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1187,6 +1525,9 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
//changed by sankara on 10/09/2012 to assign deep storage,case pick location [Start] //changed by sankara on 10/09/2012 to assign deep storage,case pick location [Start]
deepStoreLoc = distCommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn); deepStoreLoc = distCommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn);
casePickInvstat = distCommon.getDisparams("999999","CASE_PICK_INVSTAT",conn); casePickInvstat = distCommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
//changed by wasim to get PGRL inventory status on 16-05-2015 [START].
pgrlInvstat = distCommon.getDisparams("999999","PGRL_INVSTAT",conn);
//changed by wasim to get PGRL inventory status on 16-05-2015 [END].
//Changed by Ameya on 14/09/2012 //Changed by Ameya on 14/09/2012
//invStatList.add(casePickInvstat); //invStatList.add(casePickInvstat);
invStatList.add(resrvLocInvstat); invStatList.add(resrvLocInvstat);
...@@ -1282,18 +1623,38 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1282,18 +1623,38 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
//"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " + //"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> ? " + "AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> ? " +
//"AND (A.QUANTITY - A.ALLOC_QTY - CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 "+//Commented by gulzar on 1/12/2012 //"AND (A.QUANTITY - A.ALLOC_QTY - CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 "+//Commented by gulzar on 1/12/2012
"AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 "+//Changed by gulzar on 1/12/2012 "AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 ";//Changed by gulzar on 1/12/2012
//changed by sankara on 05/04/14 added login site code //changed by sankara on 05/04/14 added login site code
//"AND D.INV_STAT = ? "; //"AND D.INV_STAT = ? ";
" AND D.INV_STAT = ? AND A.SITE_CODE = ? ";
if("DDUK".equalsIgnoreCase(projectName))
{
sql = sql + " AND D.INV_STAT IN (?,?) AND A.SITE_CODE = ? ";
}
else
{
sql = sql + " AND D.INV_STAT = ? AND A.SITE_CODE = ? ";
}
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//changed by sankara on 05/04/14 added login site code and using preparestatement statrt. //changed by sankara on 05/04/14 added login site code and using preparestatement statrt.
//pstmt.setString(1, grlInvstat); //pstmt.setString(1, grlInvstat);
pstmt.setString(1, "Y"); pstmt.setString(1, "Y");
pstmt.setString(2, "S"); pstmt.setString(2, "S");
if("DDUK".equalsIgnoreCase(projectName))
{
pstmt.setString(3, grlInvstat);
pstmt.setString(4, pgrlInvstat);
pstmt.setString(5, siteCode);
}
else
{
pstmt.setString(3, grlInvstat); pstmt.setString(3, grlInvstat);
pstmt.setString(4, siteCode); pstmt.setString(4, siteCode);
}
//changed by sankara on 05/04/14 added login site code and using preparestatement end. //changed by sankara on 05/04/14 added login site code and using preparestatement end.
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
...@@ -1324,8 +1685,40 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1324,8 +1685,40 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
valueXmlString.append("<line_no><![CDATA[").append(domID).append("]]></line_no>\r\n"); valueXmlString.append("<line_no><![CDATA[").append(domID).append("]]></line_no>\r\n");
valueXmlString.append("<item_code><![CDATA[").append(checkNull(itemCode)).append("]]></item_code>\r\n"); valueXmlString.append("<item_code><![CDATA[").append(checkNull(itemCode)).append("]]></item_code>\r\n");
valueXmlString.append("<item_descr><![CDATA[").append(checkNull(itemDescr)).append("]]></item_descr>\r\n"); valueXmlString.append("<item_descr><![CDATA[").append(checkNull(itemDescr)).append("]]></item_descr>\r\n");
valueXmlString.append("<loc_code__fr><![CDATA[").append(checkNull(locCode)).append("]]></loc_code__fr>\r\n");
if("DDUK".equalsIgnoreCase(projectName))
{
valueXmlString.append("<loc_code><![CDATA[]]></loc_code>\r\n");
//changed by wasim to scan location code in 2nd screen on 18-05-2015 [START].
valueXmlString.append("<loc_code__fr><![CDATA[").append("").append("]]></loc_code__fr>\r\n");
//valueXmlString.append("<loc_code__fr><![CDATA[").append(checkNull(locCode)).append("]]></loc_code__fr>\r\n");
//changed by wasim to scan location code in 2nd screen on 18-05-2015 [END].
valueXmlString.append("<loc_descr__fr><![CDATA[").append(checkNull(locDescr)).append("]]></loc_descr__fr>\r\n"); valueXmlString.append("<loc_descr__fr><![CDATA[").append(checkNull(locDescr)).append("]]></loc_descr__fr>\r\n");
valueXmlString.append("<loc_code__sys><![CDATA[").append(locCodeNew).append("]]></loc_code__sys>\r\n");
valueXmlString.append("<loc_code__to><![CDATA[").append( "" ).append("]]></loc_code__to>\r\n");
valueXmlString.append("<lot_no__fr><![CDATA[").append(" ").append("]]></lot_no__fr>\r\n");
valueXmlString.append("<lot_no__to><![CDATA[").append(" ").append("]]></lot_no__to>\r\n");
valueXmlString.append("<lot_sl__fr><![CDATA[").append(" ").append("]]></lot_sl__fr>\r\n");
valueXmlString.append("<lot_sl__to><![CDATA[").append(" ").append("]]></lot_sl__to>\r\n");
valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
valueXmlString.append("<acct_code__cr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__cr>\r\n");
valueXmlString.append("<cctr_code__cr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__cr>\r\n");
valueXmlString.append("<acct_code__dr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__dr>\r\n");
valueXmlString.append("<cctr_code__dr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__dr>\r\n");
valueXmlString.append("<remarks/>\r\n");
valueXmlString.append("</Detail2>\r\n");
}
else
{
//changed by wasim to scan location code in 2nd screen on 18-05-2015 [START].
valueXmlString.append("<loc_code__fr><![CDATA[").append("").append("]]></loc_code__fr>\r\n");
//valueXmlString.append("<loc_code__fr><![CDATA[").append(checkNull(locCode)).append("]]></loc_code__fr>\r\n");
//changed by wasim to scan location code in 2nd screen on 18-05-2015 [END].
//valueXmlString.append("<loc_code__fr><![CDATA[").append(checkNull(locCode)).append("]]></loc_code__fr>\r\n");
//commented and changed by chaitali 18/11/11 to set the available grl location to system suggested location //commented and changed by chaitali 18/11/11 to set the available grl location to system suggested location
//valueXmlString.append("<loc_code__to><![CDATA[").append( reservLocList.get(count) ).append("]]></loc_code__to>\r\n"); //valueXmlString.append("<loc_code__to><![CDATA[").append( reservLocList.get(count) ).append("]]></loc_code__to>\r\n");
//Commented By Mahesh Patidar on 23/06/12 //Commented By Mahesh Patidar on 23/06/12
...@@ -1353,6 +1746,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1353,6 +1746,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
valueXmlString.append("<remarks/>\r\n"); valueXmlString.append("<remarks/>\r\n");
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
} }
}
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
...@@ -1375,6 +1770,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1375,6 +1770,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
}// case 2 }// case 2
case 3: case 3:
{ {
// Changed by Manish on 05/11/15 for DDWMS merging [start]
projectName = distCommon.getDisparams("999999","PROJECT",conn);
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) ) if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{ {
// reservLocList = new ArrayList(); //Commented By Mahesh Patidar on 23/06/12 // reservLocList = new ArrayList(); //Commented By Mahesh Patidar on 23/06/12
...@@ -1394,7 +1791,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1394,7 +1791,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
} }
System.out.println("in case 3:::::"+siteCode); System.out.println("in case 3:::::"+siteCode);
//end Changed by Dhanraj on 20-SEP-14 get site_code and set sql. //end Changed by Dhanraj on 20-SEP-14 get site_code and set sql.
itemCode = checkNull(genericUtility.getColumnValue("item_code", allDom, "2" ));
String locCodeScanned = genericUtility.getColumnValue("loc_code", allDom,"2");
lotSl = checkNull(genericUtility.getColumnValue("lpn_no", allDom, "2" )); lotSl = checkNull(genericUtility.getColumnValue("lpn_no", allDom, "2" ));
//invStatList.add(casePickInvstat); // 13/09/12 manoharan //invStatList.add(casePickInvstat); // 13/09/12 manoharan
...@@ -1506,13 +1904,28 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1506,13 +1904,28 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
"AND A.ITEM_CODE = C.ITEM_CODE AND B.AVAILABLE = 'Y' "+ "AND A.ITEM_CODE = C.ITEM_CODE AND B.AVAILABLE = 'Y' "+
"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " + "AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
//"AND (A.QUANTITY - A.ALLOC_QTY - CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 "+//Commented by gulzar on 1/12/2012 //"AND (A.QUANTITY - A.ALLOC_QTY - CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 "+//Commented by gulzar on 1/12/2012
"AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 "+//Changed by gulzar on 1/12/2012 "AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 ";//Changed by gulzar on 1/12/2012
"AND A.lot_sl = ? " +
if("DDUK".equalsIgnoreCase(projectName))
{
sql = sql + "AND A.item_code = ? " +
" AND A.SITE_CODE = ? " +
" AND A.LOC_CODE = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);//grlInvstat);
pstmt.setString(2, siteCode);
pstmt.setString(3, locCodeScanned);
}
else
{
sql = sql + " AND A.lot_sl = ? " +
//Changed by Dharnaj on 20-SEP-14 //Changed by Dharnaj on 20-SEP-14
"AND A.SITE_CODE = ? " ; " AND A.SITE_CODE = ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lotSl);//grlInvstat); pstmt.setString(1, lotSl);//grlInvstat);
pstmt.setString(2, siteCode); pstmt.setString(2, siteCode);
}
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
...@@ -1537,6 +1950,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1537,6 +1950,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
/*Added by Ashish Sonawane on 23/Aug/12 for checking partial quantity [WM2ESUN009][START] */ /*Added by Ashish Sonawane on 23/Aug/12 for checking partial quantity [WM2ESUN009][START] */
String isPartial = ""; String isPartial = "";
System.out.println("@@@@locCode:["+locCode+"] partialGrlLoc:["+partialGrlLoc+"] , loc"); System.out.println("@@@@locCode:["+locCode+"] partialGrlLoc:["+partialGrlLoc+"] , loc");
if(!"DDUK".equalsIgnoreCase(projectName))
{
//if(!(locCode.trim().equalsIgnoreCase(partialGrlLoc.trim()))) //if(!(locCode.trim().equalsIgnoreCase(partialGrlLoc.trim())))
if(!(locInvStat.trim().equalsIgnoreCase(partialGrlLoc.trim()))) if(!(locInvStat.trim().equalsIgnoreCase(partialGrlLoc.trim())))
{ {
...@@ -1563,6 +1978,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1563,6 +1978,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
{ {
isPartial="N"; isPartial="N";
} }
}
/*Added by Ashish Sonawane on 23/Aug/12 for checking partial quantity [WM2ESUN009][END] */ /*Added by Ashish Sonawane on 23/Aug/12 for checking partial quantity [WM2ESUN009][END] */
//Changed by Ameya on 06/09/2012 setting resrvLoc //Changed by Ameya on 06/09/2012 setting resrvLoc
...@@ -1572,19 +1988,40 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1572,19 +1988,40 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
//locCodeNew = getLocCode( invStatList, locType, locPrveZone, conn) //locCodeNew = getLocCode( invStatList, locType, locPrveZone, conn)
//locCodeNew = getLocCode(locInvStat, invStatList, locType, locPrveZone, conn); //locCodeNew = getLocCode(locInvStat, invStatList, locType, locPrveZone, conn);
// Changed by Manish on 05/11/15 for DDWMS merging [start]
projectName = distCommon.getDisparams("999999","PROJECT",conn);
if("DDUK".equalsIgnoreCase(projectName)) if("DDUK".equalsIgnoreCase(projectName))
{ {
domID++;
locCodeNew = getLocCodeForDDUK(locInvStat, invStatList, locType, locPrveZone,siteCode,itemCode,quantity,noArt,conn); locCodeNew = getLocCodeForDDUK(locInvStat, invStatList, locType, locPrveZone,siteCode,itemCode,quantity,noArt,conn);
valueXmlString.append( "<Detail3 domID='"+ domID +"' selected=\"N\">\r\n" );
valueXmlString.append("<tran_id/>\r\n");
valueXmlString.append("<line_no><![CDATA[").append(domID).append("]]></line_no>\r\n");
valueXmlString.append("<item_code><![CDATA[").append(checkNull(itemCode)).append("]]></item_code>\r\n");
valueXmlString.append("<item_descr><![CDATA[").append(checkNull(itemDescr)).append("]]></item_descr>\r\n");
valueXmlString.append("<loc_code__fr><![CDATA[").append(checkNull(locCode)).append("]]></loc_code__fr>\r\n");
valueXmlString.append("<loc_descr__fr><![CDATA[").append(checkNull(locDescr)).append("]]></loc_descr__fr>\r\n");
valueXmlString.append("<loc_code__sys><![CDATA[").append(checkNullAndTrim(locCodeNew)).append("]]></loc_code__sys>\r\n");
valueXmlString.append("<loc_code__to><![CDATA[").append( checkNullAndTrim(locCodeNew)).append("]]></loc_code__to>\r\n");
valueXmlString.append("<lot_no__fr><![CDATA[").append(" ").append("]]></lot_no__fr>\r\n");
valueXmlString.append("<lot_no__to><![CDATA[").append(" ").append("]]></lot_no__to>\r\n");
valueXmlString.append("<lot_sl__fr><![CDATA[").append(" ").append("]]></lot_sl__fr>\r\n");
valueXmlString.append("<lot_sl__to><![CDATA[").append(" ").append("]]></lot_sl__to>\r\n");
valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
valueXmlString.append("<no_art><![CDATA[").append(1).append("]]></no_art>\r\n");
valueXmlString.append("<acct_code__cr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__cr>\r\n");
valueXmlString.append("<cctr_code__cr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__cr>\r\n");
valueXmlString.append("<acct_code__dr><![CDATA[").append(checkNull(acctCode)).append("]]></acct_code__dr>\r\n");
valueXmlString.append("<cctr_code__dr><![CDATA[").append(checkNull(cctrCode)).append("]]></cctr_code__dr>\r\n");
valueXmlString.append("<remarks/>\r\n");
valueXmlString.append("<ispartial><![CDATA[").append(isPartial).append("]]></ispartial>\r\n");
valueXmlString.append("</Detail3>\r\n");
} }
else else
{ {
locCodeNew = getLocCode(locInvStat, invStatList, locType, locPrveZone,siteCode, conn); locCodeNew = getLocCode(locInvStat, invStatList, locType, locPrveZone,siteCode, conn);
}
// Changed by Manish on 05/11/15 for DDWMS merging [end]
domID++; domID++;
valueXmlString.append( "<Detail3 domID='"+ domID +"' selected=\"N\">\r\n" ); valueXmlString.append( "<Detail3 domID='"+ domID +"' selected=\"N\">\r\n" );
valueXmlString.append("<tran_id/>\r\n"); valueXmlString.append("<tran_id/>\r\n");
valueXmlString.append("<line_no><![CDATA[").append(domID).append("]]></line_no>\r\n"); valueXmlString.append("<line_no><![CDATA[").append(domID).append("]]></line_no>\r\n");
...@@ -1638,6 +2075,11 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl ...@@ -1638,6 +2075,11 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
valueXmlString.append("<remarks/>\r\n"); valueXmlString.append("<remarks/>\r\n");
valueXmlString.append("<ispartial><![CDATA[").append(isPartial).append("]]></ispartial>\r\n"); valueXmlString.append("<ispartial><![CDATA[").append(isPartial).append("]]></ispartial>\r\n");
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
}
// Changed by Manish on 05/11/15 for DDWMS merging [end]
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = 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