Skip to content

B
business-java
Commit 03590648 authored by msingh's avatar msingh
Browse files
Options

Change by Manish for RVB2B on 21/10/16 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103775 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 740bf947
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 13 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ 03590648
...@@ -1097,12 +1097,50 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -1097,12 +1097,50 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
String apiKey = wmsUtil.getDDSalesConfig("API_KEY"); String apiKey = wmsUtil.getDDSalesConfig("API_KEY");
objShipment.setApiKey(apiKey); objShipment.setApiKey(apiKey);
//Changed by wasim on 14-08-2015 to get api Key for magento [END] //Changed by wasim on 14-08-2015 to get api Key for magento [END]
objShipment.setOrderID(saleOrderL);
objShipment.setStatus("complete"); //Change by Manish on 20/10/16 for RVB2B [Start]
objShipment.setTrackingNumbers(wmsUtil.getTrackingNo(ptcn, conn)); String apiShipUrlRvb2b = wmsUtil.getDDSalesConfig("SHIP_STATUS_URL_RVB2B");
objShipment.setComment("Sale Order Complete"); String login = wmsUtil.getDDSalesConfig("SHIP_STATUS_LOGIN");
wmsUtil.CallTrackShipStatus(objShipment, apiShipUrl); String Password = wmsUtil.getDDSalesConfig("SHIP_STATUS_PASSWORD");
System.out.println("status tracking update in magento END"); String orderType = "";
sql="SELECT ORDER_TYPE FROM SORDER WHERE SALE_ORDER = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrderL);
rs = pstmt.executeQuery();
if(rs.next())
{
orderType = checkNull(rs.getString(1));
}
if( rs != null)
{
rs.close();
rs = null;
}
if( pstmt != null)
{
pstmt.close();
pstmt = null;
}
if("R".equalsIgnoreCase(orderType))
{
objShipment.setOrderID(saleOrderL);
objShipment.setStatus("complete");
objShipment.setTrackingNumbers(wmsUtil.getTrackingNo(ptcn, conn));
objShipment.setComment("Sale Order Complete");
wmsUtil.CallTrackShipStatusRvb2b(objShipment, apiShipUrlRvb2b, login, Password);
System.out.println("status tracking update in RVB2B END");
}
//Change by Manish on 20/10/16 for RVB2B [end]
else
{
objShipment.setOrderID(saleOrderL);
objShipment.setStatus("complete");
objShipment.setTrackingNumbers(wmsUtil.getTrackingNo(ptcn, conn));
objShipment.setComment("Sale Order Complete");
wmsUtil.CallTrackShipStatus(objShipment, apiShipUrl);
System.out.println("status tracking update in magento END");
}
//Changed by Manish on 01/04/2016 for status tracking update in magento system after despatch confirm.[end] //Changed by Manish on 01/04/2016 for status tracking update in magento system after despatch confirm.[end]
//Changed by Manish on [12/05/15] start //Changed by Manish on [12/05/15] start
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 03590648
...@@ -5163,18 +5163,40 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -5163,18 +5163,40 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
objShipment.setApiKey(apiKey); objShipment.setApiKey(apiKey);
//Changed by wasim on 14-08-2015 to set apiKey for magento [END] //Changed by wasim on 14-08-2015 to set apiKey for magento [END]
String trackingNo = ""; String trackingNo = "";
sql="SELECT distinct sale_order,ptcn FROM WAVE_TASK_DET WHERE wave_id = ?";
//Change by Manish on 20/10/16 for RVB2B [Start]
String apiShipUrlRvb2b = wmsUtil.getDDSalesConfig("SHIP_STATUS_URL_RVB2B");
String orderType = "";
String login = wmsUtil.getDDSalesConfig("SHIP_STATUS_LOGIN");
String Password = wmsUtil.getDDSalesConfig("SHIP_STATUS_PASSWORD");
//sql="SELECT distinct sale_order,ptcn FROM WAVE_TASK_DET WHERE wave_id = ?";
sql="SELECT DISTINCT W.SALE_ORDER,W.PTCN,S.ORDER_TYPE FROM WAVE_TASK_DET W, SORDER S WHERE W.SALE_ORDER = S.SALE_ORDER AND W.WAVE_ID = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, waveId); pstmt.setString(1, waveId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
objShipment.setOrderID(rs.getString(1)); orderType = checkNull(rs.getString(3));
trackingNo= wmsUtil.getTrackingNo(rs.getString(2),conn); if("R".equalsIgnoreCase(orderType))
objShipment.setStatus("processing"); {
objShipment.setTrackingNumbers(trackingNo); objShipment.setOrderID(rs.getString(1));
objShipment.setComment("Wave genaration done"); trackingNo= wmsUtil.getTrackingNo(rs.getString(2),conn);
wmsUtil.CallTrackShipStatus(objShipment, apiShipUrl); objShipment.setStatus("processing");
objShipment.setTrackingNumbers(trackingNo);
objShipment.setComment("Wave genaration done");
wmsUtil.CallTrackShipStatusRvb2b(objShipment, apiShipUrlRvb2b, login, Password);
}
//Change by Manish on 20/10/16 for RVB2B [end]
else
{
objShipment.setOrderID(rs.getString(1));
trackingNo= wmsUtil.getTrackingNo(rs.getString(2),conn);
objShipment.setStatus("processing");
objShipment.setTrackingNumbers(trackingNo);
objShipment.setComment("Wave genaration done");
wmsUtil.CallTrackShipStatus(objShipment, apiShipUrl);
}
} }
if( rs != null) if( rs != 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