Skip to content

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

changed by sankara on 11/04/14 updated pickissconf,repliossic,wavegenerationic for wms live 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94550 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ebf56931
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 18 deletions
webitm-wms/ibase/webitm/ejb/wms/PickIssConf.java
View file @ 32a33205
...@@ -1243,9 +1243,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1243,9 +1243,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
String status = ""; String status = "";
Boolean isUpdateHdr=true; Boolean isUpdateHdr=true;
int updCntPickOrdHdr= 0; int updCntPickOrdHdr= 0;
double pickQty = 0;
try { try {
String sqlPickOrd = "SELECT STATUS FROM PICK_ORD_DET WHERE PICK_ORDER = ? "; //String sqlPickOrd = "SELECT STATUS FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
String sqlPickOrd = "SELECT STATUS,(QUANTITY - (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END )) AS QUANTITY FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
pstmtPickOrdHdr = conn.prepareStatement(sqlPickOrd); pstmtPickOrdHdr = conn.prepareStatement(sqlPickOrd);
pstmtPickOrdHdr.setString(1, pickOrder); pstmtPickOrdHdr.setString(1, pickOrder);
...@@ -1254,7 +1256,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1254,7 +1256,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
while(rsPicKordHdr.next()) while(rsPicKordHdr.next())
{ {
status = rsPicKordHdr.getString("STATUS") == null ? "": rsPicKordHdr.getString("STATUS"); status = rsPicKordHdr.getString("STATUS") == null ? "": rsPicKordHdr.getString("STATUS");
if( !("C".equalsIgnoreCase(status) )) pickQty = rsPicKordHdr.getDouble("QUANTITY");
//Changed By Pragyan 09-apr-14 to start and end
//if( !("C".equalsIgnoreCase(status) ))
System.out.println("@@@@ Inside Check Status["+status+"]pickQty["+pickQty+"]");
if( !("C".equalsIgnoreCase(status) ) && pickQty >0)
{ {
isUpdateHdr =false; isUpdateHdr =false;
break; break;
...@@ -1262,6 +1268,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1262,6 +1268,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
} }
if(isUpdateHdr) if(isUpdateHdr)
{ {
System.out.println("@@@@ Updating hader status as C ");
String updatePickOrdSql = "UPDATE PICK_ORD_HDR SET STATUS = ? " String updatePickOrdSql = "UPDATE PICK_ORD_HDR SET STATUS = ? "
+ " WHERE PICK_ORDER = ? "; + " WHERE PICK_ORDER = ? ";
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 32a33205
...@@ -163,6 +163,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -163,6 +163,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
String pickOrd = ""; String pickOrd = "";
String PicklineNoOrd = ""; String PicklineNoOrd = "";
String sqlReplCnt = ""; String sqlReplCnt = "";
java.util.Date tranDate = null;
String prdCode = "";
int cntRepl = 0; int cntRepl = 0;
//Changed By Rohan on 29-12-10 to define variables.end //Changed By Rohan on 29-12-10 to define variables.end
String noArt = "";//Changed by sumit on 25/02/13 String noArt = "";//Changed by sumit on 25/02/13
...@@ -200,7 +202,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -200,7 +202,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
int currentFormNo = 0; int currentFormNo = 0;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB( "DriverValidator" ); conn = connDriver.getConnectDB( "DriverValidator" );
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
if ( objContext != null && objContext.trim().length() > 0 ) if ( objContext != null && objContext.trim().length() > 0 )
...@@ -414,11 +416,14 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -414,11 +416,14 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
} }
//Changed By Pragyan 07-apr-14 to "E" remove error type from replenishment
//Changed By Pragyan //Changed By Pragyan
//else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") )//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if //else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") )//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
//Changed by Rohan on 05-09-12 for stock to dock replanishment //Changed by Rohan on 05-09-12 for stock to dock replanishment
//else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("Q") && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if //else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("Q") && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if //else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
//else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("E") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
else if ( "repl_iss".equalsIgnoreCase(objName) && ! orderType.trim().equalsIgnoreCase("C") && ! orderType.trim().equalsIgnoreCase("M") && ! orderType.trim().equalsIgnoreCase("F") && ! orderType.trim().equalsIgnoreCase("G") && ! orderType.trim().equalsIgnoreCase("H") && ! orderType.trim().equalsIgnoreCase("J") && ! orderType.trim().equalsIgnoreCase("K") && ! orderType.trim().equalsIgnoreCase("I") && ! orderType.trim().equalsIgnoreCase("D") && ! orderType.trim().equalsIgnoreCase("L"))//added by akhilesh on 23/jun/2012 put upper condition(orderType.trim().equalsIgnoreCase("I")) in this if
{ {
/*System.out.println("equals ignores case"); /*System.out.println("equals ignores case");
errList.add( "CASEPICK" ); errList.add( "CASEPICK" );
...@@ -805,6 +810,94 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -805,6 +810,94 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
else if( "site_code".equalsIgnoreCase( childNodeName ) )
{
if ( childNode.getFirstChild() == null)
{
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString( "site_code", "NULLSITECD", userId );
//break;
errList.add( "NULLSITECD" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
siteCode = genericUtility.getColumnValue( "site_code", currFormDataDom );
sql = "SELECT COUNT(*) AS COUNT FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if( count == 0 )
{
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString( "site_code", "INVDSITECD", userId );
//break;
errList.add( "INVDSITECD" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
else //added by kunal on 15-feb-14 for period code
{
siteCode = genericUtility.getColumnValue("site_code", currFormDataDom);
System.out.println("364 site code ="+siteCode);
if (genericUtility.getColumnValue("tran_date", currFormDataDom) != null)
{
tranDate = sdf1.parse(genericUtility.getColumnValue("tran_date", currFormDataDom));
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
}//End of site_code validation
} }
} }
break; break;
...@@ -1081,10 +1174,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -1081,10 +1174,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
System.out.println("pick type =[" +pickType+ "]"); System.out.println("pick type =[" +pickType+ "]");//
//Changed By Pragyan 07-apr-14 to set pick type for order type "E"
//Changed By Sumit as the pick type "Q" required. //Changed By Sumit as the pick type "Q" required.
//if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) )//Active pick //if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) )//Active pick
if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) || "Q".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()))//Active pick //if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) || "Q".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim() ))//Active pick
if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) || "Q".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim() ) || "E".equalsIgnoreCase(orderType.trim()))//Active pick
{ {
varName = "ACTIVE_PICK_INVSTAT"; varName = "ACTIVE_PICK_INVSTAT";
} }
...@@ -2672,9 +2767,11 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -2672,9 +2767,11 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
{ {
varName = "DOCKLOC_INVSTAT"; varName = "DOCKLOC_INVSTAT";
}*/ }*/
//Changed By Pragyan 07-apr-14 to set proper pick type
//Changed By Sumit as the pick type "Q" required. //Changed By Sumit as the pick type "Q" required.
//if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) )//Active pick //if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) )//Active pick//
if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) || "Q".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()) || "P".equalsIgnoreCase(pickType.trim()))//Active pick //if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) || "Q".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()) || "P".equalsIgnoreCase(pickType.trim()))//Active pick
if ( "A".equalsIgnoreCase(pickType.trim()) || "I".equalsIgnoreCase(pickType.trim()) || "Q".equalsIgnoreCase(pickType.trim()) || "T".equalsIgnoreCase(pickType.trim()) || "P".equalsIgnoreCase(pickType.trim()) | "E".equalsIgnoreCase(orderType.trim()))//Active pick
{ {
varName = "ACTIVE_PICK_INVSTAT"; varName = "ACTIVE_PICK_INVSTAT";
} }
...@@ -3653,9 +3750,10 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3653,9 +3750,10 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//added by chitranjan to get location code ,var_name ,pick_type from stock and invstat location for suggested location //23/11/11 //added by chitranjan to get location code ,var_name ,pick_type from stock and invstat location for suggested location //23/11/11
sugstLocList = new ArrayList(); sugstLocList = new ArrayList();
//Changed By Pragyan 07-APR-14 to get pick type properly.start
//Changed by sumit on 19/02/13 modifide sql as this is wrong. //Changed by sumit on 19/02/13 modifide sql as this is wrong.
//sql = "SELECT POD.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POD WHERE ROD.PICK_ORDER = POD.PICK_ORDER AND ROD.REPL_ORDER = ?"; //sql = "SELECT POD.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POD WHERE ROD.PICK_ORDER = POD.PICK_ORDER AND ROD.REPL_ORDER = ?";
sql = " SELECT DISTINCT POH.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POH , PICK_ORD_DET POD " + /*sql = " SELECT DISTINCT POH.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POH , PICK_ORD_DET POD " +
" WHERE POH.PICK_ORDER = POD.PICK_ORDER AND POD.REPL_ORDER = ROD.REPL_ORDER AND ROD.REPL_ORDER = ? "; " WHERE POH.PICK_ORDER = POD.PICK_ORDER AND POD.REPL_ORDER = ROD.REPL_ORDER AND ROD.REPL_ORDER = ? ";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder ); pstmt.setString( 1, replOrder );
...@@ -3667,7 +3765,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3667,7 +3765,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
} }
rs.close(); rs.close();
pstmt.close(); pstmt.close();
System.out.println("pick type =[" +pickType+ "]"); System.out.println("pick type =[" +pickType+ "]")
if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick
{ {
...@@ -3679,6 +3777,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3679,6 +3777,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
varName = "CASE_PICK_INVSTAT"; varName = "CASE_PICK_INVSTAT";
objName = "repl_iss"; objName = "repl_iss";
} }
*/
//Changed By Pragyan 07-APR-14 to get pick type properly.end
//changes added by gulzar to consider for dock location - 04/12/11 //changes added by gulzar to consider for dock location - 04/12/11
String orderType = ""; String orderType = "";
sql = "SELECT ORDER_TYPE FROM REPL_ORD_HDR WHERE REPL_ORDER = ? "; sql = "SELECT ORDER_TYPE FROM REPL_ORD_HDR WHERE REPL_ORDER = ? ";
...@@ -3691,12 +3792,39 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3691,12 +3792,39 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
if ( "D".equalsIgnoreCase(orderType.trim()) ) //Changed By Pragyan 07-APR-14 to get pick type properly.start
if ( "A".equalsIgnoreCase(orderType.trim()) || "I".equalsIgnoreCase(orderType.trim()) || "Q".equalsIgnoreCase(orderType.trim()) || "T".equalsIgnoreCase(orderType.trim()) || "E".equalsIgnoreCase(orderType.trim()))//Active pick
{ {
pickType = "A";
objName = "active_repl_iss";
varName = "ACTIVE_PICK_INVSTAT";
}
else if ( "C".equalsIgnoreCase(orderType.trim()) || "M".equalsIgnoreCase(orderType.trim()) || "J".equalsIgnoreCase(orderType.trim()) || "K".equalsIgnoreCase(orderType.trim()))//Case pick & master pick
{
varName = "CASE_PICK_INVSTAT";
objName = "repl_iss";
}
else if("E".equalsIgnoreCase(orderType.trim()) || "F".equalsIgnoreCase(orderType.trim()) || "G".equalsIgnoreCase(orderType.trim()) ||"H".equalsIgnoreCase(orderType.trim()) )
{
objName = "repl_iss";
varName = "PND_INVSTAT";
}
else if("L".equalsIgnoreCase(orderType.trim()) || "D".equalsIgnoreCase(orderType.trim()))
{
objName = "repl_iss";
varName = "DOCKLOC_INVSTAT"; varName = "DOCKLOC_INVSTAT";
} }
/*if ( "D".equalsIgnoreCase(orderType.trim()) )
{
varName = "DOCKLOC_INVSTAT";
}*/
//End changes by gulzar - 04/12/11 //End changes by gulzar - 04/12/11
//Changed By Pragyan 07-APR-14 to get pick type properly.end
disparmVal = distComm.getDisparams( "999999", varName, conn ); disparmVal = distComm.getDisparams( "999999", varName, conn );
System.out.println(" disparmVal =[" + disparmVal + "]"); System.out.println(" disparmVal =[" + disparmVal + "]");
...@@ -4158,7 +4286,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -4158,7 +4286,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
replOrder = genericUtility.getColumnValueFromNode("repl_order", parentNode); replOrder = genericUtility.getColumnValueFromNode("repl_order", parentNode);
lineNoOrd = Integer.parseInt(genericUtility.getColumnValueFromNode("line_no__ord", parentNode)); lineNoOrd = Integer.parseInt(genericUtility.getColumnValueFromNode("line_no__ord", parentNode));
System.out.println("itemCode ----- ["+itemCode+"]"); System.out.println("itemCode ----- ["+itemCode+"]");
//Changed by sumit on 19/02/13 modifide sql as this is wrong. //Changed By Pragyan To check th pick type proper way.start
/*//Changed by sumit on 19/02/13 modifide sql as this is wrong.
//sql = "SELECT POD.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POD WHERE ROD.PICK_ORDER = POD.PICK_ORDER AND ROD.REPL_ORDER = ?"; //sql = "SELECT POD.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POD WHERE ROD.PICK_ORDER = POD.PICK_ORDER AND ROD.REPL_ORDER = ?";
sql = " SELECT DISTINCT POH.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POH , PICK_ORD_DET POD " + sql = " SELECT DISTINCT POH.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POH , PICK_ORD_DET POD " +
" WHERE POH.PICK_ORDER = POD.PICK_ORDER AND POD.REPL_ORDER = ROD.REPL_ORDER AND ROD.REPL_ORDER = ? "; " WHERE POH.PICK_ORDER = POD.PICK_ORDER AND POD.REPL_ORDER = ROD.REPL_ORDER AND ROD.REPL_ORDER = ? ";
...@@ -4183,6 +4312,43 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -4183,6 +4312,43 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
objName = "repl_iss"; objName = "repl_iss";
} }
*/
String orderType = "";
sql = "SELECT ORDER_TYPE FROM REPL_ORD_HDR WHERE REPL_ORDER = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if (rs.next())
{
orderType = checkNull(rs.getString("ORDER_TYPE"));
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
//Changed By Pragyan 07-APR-14 to get pick type properly.start
if ( "A".equalsIgnoreCase(orderType.trim()) || "I".equalsIgnoreCase(orderType.trim()) || "Q".equalsIgnoreCase(orderType.trim()) || "T".equalsIgnoreCase(orderType.trim()) || "E".equalsIgnoreCase(orderType.trim()))//Active pick
{
pickType = "A";
objName = "active_repl_iss";
varName = "ACTIVE_PICK_INVSTAT";
}
else if ( "C".equalsIgnoreCase(orderType.trim()) || "M".equalsIgnoreCase(orderType.trim()) || "J".equalsIgnoreCase(orderType.trim()) || "K".equalsIgnoreCase(orderType.trim()))//Case pick & master pick
{
varName = "CASE_PICK_INVSTAT";
objName = "repl_iss";
}
else if("E".equalsIgnoreCase(orderType.trim()) || "F".equalsIgnoreCase(orderType.trim()) || "G".equalsIgnoreCase(orderType.trim()) ||"H".equalsIgnoreCase(orderType.trim()) )
{
objName = "repl_iss";
varName = "PND_INVSTAT";
}
else if("L".equalsIgnoreCase(orderType.trim()) || "D".equalsIgnoreCase(orderType.trim()))
{
objName = "repl_iss";
varName = "DOCKLOC_INVSTAT";
}
//Changed By Pragyan To check th pick type proper way.end
sql = "SELECT RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+ sql = "SELECT RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+
" RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, RID.LOC_CODE__SYS as LOC_CODE__SYS, RID.LOT_SL__NEW"+ " RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, RID.LOC_CODE__SYS as LOC_CODE__SYS, RID.LOT_SL__NEW"+
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ 32a33205
...@@ -184,7 +184,10 @@ etc ...@@ -184,7 +184,10 @@ etc
valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" ); valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
//Changed by sumit on 18/09/12 for single lot and Packing allow end. //Changed by sumit on 18/09/12 for single lot and Packing allow end.
//Changed by sumit on 18/09/12 adding print_label and printer name start. //Changed by sumit on 18/09/12 adding print_label and printer name start.
valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "" ).append( "]]></print_label>\r\n" ); //changed by sankara on 09/04/14 print label set by default no start.
//valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "" ).append( "]]></print_label>\r\n" );
valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "N" ).append( "]]></print_label>\r\n" );
//changed by sankara on 09/04/14 print label set by default no end.
valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" ); valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
//Changed by sumit on 18/09/12 adding print_label and printer name end. //Changed by sumit on 18/09/12 adding print_label and printer name end.
...@@ -551,10 +554,11 @@ etc ...@@ -551,10 +554,11 @@ etc
System.out.println(" waveMode "+waveMode); System.out.println(" waveMode "+waveMode);
if("P".equalsIgnoreCase(waveMode)) if("P".equalsIgnoreCase(waveMode))
{ {
//changed by sankara on 09/04/14 print label set as No in item change
valueXmlString.append( "<print_label protect ='0'><![CDATA[" ).append( "Y" ).append( "]]></print_label>\r\n" ); //valueXmlString.append( "<print_label protect ='0'><![CDATA[" ).append( "Y" ).append( "]]></print_label>\r\n" );
valueXmlString.append( "<printer_name protect ='0'><![CDATA[" ).append( "PDFCreator" ).append( "]]></printer_name>\r\n" ); //valueXmlString.append( "<printer_name protect ='0'><![CDATA[" ).append( "PDFCreator" ).append( "]]></printer_name>\r\n" );
valueXmlString.append( "<print_label protect ='0'><![CDATA[" ).append( "N" ).append( "]]></print_label>\r\n" );
valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
} }
else else
{ {
......
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