Skip to content

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

W15GSUN002 added AWMS sql in D-SO/S-ORD refser.location code inv_stat should be AWMS 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99202 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4f331591
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 11 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletRequisitionActEJB.java
View file @ 6d0df1c9
......@@ -139,7 +139,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
Boolean isError = false;
HashMap hm = new HashMap();
String loginEmpCode = "",userId = "",loginSite = "",errString = "";
String loginEmpCode = "",userId = "",loginSite = "",errString = "",itemDescr = "";
String itemCode = "",lineNo = "",descr = "",unit = "",itemType = "",familyGrp = "",refSer = "",lotNo = "",refId = "",lotSl = "",
palletNo = "",palletStatus = "",lockStat = "",qcType = "",stroPref = "",palletRej = "",palletRejDesc = "",confirmed = "",siteCode = "";
String transactionId = "";
......@@ -190,14 +190,18 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
{
//Changed by wasim on 09-11-2015 for taking data from stock and distorderalloc join.
//sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,UNIT,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE__MFG FROM DISTORDER_ALLOC WHERE DIST_ORDER = ?";
sql = "SELECT D.ITEM_CODE,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,S.SITE_CODE,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
+" FROM STOCK S,DISTORDER_ALLOC D,DISTORDER H WHERE"
sql = "SELECT D.ITEM_CODE,I.DESCR,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,S.SITE_CODE,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
//+" FROM STOCK S,DISTORDER_ALLOC D,DISTORDER H WHERE" //Changed by wasim on 20-08-2015 to add inv_stat AWMS validation
+" FROM STOCK S,DISTORDER_ALLOC D,DISTORDER H,LOCATION L,ITEM I WHERE"
+" S.ITEM_CODE = D.ITEM_CODE"
+" AND S.LOT_NO = D.LOT_NO"
+" AND S.LOT_SL = D.LOT_SL"
+" AND S.LOC_CODE = D.LOC_CODE"
+" AND S.SITE_CODE = H.SITE_CODE"
+" AND H.DIST_ORDER = D.DIST_ORDER"
+" AND L.LOC_CODE = D.LOC_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND L.INV_STAT = 'AWMS'" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND I.ITEM_CODE = D.ITEM_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND D.DIST_ORDER = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
......@@ -207,6 +211,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
flag = 1;//record found in distribution order
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
itemDescr = checkNullAndTrim(rs.getString("DESCR"));
lineNo = checkNullAndTrim(rs.getString("LINE_NO"));
lineNo = " " + lineNo;
......@@ -263,7 +268,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
interfaceHmap.put("TRAN_ID", "");
interfaceHmap.put("ITEM_CODE", itemCode);
interfaceHmap.put("DESCR", "");
interfaceHmap.put("DESCR", itemDescr);
interfaceHmap.put("UNIT", unit);
interfaceHmap.put("ITEM_TYPE", "");
interfaceHmap.put("FAMILY_GRP", "");
......@@ -298,8 +303,9 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
if(flag == 0)
{
sql = "SELECT D.ITEM_CODE,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
+" FROM STOCK S,DISTORD_ISSDET D,DISTORD_ISS H WHERE"
sql = "SELECT D.ITEM_CODE,I.DESCR,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
//+" FROM STOCK S,DISTORD_ISSDET D,DISTORD_ISS H WHERE" //Changed by wasim on 20-08-2015 to add inv_stat AWMS validation
+" FROM STOCK S,DISTORD_ISSDET D,DISTORD_ISS H,LOCATION L,ITEM I WHERE"
+" S.ITEM_CODE = D.ITEM_CODE"
+" AND S.LOT_NO = D.LOT_NO"
+" AND S.LOT_SL = D.LOT_SL"
......@@ -307,6 +313,9 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
+" AND S.SITE_CODE = H.SITE_CODE"
+" AND D.TRAN_ID = H.TRAN_ID"
+" AND H.CONFIRMED = 'N'"
+" AND L.LOC_CODE = D.LOC_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND L.INV_STAT = 'AWMS'"
+" AND I.ITEM_CODE = D.ITEM_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND D.DIST_ORDER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
......@@ -316,6 +325,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
flag = 1;
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
itemDescr = checkNullAndTrim(rs.getString("DESCR"));
lineNo = checkNullAndTrim(rs.getString("LINE_NO"));
lineNo = " " + lineNo;
lineNo = lineNo.substring(lineNo.length()-3);
......@@ -346,7 +356,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
interfaceHmap.put("TRAN_ID", "");
interfaceHmap.put("ITEM_CODE", itemCode);
interfaceHmap.put("DESCR", "");
interfaceHmap.put("DESCR", itemDescr);
interfaceHmap.put("UNIT", unit);
interfaceHmap.put("ITEM_TYPE", "");
interfaceHmap.put("FAMILY_GRP", "");
......@@ -440,7 +450,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
int caseCount = 0,flag = 0;
Boolean isError = false;
String loginEmpCode = "",userId = "",loginSite = "",errString = "",objName = "";
String loginEmpCode = "",userId = "",loginSite = "",errString = "",objName = "",itemDescr = "";
String itemCode = "",lineNo = "",descr = "",unit = "",itemType = "",familyGrp = "",refSer = "",lotNo = "",refId = "",lotSl = "",
palletNo = "",palletStatus = "",lockStat = "",qcType = "",stroPref = "",palletRej = "",palletRejDesc = "",confirmed = "",siteCode = "";
String transactionId = "";
......@@ -492,13 +502,17 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
else
{
//sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,UNIT__STD,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE FROM SORDALLOC WHERE SALE_ORDER = ?";
sql = "SELECT D.ITEM_CODE,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,D.SITE_CODE,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
+" FROM STOCK S,SORDALLOC D WHERE"
sql = "SELECT D.ITEM_CODE,I.DESCR,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,D.SITE_CODE,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
//+" FROM STOCK S,SORDALLOC D WHERE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" FROM STOCK S,SORDALLOC D,LOCATION L,ITEM I WHERE"
+" S.ITEM_CODE = D.ITEM_CODE"
+" AND S.LOT_NO = D.LOT_NO"
+" AND S.LOT_SL = D.LOT_SL"
+" AND S.LOC_CODE = D.LOC_CODE"
+" AND S.SITE_CODE = D.SITE_CODE"
+" AND L.LOC_CODE = D.LOC_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND L.INV_STAT = 'AWMS'" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND I.ITEM_CODE = D.ITEM_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
+" AND D.SALE_ORDER = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
......@@ -508,6 +522,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
flag = 1;
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
itemDescr = checkNullAndTrim(rs.getString("DESCR"));
lineNo = checkNullAndTrim(rs.getString("LINE_NO"));
lineNo = " " + lineNo;
......@@ -564,7 +579,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
interfaceHmap.put("TRAN_ID", "");
interfaceHmap.put("ITEM_CODE", itemCode);
interfaceHmap.put("DESCR", "");
interfaceHmap.put("DESCR", itemDescr);
interfaceHmap.put("UNIT", unit);
interfaceHmap.put("ITEM_TYPE", "");
interfaceHmap.put("FAMILY_GRP", "");
......
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