Commit adc29c16 authored by jshinde's avatar jshinde

Request Id:[W16CSUN008] Duel approval is required for taking damage / Hold...

Request Id:[W16CSUN008] Duel approval is required for taking damage / Hold material out. after click on"Pallet req" button in Hold inventory transaction. Unconfirmed request  of pallet out will generate which will further approve by QA.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102278 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a6d5a58f
...@@ -764,7 +764,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR ...@@ -764,7 +764,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
String itemCode="",lotNo="",lotSl = "",locCode = "",siteCode = "",noArt = "",locCodeFrom = "",locCodeTo = "", String itemCode="",lotNo="",lotSl = "",locCode = "",siteCode = "",noArt = "",locCodeFrom = "",locCodeTo = "",
lineNoInvHold = "",tranType = "",confirmed = "",sqlUpdate = "",refNo = "",palletNo = "",holdStatus = "", lineNoInvHold = "",tranType = "",confirmed = "",sqlUpdate = "",refNo = "",palletNo = "",holdStatus = "",
confReqDsp=""; confReqDsp="";
int updCnt = 0,lineNo = 0; int updCnt = 0,lineNo = 0 ,reqcnt=0,holdDetCnt = 0;
double quantity = 0,allocQty = 0,palletCnt = 0; double quantity = 0,allocQty = 0,palletCnt = 0;
ResultSet rsStock = null; ResultSet rsStock = null;
//Changed by Jagruti Shinde Request Id:[W16CSUN008] //Changed by Jagruti Shinde Request Id:[W16CSUN008]
...@@ -874,13 +874,16 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR ...@@ -874,13 +874,16 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
+" FROM STOCK S, INV_HOLD H,INV_HOLD_DET D" +" FROM STOCK S, INV_HOLD H,INV_HOLD_DET D"
+" WHERE S.QUANTITY > 0 AND S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D. LOC_CODE AND " +" WHERE S.QUANTITY > 0 AND S.ITEM_CODE = D.ITEM_CODE AND S.LOC_CODE = D. LOC_CODE AND "
+" S.SITE_CODE = D. SITE_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL AND" +" S.SITE_CODE = D. SITE_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL AND"
+" S.LOC_CODE = D.LOC_CODE AND H.TRAN_ID = D.TRAN_ID AND H.TRAN_ID = ? AND D.HOLD_STATUS != 'R'"; +" S.LOC_CODE = D.LOC_CODE AND H.TRAN_ID = D.TRAN_ID AND H.TRAN_ID = ? AND D.HOLD_STATUS != 'R' AND S.INV_STAT IN ('AWMS','AWMSQ') "; //Changed by Jagruti Shinde to request only pallet of inv_stat AWMS and AWMSQ Req id:[W16CSUN008]
pstmtStock = conn.prepareStatement(sqlStock); pstmtStock = conn.prepareStatement(sqlStock);
pstmtStock.setString(1, refId); pstmtStock.setString(1, refId);
rsStock = pstmtStock.executeQuery(); rsStock = pstmtStock.executeQuery();
while(rsStock.next()) while(rsStock.next())
{ {
System.out.println("holdDetCnt"+holdDetCnt);
holdDetCnt++;
itemCode = checkNullAndTrim(rsStock.getString("ITEM_CODE")); itemCode = checkNullAndTrim(rsStock.getString("ITEM_CODE"));
palletNo = checkNullAndTrim(rsStock.getString("LOC_CODE")); palletNo = checkNullAndTrim(rsStock.getString("LOC_CODE"));
siteCode = rsStock.getString("SITE_CODE"); siteCode = rsStock.getString("SITE_CODE");
...@@ -920,6 +923,8 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR ...@@ -920,6 +923,8 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
if(palletCnt > 0) if(palletCnt > 0)
{ {
System.out.println("Pallet is already requested so not considering this pallet"); System.out.println("Pallet is already requested so not considering this pallet");
System.out.println("reqcnt"+reqcnt);
reqcnt++;
continue; continue;
} }
...@@ -937,6 +942,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR ...@@ -937,6 +942,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
pstmtDet.addBatch(); pstmtDet.addBatch();
isRecordExist = true; isRecordExist = true;
} }
if(isRecordExist) if(isRecordExist)
{ {
...@@ -946,7 +952,22 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR ...@@ -946,7 +952,22 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
pstmtHdr.close();pstmtHdr=null; pstmtHdr.close();pstmtHdr=null;
} }
pstmtDet.executeBatch(); pstmtDet.executeBatch();
} }
//Changed by Jagruti Shinde to request only pallet of inv_stat AWMS and AWMSQ Req id:[W16CSUN008][Start]
else
{
if (holdDetCnt == 0)
{
errString = itmDBAccessEJB.getErrorString("","VTPRNOTALW","","",conn);
return errString;
}
else if(holdDetCnt == reqcnt)
{
errString = itmDBAccessEJB.getErrorString("","VTPALREQAL","","",conn);
return errString;
}
}
//Changed by Jagruti Shinde to request only pallet of inv_stat AWMS and AWMSQ Req id:[W16CSUN008][End]
if(pstmtStock != null) if(pstmtStock != null)
{ {
......
...@@ -2,4 +2,19 @@ ...@@ -2,4 +2,19 @@
insert into disparm (prd_code,var_name,var_type,var_value,descr,var_subs,chg_date,chg_user,chg_term) values ('999999','CONF_REQ','S','N','CONFIRMATION OF PALLET REQUEST FROM INV HOLD',0,SYSDATE,'BASE','BASE'); insert into disparm (prd_code,var_name,var_type,var_value,descr,var_subs,chg_date,chg_user,chg_term) values ('999999','CONF_REQ','S','N','CONFIRMATION OF PALLET REQUEST FROM INV HOLD',0,SYSDATE,'BASE','BASE');
---------------------------------------------------------------------End------------------------------------------------------------------------ ---------------------------------------------------------------------End------------------------------------------------------------------------
\ No newline at end of file ------------------------------------------------------------------1-7-2016 [start]----------------------------------------------------------
insert into messages (msg_no,msg_str,msg_descr,msg_type,msg_opt,msg_time,alarm,err_source,
chg_date,chg_user,chg_term,override_input,mail_option) values
('VTPRNOTALW','Pallet Request not allow','Pallet Request is allow for inv_stat AWMS and AWMSQ only','E',null,null
,null,null,SYSDATE,'BASE','BASE',null,null);
insert into messages (msg_no,msg_str,msg_descr,msg_type,msg_opt,msg_time,alarm,err_source,
chg_date,chg_user,chg_term,override_input,mail_option) values
('VTPALREQAL','Pallet is already Requested','Selected Pallet is already Requested','E',null,null
,null,null,SYSDATE,'BASE','BASE',null,null);
------------------------------------------------------------------1-7-2016 [End]----------------------------------------------------------
\ No newline at end of file
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