Skip to content

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

changed by sankara on 26/06/14 updated DeallocArtConf,ShipmentOCnf,ShipmentIC and messages sql 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95317 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fb03b242
Hide whitespace changes
Inline Side-by-side
Showing with 560 additions and 92 deletions
webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java
View file @ f9209a22
...@@ -13,7 +13,6 @@ import ibase.webitm.ejb.fin.*; ...@@ -13,7 +13,6 @@ import ibase.webitm.ejb.fin.*;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.util.*; import java.util.*;
import java.util.Date;
import java.text.*; import java.text.*;
import java.sql.*; import java.sql.*;
...@@ -2357,6 +2356,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -2357,6 +2356,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
{ {
if( "DSO".equalsIgnoreCase(invStat) ) if( "DSO".equalsIgnoreCase(invStat) )
{ {
boolean isParentUpd = false;
sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y',ACTUAL_QTY = 0 WHERE REPL_ORDER = ? AND LINE_NO = ? "; sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y',ACTUAL_QTY = 0 WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, parentReplOrder); pstmt.setString(1, parentReplOrder);
...@@ -2364,6 +2364,17 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -2364,6 +2364,17 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
if ( pstmt.executeUpdate() > 0 ) if ( pstmt.executeUpdate() > 0 )
{ {
System.out.println(" REPL_ORD_DET updated succesfully "); System.out.println(" REPL_ORD_DET updated succesfully ");
//changed by sankara on 26/06/14 update cancel mode in repl_ord_det start.
sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, parentReplOrder);
pstmt.setInt(2, parentReplOrdLine);
int replpickcount = pstmt.executeUpdate();
if( replpickcount > 0 )
{
System.out.println("replpickcount["+replpickcount+"]");
}
//changed by sankara on 26/06/14 update cancel mode in repl_ord_det end.
} }
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
//changed by sankara on 20/06/14 update status in wave_task_det start. //changed by sankara on 20/06/14 update status in wave_task_det start.
...@@ -2388,6 +2399,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -2388,6 +2399,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
pstmt.setString(1, parentReplOrder); pstmt.setString(1, parentReplOrder);
if ( pstmt.executeUpdate() > 0 ) if ( pstmt.executeUpdate() > 0 )
{ {
isParentUpd = true;
System.out.println(" WAVE_TASK_DET updated succesfully "); System.out.println(" WAVE_TASK_DET updated succesfully ");
} }
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
...@@ -2395,10 +2407,23 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -2395,10 +2407,23 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//changed by sankara on 20/06/14 update status in wave_task_det end. //changed by sankara on 20/06/14 update status in wave_task_det end.
//changed by sankara on 03/05/14 update cancel_mode for parent repl order only //changed by sankara on 03/05/14 update cancel_mode for parent repl order only
//sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? "; //sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? ";
sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL "; //changed by sankara on 26/06/14 update status in wave_task_det start.
//sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
if(isParentUpd)
{
sql = " UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? ";
}
else
{
sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
}
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currentReplOrder); pstmt.setString(1, currentReplOrder);
pstmt.setInt(2, replOrderLine); //pstmt.setInt(2, replOrderLine);
if(!isParentUpd)
{
pstmt.setInt(2, replOrderLine);
}
if ( pstmt.executeUpdate() > 0 ) if ( pstmt.executeUpdate() > 0 )
{ {
System.out.println(" REPL_ORD_DET updated succesfully "); System.out.println(" REPL_ORD_DET updated succesfully ");
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentConf.java
View file @ f9209a22
...@@ -169,6 +169,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -169,6 +169,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
//changed by sankara on 08/01/14 for update lr_date in despatch. //changed by sankara on 08/01/14 for update lr_date in despatch.
String ledgPostConf = ""; String ledgPostConf = "";
String chgDateonConf = ""; String chgDateonConf = "";
int pronumCount = 0;
try try
{ {
conn = connDriver.getConnectDB( "DriverITM" ); conn = connDriver.getConnectDB( "DriverITM" );
...@@ -963,60 +964,39 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -963,60 +964,39 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
} }
} }
//chamged by sankara on 26/06/14 for pro number start.
if( updateShipment(tranId , conn, xtraParam) > 0) /*if( updateShipment(tranId , conn, xtraParam) > 0)
{ {
System.out.println(" update sucessfully mannual shipment"); System.out.println(" update sucessfully mannual shipment");
}*/
if(isCountSameForManulShip(tranId, conn))
{
if( updateShipment(tranId , conn, xtraParam) > 0)
{
System.out.println(" update sucessfully mannual shipment");
}
pronumCount = duplicateProNumber(tranId , conn);
if( pronumCount > 0 )
{
errString = itmDBAccessLocal.getErrorString("","VTINVPRONO","");
return errString;
}
sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ?, LR_DATE = ? WHERE SHIPMENT_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "Y");
pstmt.setDate(2, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setDate(3, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4, tranId);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
} }
//chamged by sankara on 26/06/14 for pro number end.
} }
//changed by sankara on 08/01/14 for update lr_date in shipment header
//sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ? WHERE SHIPMENT_ID = ?";
sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ?, LR_DATE = ? WHERE SHIPMENT_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "Y");
//changed by sankara on 08/01/14 for update lr_date in shipment start.
/*pstmt.setDate(2, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(3, tranId);*/
pstmt.setDate(2, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setDate(3, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4, tranId);
//changed by sankara on 08/01/14 for update lr_date in shipment end.
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
//conn.commit();
//changed by sankara on 08/01/14 for update shipment_date in shipment header based on transetup start.
sql = " SELECT LEDG_POST_CONF, CHG_DATE_ON_CONF FROM TRANSETUP WHERE TRAN_WINDOW = 'w_shipment' ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if( rs.next() )
{
ledgPostConf = checkNull( rs.getString("LEDG_POST_CONF") );
chgDateonConf = checkNull( rs.getString("CHG_DATE_ON_CONF") );
}
if("Y".equalsIgnoreCase(ledgPostConf) && "Y".equalsIgnoreCase(chgDateonConf) )
{
sql = " UPDATE SHIPMENT SET SHIPMENT_DATE = ? WHERE SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDate(1, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(2, tranId);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
}
if( rs != null)
{
rs.close();
rs = null;
}
if( pstmt != null)
{
pstmt.close();
pstmt = null;
}
//changed by sankara on 08/01/14 for update shipment_date in shipment header based on transetup end.
if(isAllDespConfirmed) if(isAllDespConfirmed)
{ {
if( updateShipment(tranId , conn, xtraParam) > 0) if( updateShipment(tranId , conn, xtraParam) > 0)
...@@ -1128,53 +1108,77 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -1128,53 +1108,77 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmtSord.close(); pstmtSord.close();
pstmtSord = null; pstmtSord = null;
} }
//chamged by sankara on 26/06/14 for pro number start.
} pronumCount = duplicateProNumber(tranId , conn);
/* //changed by sankara on 16/06/14 duplicate pro number validation start. if( pronumCount > 0 )
String proNumber = ""; {
sql = " SELECT PRO_NO FROM SHIPMENT WHERE SHIPMENT_ID = ? "; errString = itmDBAccessLocal.getErrorString("","VTINVPRONO","");
return errString;
}
//changed by sankara on 08/01/14 for update lr_date in shipment header
//sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ? WHERE SHIPMENT_ID = ?";
sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ?, LR_DATE = ? WHERE SHIPMENT_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "Y");
//changed by sankara on 08/01/14 for update lr_date in shipment start.
/*pstmt.setDate(2, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(3, tranId);*/
pstmt.setDate(2, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setDate(3, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4, tranId);
//changed by sankara on 08/01/14 for update lr_date in shipment end.
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
//conn.commit();
}
//changed by sankara on 08/01/14 for update shipment_date in shipment header based on transetup start.
sql = " SELECT LEDG_POST_CONF, CHG_DATE_ON_CONF FROM TRANSETUP WHERE TRAN_WINDOW = 'w_shipment' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if( rs.next() ) if( rs.next() )
{ {
proNumber = checkNull( rs.getString("PRO_NO")); ledgPostConf = checkNull( rs.getString("LEDG_POST_CONF") );
System.out.println("proNumber::::::"+proNumber); chgDateonConf = checkNull( rs.getString("CHG_DATE_ON_CONF") );
} }
pstmt.close(); if("Y".equalsIgnoreCase(ledgPostConf) && "Y".equalsIgnoreCase(chgDateonConf) )
pstmt = null;
rs.close();
rs = null;
if( proNumber != null && proNumber.trim().length() > 0 )
{ {
System.out.println("proNumber1::::::"+proNumber); sql = " UPDATE SHIPMENT SET SHIPMENT_DATE = ? WHERE SHIPMENT_ID = ? ";
sql = " SELECT COUNT(*) AS COUNT FROM SHIPMENT WHERE PRO_NO = ? AND SHIPMENT_ID <> ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, proNumber); pstmt.setDate(1, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(2, tranId); pstmt.setString(2, tranId);
rs = pstmt.executeQuery(); pstmt.executeUpdate();
if( rs.next() )
{
count = rs.getInt("COUNT");
System.out.println("count::::::"+count);
}
if(count > 0)
{
errString = itmDBAccessLocal.getErrorString("","VTINVPRONO","");
return errString;
}
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
}
if( rs != null)
{
rs.close(); rs.close();
rs = null; rs = null;
} }
//changed by sankara on 16/06/14 duplicate pro number validation end. */ if( pstmt != null)
{
pstmt.close();
pstmt = null;
}
//changed by sankara on 08/01/14 for update shipment_date in shipment header based on transetup end.
if(conn != null) if(conn != null)
{ {
conn.commit(); conn.commit();
} }
errString = itmDBAccessLocal.getErrorString("","VTCONFIRM",""); //changed by sankara on 26/06/14 for consumption issue start.
//errString = itmDBAccessLocal.getErrorString("","VTCONFIRM","");
System.out.println("coming confirm error message::::::"+errString);
if(isAllDespConfirmed || isCountSameForManulShip(tranId, conn) )
{
errString = itmDBAccessLocal.getErrorString("","VTCONFIRM","");
}
else
{
errString = itmDBAccessLocal.getErrorString("","VTUNCNFIRM","");
}
//changed by sankara on 26/06/14 for consumption issue end.
} }
} }
} }
...@@ -3064,6 +3068,15 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -3064,6 +3068,15 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
//Changed by shankra on 16/08/13 //Changed by shankra on 16/08/13
pstmt1.executeUpdate(); pstmt1.executeUpdate();
} }
//changed by sankara on 24/06/14 for update ship_docs in manual ship case start.
else
{
pstmt1.setString(1, "Y");
pstmt1.setString(2, "");
pstmt1.setString(3, refId);
pstmt1.executeUpdate();
}
//changed by sankara on 24/06/14 for update ship_docs in manual ship case end.
} }
//Changed by shankra on 16/08/13 //Changed by shankra on 16/08/13
//pstmt1.executeUpdate(); //pstmt1.executeUpdate();
...@@ -3586,5 +3599,132 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -3586,5 +3599,132 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
} }
return despcount; return despcount;
} }
//changed by sankara on 08/01/14 for update lr_date in despatch end. //changed by sankara on 08/01/14 for update lr_date in despatch end.
//changed by sankara on 26/06/14 for duplicate pro number and manual shipment start.
private int duplicateProNumber (String tranId, Connection conn) throws ITMException
{
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
String proNumber = "";
int pronumCount = 0;
try
{
sql = " SELECT PRO_NO FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if( rs.next() )
{
proNumber = checkNull( rs.getString("PRO_NO"));
System.out.println("proNumber::::::"+proNumber);
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if( proNumber != null && proNumber.trim().length() > 0 )
{
System.out.println("proNumber1::::::"+proNumber);
sql = " SELECT COUNT(*) AS COUNT FROM SHIPMENT WHERE PRO_NO = ? AND SHIPMENT_ID <> ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, proNumber);
pstmt.setString(2, tranId);
rs = pstmt.executeQuery();
if( rs.next() )
{
pronumCount = rs.getInt("COUNT");
System.out.println("pronumCount::::::"+pronumCount);
}
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
}
catch (Exception e)
{
throw new ITMException(e);
}
finally
{
try
{
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch (Exception e2)
{
throw new ITMException(e2);
}
}
return pronumCount;
}
private boolean isCountSameForManulShip(String shipId, Connection conn) throws ITMException
{
String sql = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
int count = 0, count1 = 0;
boolean isSame = false;
try
{
sql = " SELECT COUNT(*) AS COUNT FROM SHIP_DOCS WHERE SHIPMENT_ID = ? AND DESP_CONFIRMED = 'N'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, shipId);
rs = pstmt.executeQuery();
if( rs.next())
{
count = rs.getInt("COUNT");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
if (count > 0)
{
isSame = false;
}
else
{
isSame = true;
}
System.out.println(" isSame ->["+isSame+"]");
}
catch (Exception e)
{
throw new ITMException(e);
}
finally
{
try {
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
} catch (Exception e2)
{
throw new ITMException(e2);
}
}
return isSame;
}
//changed by sankara on 26/06/14 for duplicate pro number and manual shipment end.
} }
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ f9209a22
...@@ -1314,7 +1314,7 @@ public String itemChanged(String xmlString, String xmlString1, String xmlString2 ...@@ -1314,7 +1314,7 @@ public String itemChanged(String xmlString, String xmlString1, String xmlString2
} }
public String itemChanged( Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams ) throws RemoteException,ITMException public String itemChanged( Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams ) throws RemoteException,ITMException
{ {
ResultSet rs = null; ResultSet rs = null, rs1 = null;;
String sql = ""; String sql = "";
String columnValue = ""; String columnValue = "";
String columnValue1 = ""; String columnValue1 = "";
...@@ -1364,7 +1364,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -1364,7 +1364,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
int ctr = 0; int ctr = 0;
String tranCode="",tranName="", sProno = ""; String tranCode="",tranName="", sProno = "";
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null, pstmt1 = null;
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy"); SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy");
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
int currentFormNo = 0; int currentFormNo = 0;
...@@ -1958,8 +1958,8 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -1958,8 +1958,8 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
valueXmlString.append(reStr); valueXmlString.append(reStr);
*/ */
} }
//changed by sankara on 26/06/14 for transporter code in shipment detail start.
else if( currentColumn.trim().equalsIgnoreCase( "ptcn" ) ) /* else if( currentColumn.trim().equalsIgnoreCase( "ptcn" ) )
{ {
columnValue = genericUtility.getColumnValue("ptcn",dom); columnValue = genericUtility.getColumnValue("ptcn",dom);
columnValue1 = genericUtility.getColumnValue("ref_id",dom); columnValue1 = genericUtility.getColumnValue("ref_id",dom);
...@@ -2054,7 +2054,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -2054,7 +2054,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
pronoLast = Long.parseLong(descr1) + 1; pronoLast = Long.parseLong(descr1) + 1;
} }
//Changed by sumit on 10/11/12 commented this as this logic is now written in shipmentconf start. //Changed by sumit on 10/11/12 commented this as this logic is now written in shipmentconf start.
/*if(pronoLast != 0) if(pronoLast != 0)
{ {
// 18/09/12 manoharan get from database function // 18/09/12 manoharan get from database function
System.out.println("@@@@@ prefix["+prefix+"]::::pronoLast["+pronoLast+"]"); System.out.println("@@@@@ prefix["+prefix+"]::::pronoLast["+pronoLast+"]");
...@@ -2076,7 +2076,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -2076,7 +2076,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("manohar after sprono ["+sProno+"]"); System.out.println("manohar after sprono ["+sProno+"]");
}*/ }
//Changed by sumit on 10/11/12 commented this as this logic is now written in shipmentconf start. //Changed by sumit on 10/11/12 commented this as this logic is now written in shipmentconf start.
if(tranCodeHdr != null && tranCodeHdr.trim().length() > 0 ) if(tranCodeHdr != null && tranCodeHdr.trim().length() > 0 )
{ {
...@@ -2121,7 +2121,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -2121,7 +2121,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
//valueXmlString.append( "<pro_no><![CDATA[" ).append(sProno).append( "]]></pro_no>\r\n" ); //valueXmlString.append( "<pro_no><![CDATA[" ).append(sProno).append( "]]></pro_no>\r\n" );
lrNo = genericUtility.getColumnValue("lr_no",dom1); lrNo = genericUtility.getColumnValue("lr_no",dom1);
//Changed by sumit on 10/11/12 this code copied to ShipmentConf, commented from here (as per manoharan sir) start //Changed by sumit on 10/11/12 this code copied to ShipmentConf, commented from here (as per manoharan sir) start
/*if (lrNo == null || lrNo.trim().length() == 0) if (lrNo == null || lrNo.trim().length() == 0)
{ {
sProno = getLrNo(xtraParams,conn); sProno = getLrNo(xtraParams,conn);
System.out.println("manohar before lr_no ["+sProno+"]"); System.out.println("manohar before lr_no ["+sProno+"]");
...@@ -2140,7 +2140,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -2140,7 +2140,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
pstmt = null; pstmt = null;
System.out.println("manohar after lr_no ["+sProno+"]"); System.out.println("manohar after lr_no ["+sProno+"]");
valueXmlString.append( "<lr_no><![CDATA[" ).append( sProno ).append( "]]></lr_no>\r\n" ); valueXmlString.append( "<lr_no><![CDATA[" ).append( sProno ).append( "]]></lr_no>\r\n" );
}*/ }
//Changed by sumit on 10/11/12 this code copied to ShipmentConf, commented from here (as per manoharan sir) end //Changed by sumit on 10/11/12 this code copied to ShipmentConf, commented from here (as per manoharan sir) end
//valueXmlString.append( "<lr_no><![CDATA[" ).append( getLrNo(xtraParams,conn) ).append( "]]></lr_no>\r\n" ); //valueXmlString.append( "<lr_no><![CDATA[" ).append( getLrNo(xtraParams,conn) ).append( "]]></lr_no>\r\n" );
valueXmlString.append( "</Detail1>\r\n" ); valueXmlString.append( "</Detail1>\r\n" );
...@@ -2169,8 +2169,253 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob ...@@ -2169,8 +2169,253 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
pstmt = null; pstmt = null;
valueXmlString.append( "<freight_amt_add><![CDATA[" ).append(freightamount).append( "]]></freight_amt_add>\r\n" ); valueXmlString.append( "<freight_amt_add><![CDATA[" ).append(freightamount).append( "]]></freight_amt_add>\r\n" );
//changed by sankara on 03/01/14 display despatch freight_amt_add in ship_docs end. //changed by sankara on 03/01/14 display despatch freight_amt_add in ship_docs end.
}*/
else if( currentColumn.trim().equalsIgnoreCase( "ptcn" ) )
{
columnValue = genericUtility.getColumnValue("ptcn",dom);
columnValue1 = genericUtility.getColumnValue("ref_id",dom);
if(columnValue != null && columnValue.trim().length() > 0 )
{
sql = "select REF_ID from wave_task_det where ptcn = ? AND REF_SER = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, columnValue);
pstmt1.setString(2, "S-DSP");
rs1 = pstmt1.executeQuery();
if( rs1.next() )
{
valueXmlString.append( "<ref_id><![CDATA[" ).append( checkNull( rs1.getString(1)) ).append( "]]></ref_id>\r\n" );
/*}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
// added by cpatil on 8-sept-12 start
System.out.println("@@@@@ cpatil test");
//Changed by sumit on 25/01/13 removed confirmed from sql.
//sql = "SELECT D.TRAN_CODE FROM WAVE_TASK_DET W, DESPATCH D WHERE REF_ID = D.DESP_ID AND D.CONFIRMED != 'Y' and W.PTCN= ? ";
sql = "SELECT D.TRAN_CODE FROM WAVE_TASK_DET W, DESPATCH D WHERE REF_ID = D.DESP_ID and W.PTCN= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if( rs.next() )
{
tranCode = rs.getString("tran_code");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(tranCode != null && tranCode.trim().length() >0)
{
valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
sql = "SELECT tran_name, PRONO_LAST , PRONO_FROM, PREFIX,tran_name FROM transporter WHERE tran_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
descr = rs.getString(1);
descr1 = rs.getString(2);
prefix = rs.getString(4);
if(descr1 == null || descr1.trim().length() == 0)
{
descr1 = checkNull(rs.getString(3));
}
tranName=rs.getString(5);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(descr1.trim().length() > 0)
{
pronoLast = Long.parseLong(descr1) + 1;
}
// 18/09/12 manoharan
sql = "SELECT tran_name, PRONO_LAST , PRONO_FROM, PREFIX,tran_name FROM transporter WHERE tran_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranCode);
rs = pstmt.executeQuery();
if( rs.next() )
{
descr = rs.getString(1);
descr1 = rs.getString(2);
prefix = rs.getString(4);
if(descr1 == null || descr1.trim().length() == 0)
{
descr1 = checkNull(rs.getString(3));
}
tranName=rs.getString(5);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
// start tran_code check for previous
// changed by sankara on 08/08/13 already declared as string....
// String tranCodeHdr = genericUtility.getColumnValue("tran_code", dom1);
tranCodeHdr = genericUtility.getColumnValue("tran_code", dom1);
// end tran code check for previous
System.out.println("Header tran_code:"+tranCodeHdr);
if(descr1.trim().length() > 0)
{
pronoLast = Long.parseLong(descr1) + 1;
}
//Changed by sumit on 10/11/12 commented this as this logic is now written in shipmentconf start.
/*if(pronoLast != 0)
{
// 18/09/12 manoharan get from database function
System.out.println("@@@@@ prefix["+prefix+"]::::pronoLast["+pronoLast+"]");
System.out.println("@@@@@ tranCodeHdr["+tranCodeHdr+"]::::tranCode["+tranCode+"]");
sProno = ("" + pronoLast).trim();
System.out.println("manohar before sprono ["+sProno+"]");
sql = "SELECT fn_prono(?,to_char(?)) FROM dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranCode);
pstmt.setString(2, sProno);
rs = pstmt.executeQuery();
if( rs.next() )
{
sProno = checkNull(rs.getString(1));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("manohar after sprono ["+sProno+"]");
}*/
//Changed by sumit on 10/11/12 commented this as this logic is now written in shipmentconf start.
System.out.println("tested shipment.......");
if(tranCodeHdr != null && tranCodeHdr.trim().length() > 0 )
{
if( tranCodeHdr.equalsIgnoreCase(tranCode))
{
System.out.println("18/06/14 checked in if");
//valueXmlString.append( "<Detail1>\r\n" );
//valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
//valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
//valueXmlString.append( "<pro_no><![CDATA[" ).append( getSSCC(prefix, pronoLast, conn) ).append( "]]></pro_no>\r\n" );
//valueXmlString.append( "<lr_no><![CDATA[" ).append( getLrNo(prefix,pronoLast,xtraParams,conn) ).append( "]]></lr_no>\r\n" );
//valueXmlString.append( "</Detail1>\r\n" );
//valueXmlString.append( "<Detail2>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
//valueXmlString.append( "</Detail2>\r\n" );
}
else
{
System.out.println("18/06/14 checked in else");
System.out.println("@@@@@ tran_code of detail is different from header tran_code");
valueXmlString.append( "</Detail2>\r\n" );
valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
valueXmlString.append( "</Detail1>\r\n" );
valueXmlString.append( "<Detail2>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
//valueXmlString.append( "</Detail2>\r\n" );
}
}
else
{
valueXmlString.append( "</Detail2>\r\n" );
valueXmlString.append( "<Detail1>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
//valueXmlString.append( "<pro_no><![CDATA[" ).append( getSSCC(prefix, pronoLast, conn) ).append( "]]></pro_no>\r\n" );
//valueXmlString.append( "<lr_no><![CDATA[" ).append( getLrNo(prefix,pronoLast,xtraParams,conn) ).append( "]]></lr_no>\r\n" );
//Changed by sumit on 10/11/12 commented this as pro number will update from shipment confirmation.
//valueXmlString.append( "<pro_no><![CDATA[" ).append(sProno).append( "]]></pro_no>\r\n" );
lrNo = genericUtility.getColumnValue("lr_no",dom1);
//Changed by sumit on 10/11/12 this code copied to ShipmentConf, commented from here (as per manoharan sir) start
/*if (lrNo == null || lrNo.trim().length() == 0)
{
sProno = getLrNo(xtraParams,conn);
System.out.println("manohar before lr_no ["+sProno+"]");
sql = "SELECT fn_prono(?,to_char(?)) FROM dual";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranCode);
pstmt.setString(2, sProno);
rs = pstmt.executeQuery();
if( rs.next() )
{
sProno = checkNull(rs.getString(1));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("manohar after lr_no ["+sProno+"]");
valueXmlString.append( "<lr_no><![CDATA[" ).append( sProno ).append( "]]></lr_no>\r\n" );
}*/
//Changed by sumit on 10/11/12 this code copied to ShipmentConf, commented from here (as per manoharan sir) end
//valueXmlString.append( "<lr_no><![CDATA[" ).append( getLrNo(xtraParams,conn) ).append( "]]></lr_no>\r\n" );
valueXmlString.append( "</Detail1>\r\n" );
valueXmlString.append( "<Detail2>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( checkNull(tranCode) ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( checkNull( tranName) ).append( "]]></transporter_tran_name>\r\n" );
//valueXmlString.append( "</Detail2>\r\n" );
}
} //if(tranCode != null && tranCode.trim().length() >0)
else
{
valueXmlString.append( "<ref_id><![CDATA[" ).append( "" ).append( "]]></ref_id>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( "" ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( "").append( "]]></transporter_tran_name>\r\n" );
}
} //if( rs.next() )
else
{
valueXmlString.append( "<ref_id><![CDATA[" ).append( "" ).append( "]]></ref_id>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( "" ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( "").append( "]]></transporter_tran_name>\r\n" );
}//else
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
//}
// added by cpatil on 8-sept-12 end
//valueXmlString.append( "<Detail2>\r\n" );
}
else
{
valueXmlString.append( "<ref_id><![CDATA[" ).append( "" ).append( "]]></ref_id>\r\n" );
valueXmlString.append( "<tran_code><![CDATA[" ).append( "" ).append( "]]></tran_code>\r\n" );
valueXmlString.append( "<transporter_tran_name><![CDATA[" ).append( "").append( "]]></transporter_tran_name>\r\n" );
}
valueXmlString.append( "<ref_ser><![CDATA[S-DSP]]></ref_ser>\r\n" );
//changed by sankara on 03/01/14 display despatch freight_amt_add in ship_docs start.
sql = " SELECT FREIGHT_AMT_ADD FROM DESPATCH WHERE PTCN = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if( rs.next() )
{
freightamount = checkNull(rs.getString("FREIGHT_AMT_ADD"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append( "<freight_amt_add><![CDATA[" ).append(freightamount).append( "]]></freight_amt_add>\r\n" );
//changed by sankara on 03/01/14 display despatch freight_amt_add in ship_docs end.
} }
//changed by sankara on 26/06/14 for transporter code in shipment detail end.
else if( currentColumn.trim().equalsIgnoreCase( "curr_code" ) ) else if( currentColumn.trim().equalsIgnoreCase( "curr_code" ) )
{ {
columnValue = genericUtility.getColumnValue("curr_code",dom); columnValue = genericUtility.getColumnValue("curr_code",dom);
......
webitm-wms/module-resource/sql/update.sql
View file @ f9209a22
...@@ -45723,6 +45723,64 @@ BEGIN ...@@ -45723,6 +45723,64 @@ BEGIN
RETURN DEALLOCATED; RETURN DEALLOCATED;
END; END;
/ /
--changed by sankara on 26/06/14 updated messages sql
INSERT INTO messages (
msg_no ,
msg_str ,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'VTUNCNFIRM',
'Transaction not confirmed',
'Transaction not confirmed ',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
INSERT INTO messages (
msg_no,
msg_str ,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'VTINVPRONO',
'Duplicate Pro Number',
'The Pro Number already used for another shipment Transaction.',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base',
'Base',
NULL,
NULL);
commit;
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