Skip to content

B
business-java
Commit 96dad157 authored by sankara.rao's avatar sankara.rao
Browse files
Options

changed by sankara on 30/09/13 for update PickOrderPrc and PickAssignIc for... 

changed by sankara on 30/09/13 for update PickOrderPrc and PickAssignIc for getting unconfirmed repl orders


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93688 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d4f97789
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 24 deletions
webitm-wms/ibase/webitm/ejb/wms/PickAssignIC.java
View file @ 96dad157
...@@ -74,6 +74,8 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic ...@@ -74,6 +74,8 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
String orddatTo = ""; String orddatTo = "";
String pickOrderFrom = ""; String pickOrderFrom = "";
String pickOrderTo = ""; String pickOrderTo = "";
//changed by sankara on 28/09/13 for getting unconfirmed repl_order start.
String pickreplStatus = "";
int currentFormNo = 0; int currentFormNo = 0;
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
java.sql.Date dateFrom = null; java.sql.Date dateFrom = null;
...@@ -108,10 +110,15 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic ...@@ -108,10 +110,15 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
System.out.println("PICKORDERFROM====="+pickOrderFrom); System.out.println("PICKORDERFROM====="+pickOrderFrom);
pickOrderTo = checkNull( genericUtility.getColumnValue("pick_order_to",dom) ); pickOrderTo = checkNull( genericUtility.getColumnValue("pick_order_to",dom) );
System.out.println("PICKORDERTO======="+pickOrderTo); System.out.println("PICKORDERTO======="+pickOrderTo);
dateMap = getOrderDate( pickOrderFrom,pickOrderTo,conn); //changed by sankara on 28/09/13 for getting unconfirmed repl_order start.
pickreplStatus = checkNull( genericUtility.getColumnValue("status",dom) );
System.out.println("PICKREPLSTATUS======"+pickreplStatus);
//dateMap = getOrderDate( pickOrderFrom,pickOrderTo,conn);
dateMap = getOrderDate( pickOrderFrom,pickOrderTo,pickreplStatus,conn);
//changed by sankara on 28/09/13 for getting unconfirmed repl_order end.
dateFrom = ((java.sql.Date)dateMap.get("MIN_DATE")); dateFrom = ((java.sql.Date)dateMap.get("MIN_DATE"));
System.out.println("dateFrom=="+dateFrom); System.out.println("dateFrom=="+dateFrom);
if( dateFrom == null ) if( dateFrom == null )
{ {
valueXmlString.append( "<from_date><![CDATA[" ).append("").append( "]]></from_date>\r\n" ); valueXmlString.append( "<from_date><![CDATA[" ).append("").append( "]]></from_date>\r\n" );
...@@ -193,8 +200,9 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic ...@@ -193,8 +200,9 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
System.out.println( "\n****ValueXmlString :" + valueXmlString.toString() + ":********" ); System.out.println( "\n****ValueXmlString :" + valueXmlString.toString() + ":********" );
return valueXmlString.toString(); return valueXmlString.toString();
} }
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders
public HashMap getOrderDate( String pickOrderFrom, String pickOrderTo,Connection conn )throws RemoteException, ITMException //public HashMap getOrderDate( String pickOrderFrom, String pickOrderTo,Connection conn )throws RemoteException, ITMException
public HashMap getOrderDate( String pickOrderFrom, String pickOrderTo, String pickreplStatus, Connection conn )throws RemoteException, ITMException
{ {
String sql = ""; String sql = "";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
...@@ -204,8 +212,18 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic ...@@ -204,8 +212,18 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
HashMap dateMap = new HashMap(); HashMap dateMap = new HashMap();
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
try try
{ {
sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM PICK_ORD_HDR WHERE PICK_ORDER BETWEEN ? AND ? "; //changed by sankara on 28/09/13 for getting unconfirmed repl_orders start.
//sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM PICK_ORD_HDR WHERE PICK_ORDER BETWEEN ? AND ? ";
if(pickreplStatus.trim().equalsIgnoreCase("P"))
{
sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM PICK_ORD_HDR WHERE PICK_ORDER BETWEEN ? AND ? ";
}
else
{
sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM REPL_ORD_HDR WHERE REPL_ORDER BETWEEN ? AND ? ";
}
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders end.
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, pickOrderFrom); pstmt.setString(1, pickOrderFrom);
pstmt.setString(2, pickOrderTo); pstmt.setString(2, pickOrderTo);
......
webitm-wms/ibase/webitm/ejb/wms/PickOrderPrc.java
View file @ 96dad157
...@@ -78,6 +78,11 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -78,6 +78,11 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
String orderDate = ""; String orderDate = "";
String errCode = ""; String errCode = "";
String errString = ""; String errString = "";
//changed by sankara on 28/09/13 for getting repl_order start.
String pickreplStatus = "";
String sql = "";
int count = 0;
//changed by sankara on 28/09/13 for getting repl_order end.
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
String getDataSql=null; String getDataSql=null;
String resultString = ""; String resultString = "";
...@@ -105,6 +110,10 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -105,6 +110,10 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
System.out.println("FROMDATE==="+fromDate); System.out.println("FROMDATE==="+fromDate);
toDate = checkNull(genericUtility.getColumnValue("to_date",headerDom)); toDate = checkNull(genericUtility.getColumnValue("to_date",headerDom));
System.out.println("TODATE==="+toDate); System.out.println("TODATE==="+toDate);
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders start.
pickreplStatus = checkNull(genericUtility.getColumnValue("status",headerDom));
System.out.println("PICKREPLSTATUS==="+pickreplStatus);
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders end.
System.out.println("headerDom:"+headerDom); System.out.println("headerDom:"+headerDom);
System.out.println("detailDom:"+detailDom); System.out.println("detailDom:"+detailDom);
System.out.println("windowName:"+windowName); System.out.println("windowName:"+windowName);
...@@ -119,7 +128,7 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -119,7 +128,7 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
fromDate = genericUtility.getValidDateString(fromDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); fromDate = genericUtility.getValidDateString(fromDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
System.out.println("FROMDATE==="+fromDate); System.out.println("FROMDATE==="+fromDate);
dateFr = java.sql.Timestamp.valueOf(fromDate + " 00:00:00"); dateFr = java.sql.Timestamp.valueOf(fromDate + " 00:00:00");
if ( toDate == null || toDate.trim().length() == 0 ) if ( toDate == null || toDate.trim().length() == 0 )
{ {
errCode = "VPTODADTBK"; errCode = "VPTODADTBK";
...@@ -138,16 +147,62 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -138,16 +147,62 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
errString = itmDBAccessEJB.getErrorString("","VPINVLDATE",userId); errString = itmDBAccessEJB.getErrorString("","VPINVLDATE",userId);
return errString; return errString;
} }
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders start.
if ( pickreplStatus == null || pickreplStatus.trim().length() == 0 )
{
System.out.println("PICKREPLSTATUS="+pickreplStatus);
errCode = "VPBLKSTAUS";
errString = itmDBAccessEJB.getErrorString("","VPBLKSTAUS",userId);
return errString;
}
else if(pickreplStatus != null || pickreplStatus.trim().length() != 0)
{
sql = " SELECT COUNT(*) FROM GENCODES WHERE FLD_NAME = 'STATUS' AND MOD_NAME = 'W_PICK_ASSIGNTO' AND FLD_VALUE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,pickreplStatus);
rs = pstmt.executeQuery();
if(rs.next())
{
count = rs.getInt(1);
}
if(count == 0)
{
errCode = "VPINVSTAUS";
errString = itmDBAccessEJB.getErrorString("","VPINVSTAUS",userId);
return errString;
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
/* getDataSql = " SELECT DISTINCT P.PICK_ORDER, P.SALE_ORDER, P.WAVE_ID, WD.PTCN, P.ASSIGN_TO, P.STATUS " +
" FROM PICK_ORD_HDR P, WAVE_TASK W, WAVE_TASK_DET WD, PICK_ISS_HDR PH, PICK_ORD_DET PT " +
" WHERE P.PICK_ORDER = WD.REF_ID AND P.PICK_ORDER = PT.PICK_ORDER AND P.WAVE_ID = W.WAVE_ID " +
// changed by sankara on 05-sep-13 for getting pick order start.
//"AND P.WAVE_ID = WD.WAVE_ID AND P.PICK_ORDER = PH.PICK_ORDER AND WD.STATUS = 'N' AND W.CANCEL = 'N' " +
// "AND PH.CONFIRMED = 'N' AND P.PICK_ORDER BETWEEN ? AND ? AND P.ORDER_DATE BETWEEN ? AND ? " ;
"AND P.WAVE_ID = WD.WAVE_ID AND WD.STATUS = 'N' AND W.CANCEL = 'N' " +
"AND ( PH.CONFIRMED = 'N' OR PH.PICK_ORDER IS NULL ) AND P.PICK_ORDER BETWEEN ? AND ? AND P.ORDER_DATE BETWEEN ? AND ? " ;
// changed by sankara on 05-sep-13 for getting pick order end. */
getDataSql = " SELECT DISTINCT P.PICK_ORDER, P.SALE_ORDER, P.WAVE_ID, WD.PTCN, P.ASSIGN_TO, P.STATUS " + if( pickreplStatus.trim().equalsIgnoreCase("P") )
" FROM PICK_ORD_HDR P, WAVE_TASK W, WAVE_TASK_DET WD, PICK_ISS_HDR PH, PICK_ORD_DET PT " + {
" WHERE P.PICK_ORDER = WD.REF_ID AND P.PICK_ORDER = PT.PICK_ORDER AND P.WAVE_ID = W.WAVE_ID " + getDataSql = " SELECT DISTINCT P.PICK_ORDER, P.SALE_ORDER, P.WAVE_ID, WD.PTCN, P.ASSIGN_TO, P.STATUS " +
//changed by sankara on 05-sep-13 for getting pick order start. " FROM PICK_ORD_HDR P, WAVE_TASK W, WAVE_TASK_DET WD, PICK_ISS_HDR PH, PICK_ORD_DET PT " +
// " AND P.WAVE_ID = WD.WAVE_ID AND P.PICK_ORDER = PH.PICK_ORDER AND WD.STATUS = 'N' AND W.CANCEL = 'N' " + " WHERE P.PICK_ORDER = WD.REF_ID AND P.PICK_ORDER = PT.PICK_ORDER AND P.WAVE_ID = W.WAVE_ID " +
// " AND PH.CONFIRMED = 'N' AND P.PICK_ORDER BETWEEN ? AND ? AND P.ORDER_DATE BETWEEN ? AND ? " ; " AND P.WAVE_ID = WD.WAVE_ID AND WD.STATUS = 'N' AND W.CANCEL = 'N' " +
" AND P.WAVE_ID = WD.WAVE_ID AND WD.STATUS = 'N' AND W.CANCEL = 'N' " + " AND ( PH.CONFIRMED = 'N' OR PH.PICK_ORDER IS NULL ) AND P.PICK_ORDER BETWEEN ? AND ? AND P.ORDER_DATE BETWEEN ? AND ? " ;
" AND ( PH.CONFIRMED = 'N' OR PH.PICK_ORDER IS NULL ) AND P.PICK_ORDER BETWEEN ? AND ? AND P.ORDER_DATE BETWEEN ? AND ? " ; }
//changed by sankara on 05-sep-13 for getting pick order end. else
{
getDataSql = " SELECT DISTINCT R.REPL_ORDER, R.SALE_ORDER, R.WAVE_ID, WD.PTCN, R.ASSIGN_TO, WD.WAVE_STATUS " +
" FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ISS_HDR RH, REPL_ORD_DET RT " +
" WHERE R.REPL_ORDER = WD.REF_ID AND R.REPL_ORDER = RT.REPL_ORDER AND R.WAVE_ID = W.WAVE_ID " +
" AND R.WAVE_ID = WD.WAVE_ID AND WD.STATUS = 'N' AND W.CANCEL = 'N' AND RT.CANCEL_MODE='N' " +
" AND ( RH.CONFIRMED = 'N' OR RH.REPL_ORDER IS NULL ) AND R.REPL_ORDER BETWEEN ? AND ? AND R.ORDER_DATE BETWEEN ? AND ? " ;
}
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders end.
System.out.println("**************getDataSql="+getDataSql); System.out.println("**************getDataSql="+getDataSql);
pstmt = conn.prepareStatement(getDataSql); pstmt = conn.prepareStatement(getDataSql);
pstmt.setString(1,pickOrderFrom); pstmt.setString(1,pickOrderFrom);
...@@ -173,6 +228,9 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -173,6 +228,9 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
valueXmlString.append( "<ptcn><![CDATA[" ).append(ptcn).append( "]]></ptcn>\r\n" ); valueXmlString.append( "<ptcn><![CDATA[" ).append(ptcn).append( "]]></ptcn>\r\n" );
valueXmlString.append( "<assign_to><![CDATA[" ).append(assingTo).append( "]]></assign_to>\r\n" ); valueXmlString.append( "<assign_to><![CDATA[" ).append(assingTo).append( "]]></assign_to>\r\n" );
valueXmlString.append( "<status><![CDATA[" ).append(status).append( "]]></status>\r\n" ); valueXmlString.append( "<status><![CDATA[" ).append(status).append( "]]></status>\r\n" );
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders start.
valueXmlString.append( "<pick_repl_status><![CDATA[" ).append(pickreplStatus).append( "]]></pick_repl_status>\r\n" );
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders end.
valueXmlString.append("\n"); valueXmlString.append("\n");
valueXmlString.append( "</Detail2>\r\n" ); valueXmlString.append( "</Detail2>\r\n" );
} }
...@@ -283,7 +341,8 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -283,7 +341,8 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
boolean isError = false; boolean isError = false;
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders.
String pickreplStatus = "";
try try
{ {
String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
...@@ -347,7 +406,7 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -347,7 +406,7 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
assignTo = (childNode.getFirstChild().getNodeValue()); assignTo = (childNode.getFirstChild().getNodeValue());
System.out.println("assignTo="+assignTo); System.out.println("assignTo="+assignTo);
} }
if( assignTo == null || assignTo.trim().length() == 0 ) if( assignTo.trim() == null || assignTo.trim().length() == 0 )
{ {
errString = itmDBAccessEJB.getErrorString("","VPBLKUSRCD",userId); errString = itmDBAccessEJB.getErrorString("","VPBLKUSRCD",userId);
return errString; return errString;
...@@ -391,10 +450,20 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -391,10 +450,20 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
status = checkNull(childNode.getFirstChild().getNodeValue()); status = checkNull(childNode.getFirstChild().getNodeValue());
} }
} }
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders start.
else if("pick_repl_status".equalsIgnoreCase(childNodeName))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
pickreplStatus = checkNull(childNode.getFirstChild().getNodeValue());
}
}
//changed by sankara on 28/09/13 for getting unconfirmed repl_orders end.
} }
System.out.println(" WAVEID=["+waveId+"] PTCN=["+ptcn+"] SALEORDER=["+saleOrder+"] PICKORDER=["+pickOrder+"] ASSIGNTO=["+assignTo+"] STATUS=["+status+"] "); System.out.println(" WAVEID=["+waveId+"] PTCN=["+ptcn+"] SALEORDER=["+saleOrder+"] PICKORDER=["+pickOrder+"] ASSIGNTO=["+assignTo+"] PICKREPLSTATUS=["+pickreplStatus+"] ");
//changed by sankara on 28/09/13 for getting unconfirmed pick orders
if ( pickOrder != null && pickOrder.trim().length() != 0 ) //if ( pickOrder != null && pickOrder.trim().length() != 0 )
if ( pickOrder != null && pickOrder.trim().length() != 0 && pickreplStatus.trim().equalsIgnoreCase("P"))
{ {
System.out.println("PICKORDER===="+pickOrder); System.out.println("PICKORDER===="+pickOrder);
updateSql= " UPDATE PICK_ORD_HDR SET ASSIGN_TO = ? WHERE PICK_ORDER = ? "; updateSql= " UPDATE PICK_ORD_HDR SET ASSIGN_TO = ? WHERE PICK_ORDER = ? ";
...@@ -404,8 +473,8 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -404,8 +473,8 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
count = pstmt.executeUpdate(); count = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
updateSql= " UPDATE PICK_ISS_HDR SET CHG_USER = ? WHERE PICK_ORDER = ? "; updateSql= " UPDATE PICK_ISS_HDR SET CHG_USER = ? WHERE PICK_ORDER = ? ";
pstmt = conn.prepareStatement(updateSql); pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1,assignTo); pstmt.setString(1,assignTo);
pstmt.setString(2,pickOrder); pstmt.setString(2,pickOrder);
...@@ -413,8 +482,29 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr ...@@ -413,8 +482,29 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
//changed by sankara on 28/09/13 for getting unconfirmed repl orders start.
if ( pickOrder != null && pickOrder.trim().length() != 0 && pickreplStatus.trim().equalsIgnoreCase("R"))
{
System.out.println("REPLORDER===="+pickOrder);
updateSql= " UPDATE REPL_ORD_HDR SET ASSIGN_TO = ? WHERE REPL_ORDER = ? ";
pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1,assignTo);
pstmt.setString(2,pickOrder);
pickIssCount = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
updateSql= " UPDATE REPL_ISS_HDR SET CHG_USER = ? WHERE REPL_ORDER = ? ";
pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1,assignTo);
pstmt.setString(2,pickOrder);
pickIssCount = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
}
//changed by sankara on 28/09/13 for getting unconfirmed repl orders end.
totalCount = pickIssCount+count; totalCount = pickIssCount+count;
} }
if( totalCount > 0 ) if( totalCount > 0 )
{ {
System.out.println("totalCount--->"+totalCount); System.out.println("totalCount--->"+totalCount);
......
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