Skip to content

B
business-java
Commit e991f217 authored by ppatro's avatar ppatro
Browse files
Options

changed by sankara on 09/01/14 update lr_date in shipment header and despatch... 

changed by sankara on 09/01/14 update lr_date in shipment header and despatch ans source given by pragyan


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94105 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e3d5eeec
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 12 deletions
webitm-wms/ibase/webitm/ejb/wms/MasterPackIC.java
View file @ e991f217
......@@ -336,7 +336,27 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
rs = null;
pstmt.close();
pstmt = null;
//Changed by Pragyan on 08/01/14 adding validation in case of label not reprinted. start.
String printStatus = "";
sql = "SELECT PRINT_STATUS FROM WAVE_STATUS_ORG WHERE PTCN = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, ptcn );
rs = pstmt.executeQuery();
while( rs.next() )
{
printStatus = rs.getString("PRINT_STATUS");
//if("N".equalsIgnoreCase(printStatus))
if("N".equalsIgnoreCase(printStatus))
{
errList.add( "INVPRINTST" );
errFields.add( childNodeName.toLowerCase() );
}
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
//Changed by sumit on 08/01/1 adding validation in case of label not reprinted. end.
//Added by gulzar on 01/12/11
/*sql = "SELECT COUNT(*) AS COUNT FROM PACK_HDR WHERE TRAN_ID = ? AND CONFIRMED = 'Y' ";
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentConf.java
View file @ e991f217
......@@ -165,6 +165,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
//changed by sankara on 03/01/14 for update pro_no
String tranProNofrom = "";
String tranProNoto = "";
//changed by sankara on 08/01/14 for update lr_date in despatch.
String ledgPostConf = "";
String chgDateonConf = "";
try
{
conn = connDriver.getConnectDB( "DriverITM" );
......@@ -389,7 +392,13 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
refId = rs.getString(1);
refSerNew = checkNull(rs.getString("REF_SER"));
System.out.println("ref_id " +refId+" refSer: ["+refSerNew.trim()+"]");
//changed by sankara on 08/01/14 update lr_date in despatch start.
int despcount = updateDespatch (refId);
if( despcount > 0 )
{
System.out.println("lr date updated in despatch sucessfully");
}
//changed by sankara on 08/01/14 update lr_date in despatch end.
if(refId != null && refId.trim().length() > 0)
{
errString = confirmShipment( objName, refId.trim(), xtraParam, forcedFlag, conn);
......@@ -932,17 +941,53 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
}
}
sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ? WHERE SHIPMENT_ID = ?";
//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.setString(3, tranId);
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( updateShipment(tranId , conn, xtraParam) > 0)
......@@ -968,16 +1013,22 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmt = null;
sql = "UPDATE DESPATCH SET LORRY_NO = ?, SHIPMENT_ID = ?, TRAN_CODE = ?,"
+ " LR_NO = ?, LR_DATE = ?, PRO_NO = ? WHERE "
//changed by sankara on 08/01/14 for update lr_date in despatch
//+ " LR_NO = ?, LR_DATE = ?, PRO_NO = ? WHERE "
+ " LR_NO = ?, PRO_NO = ? WHERE "
+ " DESP_ID IN (SELECT REF_ID FROM SHIP_DOCS WHERE SHIPMENT_ID = ?)";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, lorryNo);
pstmt1.setString(2, tranId);
pstmt1.setString(3, tranCode);
pstmt1.setString(4, lrNo);
pstmt1.setTimestamp(5, lrDate);
//changed by sankara on 08/01/14 for update lr_date in despatch start.
/*pstmt1.setTimestamp(5, lrDate);
pstmt1.setString(6, proNo);
pstmt1.setString(7, tranId);
pstmt1.setString(7, tranId);*/
pstmt1.setString(5, proNo);
pstmt1.setString(6, tranId);
//changed by sankara on 08/01/14 for update lr_date in despatch end.
pstmt1.executeUpdate();
pstmt1.close();
pstmt1 = null;
......@@ -3306,5 +3357,74 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
return lrNo;
}
//changed by sankara on 08/01/14 for update lr_date in despatch start.
private int updateDespatch (String refId) throws ITMException
{
String sql = "";
PreparedStatement pstmt1 = null;
int despcount = 0;
Connection con = null;
ConnDriver conDriver = null;
try
{
conDriver = new ConnDriver();
con = conDriver.getConnectDB("DriverITM");
conDriver = null;
if(refId != null && refId.trim().length() > 0 )
{
System.out.println("sankara in despatc2");
sql = " UPDATE DESPATCH SET LR_DATE = ? WHERE DESP_ID = ? ";
pstmt1 = con.prepareStatement(sql);
pstmt1.setDate(1, new java.sql.Date(new java.util.Date().getTime()));
pstmt1.setString(2, refId);
despcount = pstmt1.executeUpdate();
if(despcount > 0)
{
System.out.println("despcount:::::"+despcount);
System.out.println("update lr date in despatch");
}
}
if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
con.commit();
}
catch( Exception e)
{
try
{
con.rollback();
}
catch (Exception s)
{
System.out.println("Unable to rollback");
s.printStackTrace();
}
throw new ITMException(e);
}
finally
{
try
{
if ( pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
if( con != null)
{
con.close();
con = null;
}
}
catch (Exception e2)
{
throw new ITMException(e2);
}
}
return despcount;
}
//changed by sankara on 08/01/14 for update lr_date in despatch end.
}
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ e991f217
......@@ -987,8 +987,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
//isADSIConnReq
//Changed by Rohan on 16-07-13 for define map of ptcn for void packages.start
//if(!(ptcnVoidPackagesMap.containsKey(ptcn)) && isTrackingNoExist(ptcn,conn))
if("Y".equalsIgnoreCase(isADSIConnReq) && !(ptcnVoidPackagesMap.containsKey(ptcn)) && isTrackingNoExist(ptcn,conn))
if(!(ptcnVoidPackagesMap.containsKey(ptcn)) && isTrackingNoExist(ptcn,conn))
///if("Y".equalsIgnoreCase(isADSIConnReq) && !(ptcnVoidPackagesMap.containsKey(ptcn)) && isTrackingNoExist(ptcn,conn))
{
/* if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("P-PICK") )
{*/
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ e991f217
......@@ -13177,7 +13177,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
totalFrtAmt = objShipResult.getTotal();
System.out.println("Update in desp update freight Amt totalFrtAmt ["+totalFrtAmt+"] For frtTerm["+frtTerm+"]");
if("O".equalsIgnoreCase(frtTerm))
if("B".equalsIgnoreCase(frtTerm))
{
sSQL = "UPDATE DESPATCH SET FREIGHT_AMT_ADD = ? WHERE PTCN = ?";
pstmtDesp = conn.prepareStatement(sSQL);
......
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