Skip to content

B
business-java
Commit e0339109 authored by wansari's avatar wansari
Browse files
Options

Changed by wasim for Tax Amount difference issue. removed line_no__ord from... 

Changed by wasim for Tax Amount difference issue. removed line_no__ord from query and group by clause


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101556 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f5f58525
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 26 deletions
webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java
View file @ e0339109
......@@ -259,8 +259,8 @@ public class ConsolidatToDoc {
if("DDUK".equalsIgnoreCase(projectName))
{
//Changed by wasim to Despatch the order with the consolidated order line number on 01-07-2015 [START]
System.out.println("This is group by query.");
sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE,"+
System.out.println("This is group by query.");
/*sql = "SELECT POD.PICK_ORDER AS ID, POD.LINE_NO AS LINE_NO__ORD, POD.SITE_CODE,"+
" POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+
" POD.NO_ART,SUM (P.QUANTITY - CASE WHEN P.DEALLOC_QTY IS NULL THEN 0 ELSE P.DEALLOC_QTY END) AS QUANTITY, POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+
" POD.LINE_NO__SORD,PH.PALLET_NO "+
......@@ -276,8 +276,28 @@ public class ConsolidatToDoc {
" POD.PICK_ORDER, POD.LINE_NO, POD.SITE_CODE,"+
" POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+
" POD.NO_ART,POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+
" POD.LINE_NO__SORD,PH.PALLET_NO";
" POD.LINE_NO__SORD,PH.PALLET_NO";*/
//Changed by wasim to Despatch the order with the consolidated order line number on 01-07-2015 [END]
//Changed by wasim on 06-05-2016 for tax amount difference issue [START]
sql = "SELECT POD.PICK_ORDER AS ID, POD.SITE_CODE,"+
" POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+
" POD.NO_ART,SUM (P.QUANTITY - CASE WHEN P.DEALLOC_QTY IS NULL THEN 0 ELSE P.DEALLOC_QTY END) AS QUANTITY, POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+
" POD.LINE_NO__SORD,PH.PALLET_NO "+
" FROM PICK_ISS_DET P, PICK_ORD_HDR PO , PICK_ORD_DET POD,PICK_ISS_HDR PH "+
" WHERE POD.PICK_ORDER = PO.PICK_ORDER "+
" AND POD.PICK_ORDER = P.PICK_ORDER "+
" AND POD.LINE_NO = P.LINE_NO__ORD "+
" AND PH.PICK_ORDER = P.PICK_ORDER "+
" AND PH.TRAN_ID = P.TRAN_ID "+
" AND (P.QUANTITY - CASE WHEN P.DEALLOC_QTY IS NULL THEN 0 ELSE P.DEALLOC_QTY END) > 0 "+
" AND PO.PICK_ORDER = ? "+
" GROUP BY "+
" POD.PICK_ORDER, POD.SITE_CODE,"+
" POD.ITEM_CODE,P.ITEM_CODE, P.LOC_CODE, P.LOC_CODE__TO, P.LOT_NO, P.LOT_SL,"+
" POD.NO_ART,POD.SALE_ORDER, POD.EXP_LEV, PO.WAVE_ID,"+
" POD.LINE_NO__SORD,PH.PALLET_NO";
//Changed by wasim on 06-05-2016 for tax amount difference issue [END]
}
// Changed by Manish on 07/12/15 for DDWMS merging [END]
......@@ -390,7 +410,18 @@ public class ConsolidatToDoc {
{
System.out.println("** inside while block *** ");
pickOrder = rs.getString("ID");
lineNoOrd = rs.getInt("LINE_NO__ORD");
//Changed by wasim on 06-05-2016 for tax amount difference issue [START]
//lineNoOrd = rs.getInt("LINE_NO__ORD");
if(!"DDUK".equalsIgnoreCase(projectName))
{
lineNoOrd = rs.getInt("LINE_NO__ORD");
}
else
{
locCodeTo = rs.getString("LOC_CODE__TO");
}
//Changed by wasim on 06-05-2016 for tax amount difference issue [END]
siteCode = rs.getString("SITE_CODE");
itemCode = rs.getString("ITEM_CODE");
locCode = rs.getString("LOC_CODE");
......@@ -529,30 +560,34 @@ public class ConsolidatToDoc {
//else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK") || key.equalsIgnoreCase("P-PICK"))
else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("P-PICK"))
{
//Selecting loc_code__to from pick_iss_det
pstmtIss.setString(1, pickOrder);
//Changed By Pragyan
//pstmtIss.setString(2, lineNoSord);
palletNo = rs.getString("PALLET_NO");
pstmtIss.setInt(2, lineNoOrd);
rsIss = pstmtIss.executeQuery();
if ( rsIss.next() )
//Changed by wasim on 06-05-2016 for tax amount difference issue, query will not fire for DDUK [START]
if(!"DDUK".equalsIgnoreCase(projectName))
{
locCodeTo = rsIss.getString("LOC_CODE__TO");
}
/*rsIss.close(); rsIss = null;*/
pstmtIss.clearParameters();
//Changed by Manish 0n 15/03/16 for max cursor issue for DDUK[start]
if(rsIss != null)
{
rsIss.close();
rsIss = null;
}
//Selecting loc_code__to from pick_iss_det
pstmtIss.setString(1, pickOrder);
//Changed By Pragyan
//pstmtIss.setString(2, lineNoSord);
palletNo = rs.getString("PALLET_NO");
pstmtIss.setInt(2, lineNoOrd);
rsIss = pstmtIss.executeQuery();
if ( rsIss.next() )
{
locCodeTo = rsIss.getString("LOC_CODE__TO");
}
/*rsIss.close(); rsIss = null;*/
pstmtIss.clearParameters();
//Changed by Manish 0n 15/03/16 for max cursor issue for DDUK[start]
if(rsIss != null)
{
rsIss.close();
rsIss = null;
}
}
//Changed by Manish 0n 15/03/16 for max cursor issue for DDUK[end]
//Changed by wasim on 06-05-2016 for tax amount difference issue, query will not fire for DDUK [END]
}
System.out.println("pick/repl order ["+pickOrder.trim()+"] site code ["+siteCode.trim()+"] item code ["+itemCode.trim()+"] loc code ["+locCode.trim()+"]");
......
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