Skip to content

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

changd by sankara on 13/10/14 updated shipmentconf for is loading condition 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96588 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 01ee8639
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 515 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentConf.java
View file @ bba3fdd0
...@@ -178,6 +178,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -178,6 +178,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
conn = connDriver.getConnectDB( "DriverITM" ); conn = connDriver.getConnectDB( "DriverITM" );
String userID = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "LoginCode" ); String userID = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "LoginCode" );
System.out.println(" forced flag:::>>>>:: ["+forcedFlag+"]"); System.out.println(" forced flag:::>>>>:: ["+forcedFlag+"]");
//changed by sankara on 10/10/14 for adeded condition isLoading
String isLoading = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "isLoading" );
//Changed by Pragyan
isLoading = isLoading == null?"N":isLoading;
System.out.println("isLoading:::::"+isLoading);
ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB(); ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
//changed by sankara on 22/09/14 for site transporter start. //changed by sankara on 22/09/14 for site transporter start.
...@@ -251,92 +256,120 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -251,92 +256,120 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
{ {
if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) )) if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
{ {
//changed by sankara on 10/10/14 for added isloading condition
if(noOfPallet <= 0 && !refSer.trim().equalsIgnoreCase("S-DSP")) if( !"Y".equalsIgnoreCase(isLoading) )
{
errString = itmDBAccessLocal.getErrorString("","VTINVPALNO","");
return errString;
}
sql = "SELECT STATUS FROM PALLET_NO WHERE PALLET_NO IN ( SELECT PALLET_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while( rs.next() )
{ {
status = checkNull(rs.getString("STATUS")); if(noOfPallet <= 0 && !refSer.trim().equalsIgnoreCase("S-DSP"))
if((!"".equalsIgnoreCase(status) || status != null ) && !"A".equalsIgnoreCase(status) )
{ {
errString = itmDBAccessLocal.getErrorString("","VTINVPALET","");
errString = itmDBAccessLocal.getErrorString("","VTINVPALNO","");
return errString; return errString;
} }
}
rs.close();
rs = null; sql = "SELECT STATUS FROM PALLET_NO WHERE PALLET_NO IN ( SELECT PALLET_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ) ";
pstmt.close(); pstmt = conn.prepareStatement(sql);
pstmt = null; pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
sql = "SELECT STATUS FROM CARTON_MASTER WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ) "; while( rs.next() )
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while( rs.next() )
{
status = checkNull(rs.getString("STATUS"));
if((!"".equalsIgnoreCase(status) || status != null ) && !"A".equalsIgnoreCase(status) )
{ {
errString = itmDBAccessLocal.getErrorString("","VTINVCARTN",""); status = checkNull(rs.getString("STATUS"));
if((!"".equalsIgnoreCase(status) || status != null ) && !"A".equalsIgnoreCase(status) )
{
errString = itmDBAccessLocal.getErrorString("","VTINVPALET","");
return errString;
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT STATUS FROM CARTON_MASTER WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while( rs.next() )
{
status = checkNull(rs.getString("STATUS"));
if((!"".equalsIgnoreCase(status) || status != null ) && !"A".equalsIgnoreCase(status) )
{
errString = itmDBAccessLocal.getErrorString("","VTINVCARTN","");
return errString;
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT CONSIGNEE_NAME,ADDR1,ADDR2,ADDR3,LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, PRO_NO FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if( rs.next() )
{
custName = checkNull(rs.getString("CONSIGNEE_NAME")).trim();
shipAdd1 = checkNull(rs.getString("ADDR3")).trim();
shipAdd2 = checkNull(rs.getString("ADDR2")).trim();
shipAdd3 = checkNull(rs.getString("ADDR1")).trim();
lorryNo = checkNull(rs.getString("LORRY_NO"));
tranCode = checkNull(rs.getString("TRAN_CODE"));
lrNo = checkNull(rs.getString("LR_NO"));
lrDate = rs.getTimestamp("LR_DATE");
proNo = checkNull(rs.getString("PRO_NO"));
}
if("".equalsIgnoreCase(custName) && custName.trim().length() <= 0)
{
errString = itmDBAccessLocal.getErrorString("","VTINVCONSE","");
return errString; return errString;
} }
} if(("".equalsIgnoreCase(shipAdd1) && shipAdd1.trim().length() <= 0 ) && ("".equalsIgnoreCase(shipAdd2) && shipAdd2.trim().length() <= 0 ) && ("".equalsIgnoreCase(shipAdd3) && shipAdd3.trim().length() <= 0 ))
{
rs.close(); errString = itmDBAccessLocal.getErrorString("","VTINVADDR","");
rs = null; return errString;
pstmt.close(); }
pstmt = null; rs.close();
rs = null;
pstmt.close();
sql = "SELECT CONSIGNEE_NAME,ADDR1,ADDR2,ADDR3,LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, PRO_NO FROM SHIPMENT WHERE SHIPMENT_ID = ? "; pstmt = null;
pstmt = conn.prepareStatement(sql); } //changed by sankara on 10/10/14 for added isloading condition end
pstmt.setString(1, tranId); //changed by sankara on 10/10/14 for added isloading condition start.
rs = pstmt.executeQuery(); else
if( rs.next() )
{
custName = checkNull(rs.getString("CONSIGNEE_NAME")).trim();
shipAdd1 = checkNull(rs.getString("ADDR3")).trim();
shipAdd2 = checkNull(rs.getString("ADDR2")).trim();
shipAdd3 = checkNull(rs.getString("ADDR1")).trim();
lorryNo = checkNull(rs.getString("LORRY_NO"));
tranCode = checkNull(rs.getString("TRAN_CODE"));
lrNo = checkNull(rs.getString("LR_NO"));
lrDate = rs.getTimestamp("LR_DATE");
proNo = checkNull(rs.getString("PRO_NO"));
}
if("".equalsIgnoreCase(custName) && custName.trim().length() <= 0)
{
errString = itmDBAccessLocal.getErrorString("","VTINVCONSE","");
return errString;
}
if(("".equalsIgnoreCase(shipAdd1) && shipAdd1.trim().length() <= 0 ) && ("".equalsIgnoreCase(shipAdd2) && shipAdd2.trim().length() <= 0 ) && ("".equalsIgnoreCase(shipAdd3) && shipAdd3.trim().length() <= 0 ))
{ {
errString = itmDBAccessLocal.getErrorString("","VTINVADDR",""); sql = "SELECT CONSIGNEE_NAME,ADDR1,ADDR2,ADDR3,LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, PRO_NO FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
return errString; pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if( rs.next() )
{
custName = checkNull(rs.getString("CONSIGNEE_NAME")).trim();
shipAdd1 = checkNull(rs.getString("ADDR3")).trim();
shipAdd2 = checkNull(rs.getString("ADDR2")).trim();
shipAdd3 = checkNull(rs.getString("ADDR1")).trim();
lorryNo = checkNull(rs.getString("LORRY_NO"));
tranCode = checkNull(rs.getString("TRAN_CODE"));
lrNo = checkNull(rs.getString("LR_NO"));
lrDate = rs.getTimestamp("LR_DATE");
proNo = checkNull(rs.getString("PRO_NO"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
} }
rs.close(); //changed by sankara on 10/10/14 for added isloading condition end.
rs = null;
pstmt.close();
pstmt = null;
}//if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) )) }//if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ))
sql = "SELECT COUNT(*) as COUNT FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ?"; sql = "SELECT COUNT(*) as COUNT FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ?";
...@@ -349,7 +382,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal, ...@@ -349,7 +382,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim())))
// changed by sankara on 10/10/14 for added loading condition
// if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim()))
if( noOfPallet != count && !("S-DSP".equalsIgnoreCase(refSer.trim())) && !"Y".equalsIgnoreCase(isLoading) )
{ {
errString = itmDBAccessLocal.getErrorString("","NOOFPALLET",""); errString = itmDBAccessLocal.getErrorString("","NOOFPALLET","");
} }
......
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