Skip to content

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

Changed By sumit 02/04/13 To check wave status should not confirmed 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92932 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8f0dcd51
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 27 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 7bf1a833
......@@ -11567,9 +11567,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
System.out.println("Sql Check 1 .............pickType["+pickType+"]shipType["+shipType+"]");
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
// + " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? AND SHIP_TYPE = ? ";
//+ " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE = ?";
......@@ -11578,9 +11576,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
System.out.println("Sql Check 2 .............pickType["+pickType+"]shipType["+shipType+"]");
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ?"
+ " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE = ?";
......@@ -11590,9 +11586,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("Sql Check 3 .............pickType["+pickType+"]shipType["+shipType+"]");
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? "
+ " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
......@@ -11665,9 +11659,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
rs = null;
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE= ? ";
......@@ -11707,9 +11699,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
rs = null;
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? "
+ " AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
......@@ -11746,9 +11736,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
rs = null;
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
......@@ -11798,17 +11786,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND SHIP_TYPE = ? ";
}
else if ("".equalsIgnoreCase(shipType) || "L".equalsIgnoreCase(shipType))
{
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
......@@ -11817,9 +11802,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else
{
sql = " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE,A.SHIP_TYPE FROM DISTROUTEDET A,DISTROUTE B "
//Changed by pragyan 29/03/13 to change acording to ashisk/kb sir
//+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR >= ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO <= ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
//+ " AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
......@@ -15777,13 +15760,17 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
sql = " SELECT ROD.REPL_ORDER, ROD.LOC_CODE__TO FROM REPL_ORD_DET ROD, WAVE_TASK_DET WTD, WAVE_TASK WT, LOCATION L " +
" WHERE ROD.ITEM_CODE = ? AND ROD.LOT_NO = ? AND ROD.LOC_CODE__TO = L.LOC_CODE AND L.INV_STAT = ? AND WTD.WAVE_ID = WT.WAVE_ID " +
" AND WTD.REF_ID = ROD.REPL_ORDER AND CASE WHEN ROD.CANCEL_MODE IS NULL THEN 'N' ELSE ROD.CANCEL_MODE END <> 'Y' " +
" AND ROD.SITE_CODE = ? ";
//Changed By sumit 02/04/13 To check wave status should not confirmed
//" AND ROD.SITE_CODE = ? ";
" AND ROD.SITE_CODE = ? AND WTD.STATUS = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCodeTemp);
pstmt.setString(2, lotNoTemp);
pstmt.setString(3, invStat);
pstmt.setString(4, siteCode);
//Changed By sumit 02/04/13 To check wave status should not confirmed
pstmt.setString(5, "N");
rs = pstmt.executeQuery();
if( rs.next())
{
......
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