Skip to content

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

LTL To Parcel/Master Common changed components which has no impacts 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92822 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d555778d
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 13 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ 7376a725
......@@ -98,10 +98,15 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
locCodeTo = genericUtility.getColumnValue("loc_code__to", dom, "2" );
//pickOrder = genericUtility.getColumnValueFromNode("pick_order", dom.getElementsByTagName("Detail2").item(0));
System.out.println("palert no from generic utility ["+palletNo+"] locCodeTo [" + locCodeTo + "]");
sql = "SELECT HDR1.tran_id tran_id,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ?";//PICK_ISS_HDR
//sql = "SELECT HDR1.tran_id tran_id,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ?";//PICK_ISS_HDR
//Changed By Pragyan 06/03/12 To check only "N" trf status
//sql = "SELECT HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ?";//PICK_ISS_HDR
sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ? AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?";//PICK_ISS_HDR
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, palletNo);
pstmt.setString( 2, "N");
rs = pstmt.executeQuery();
if(rs.next())
{
tranId = rs.getString("tran_id")==null?"":rs.getString("tran_id");
......
webitm-wms/ibase/webitm/ejb/wms/PalletNoIC.java
View file @ 7376a725
......@@ -241,17 +241,43 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
pstmt.close();
pstmt = null;
sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ?";
//Changed By Pragyan 06/03/13 To check the trf status for records
//sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ?";
sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ? AND HDR.TRF_STATUS = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, palletNoDom );
pstmt.setString( 2, "N" );
rs = pstmt.executeQuery();
if ( rs.next() )
{
pickOrder = rs.getString("PICK_ORDER");
pickType = rs.getString("PICK_type");
pickType = rs.getString("PICK_TYPE");
System.out.println("PICK_ORDER -----["+pickOrder+"]pickType["+pickType+"]");
}
else
{
//Code should be check without trf status.
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, palletNoDom );
rs = pstmt.executeQuery();
if ( rs.next() )
{
pickOrder = rs.getString("PICK_ORDER");
pickType = rs.getString("PICK_TYPE");
System.out.println("PICK_ORDER -----["+pickOrder+"]pickType["+pickType+"]");
}
}
rs.close();
rs = null;
pstmt.close();
......@@ -724,9 +750,12 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
System.out.println("pallet no -----["+palletNo+"]");
System.out.println("location to "+locCodeTo);
sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ?";
//Changed By Pragyan 06/03/13 To check the trf status for records
//sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ?";
sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ? AND (CASE WHEN HDR.TRF_STATUS IS NULL THEN 'N' ELSE HDR.TRF_STATUS END) = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, palletNo );
pstmt.setString( 2, "N" );
rs = pstmt.executeQuery();
if ( rs.next() )
{
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 7376a725
......@@ -20709,7 +20709,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Chnaged by Rohan on 22/08/12 to get stock quantity for manual stock allocation.end
//Changed by sumit on 23/08/12n update wave_status as per their sequence of task start.
private String updateWaveSatus(String waveId, Connection conn) throws ITMException
private String updateWaveSatus(String waveId,Connection conn) throws ITMException
{
PreparedStatement pstmt2 = null, pstmt = null, pstmt1 = null;
ResultSet rs2 = null, rs3 = null, rs1 = null;
......@@ -20742,7 +20742,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//if ("R-DSO".equalsIgnoreCase(refSer) || "R-TASK".equalsIgnoreCase(refSer) || "RS-DSO".equalsIgnoreCase(refSer) || "RP-ACT".equalsIgnoreCase(refSer))
if ("R-DSO".equalsIgnoreCase(refSer) || "R-TASK".equalsIgnoreCase(refSer) || "RS-DSO".equalsIgnoreCase(refSer) || "RP-ACT".equalsIgnoreCase(refSer) || "RD-DSA".equalsIgnoreCase(refSer) || "RR-DSA".equalsIgnoreCase(refSer) || "S-DOC".equalsIgnoreCase(refSer))
{
sql = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? ";
//Changed By Pragyan 06/03/13 To update wave status only if it is "N"
//sql = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? ";
sql = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND STATUS = 'N'";
pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1, refId);
//pstmt.setString(9, "C");
......@@ -20777,7 +20780,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt2 = null;
}
sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ?";
//Changed By Pragyan 06/03/13 To update wave status only if it is "N"
//sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ?";
sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ? AND STATUS = 'N'";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, refId);
pstmt1.setString(2, waveId);
......@@ -20839,7 +20844,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by sumit on 17/11/12 updating ref_id in case of null pick_order in repl_ord_det ( not dependent) start.
}
else if( "A-PICK".equalsIgnoreCase(refSer) || "C-PICK".equalsIgnoreCase(refSer) || "M-PICK".equalsIgnoreCase(refSer))
//Changed by Pragyan 07/03/13 To check "P-PICK" as case pick created or held
//else if( "A-PICK".equalsIgnoreCase(refSer) || "C-PICK".equalsIgnoreCase(refSer) || "M-PICK".equalsIgnoreCase(refSer))
else if( "A-PICK".equalsIgnoreCase(refSer) || "C-PICK".equalsIgnoreCase(refSer) || "M-PICK".equalsIgnoreCase(refSer) || "P-PICK".equalsIgnoreCase(refSer))
{
tempOrder = "";
sql1 = "SELECT REPL_ORDER FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
......@@ -20950,7 +20957,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println(" isReplConfirmed "+isReplConfirmed);
if( !isReplConfirmed.contains("false"))
{
sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ?";
//Changed By Pragyan 06/03/13 To update wave status only if it is "N"
//sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ? ";
sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ? AND STATUS = 'N'";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, refId);
pstmt1.setString(2, waveId);
......@@ -20995,8 +21005,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//pstmt1.setString(2, saleOrder);
rs1 = pstmt1.executeQuery();
if( rs1.next())
{
sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? ";
{
// AND STATUS = 'N'
//sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND STATUS = 'N'";
pstmt2 = conn.prepareStatement(sql1);
pstmt2.setString(1, refId);
update = pstmt2.executeUpdate();
......@@ -21008,7 +21019,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
}
if(pstmt1 != null)
{
pstmt1.close();
......
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