Skip to content

B
business-java
Commit 2c2a91f0 authored by sankara.rao's avatar sankara.rao
Browse files
Options

changed by sankara on 18/11/13 for assign user and update pophelp of... 

changed by sankara on 18/11/13 for assign user and update pophelp of replenishmnet and black list supp code


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93882 ce508802-f39f-4f6c-b175-0d175dae99d5
parent eec89f65
Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 12 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnIC.java
View file @ 2c2a91f0
......@@ -126,7 +126,8 @@ public class AsnIC extends ValidatorEJB implements AsnICRemote,AsnICLocal
Properties p = null;
InitialContext ctx = null;
ConnDriver connDriver = null;
//changed by sankara on 18/11/13 for black_list supp code
String blackList = "";
try
{
......@@ -397,6 +398,31 @@ public class AsnIC extends ValidatorEJB implements AsnICRemote,AsnICLocal
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
//changed by sankara on 18/11/13 required validation for black_list supp code start.
sql = " SELECT BLACK_LIST FROM SUPPLIER WHERE SUPP_CODE = ? ";
System.out.println("columnValue ["+columnValue+" ]");
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
if( rs.next() )
{
blackList = checkNull (rs.getString("BLACK_LIST"));
System.out.println("blackList:"+blackList);
}
if( blackList == null || blackList.trim().length() == 0 )
{
blackList ="N";
}
if( blackList != null && blackList.trim().length() > 0 && blackList.trim().equalsIgnoreCase("Y") )
{
errList.add( "VTSUPPBL" );
errFields.add( childNodeName.toLowerCase() );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//changed by sankara on 18/11/13 required validation for black_list supp code end.
} //Changed by sumit on date 27/09/11 for purchase validation end.
}// for end
......
webitm-wms/ibase/webitm/ejb/wms/PickIssIC.java
View file @ 2c2a91f0
......@@ -178,7 +178,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
ArrayList errFields = new ArrayList();
//Changed by sumit on 13/03/13 initialize itmVolumeMap object
HashMap itmVolumeMap = new HashMap();
//changed by sankara on 18/11/13 validation for different assign user
String assignTo = "";
try
{
int currentFormNo = 0;
......@@ -581,7 +582,29 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
}
// cpatil end on 23-AUG-12
*/
//changed by sankara on 18/11/13 validation for different assign user start.
sql = " SELECT ASSIGN_TO FROM PICK_ORD_HDR WHERE PICK_ORDER = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, pickOrder );
rs = pstmt.executeQuery();
if( rs.next() )
{
assignTo = checkNull (rs.getString("ASSIGN_TO"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("UESRID:"+userId);
System.out.println("ASSIGNTO:"+assignTo);
if( assignTo !=null && assignTo.trim().length() > 0 && !assignTo.trim().equalsIgnoreCase(userId) )
{
errList.add( "INVREPKTSK" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by sankara on 18/11/13 validation for different assign user end.
}
else if ( "pallet_no".equalsIgnoreCase( childNodeName ) ) // && ! "master_pick".equalsIgnoreCase(objName) )
{
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 2c2a91f0
......@@ -192,6 +192,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
DistCommon distComm = new DistCommon();
//Changed by sumit on 20/09/12 declare ptcn variable.
String ptcn = "";
//changed by sankara on 18/11/13 validation for different assign user
String assignTo = "";
try
{
......@@ -605,6 +607,28 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
}
//Changed by Rohan on 06-09-12 to check previous task finish or not.end
//changed by sankara on 18/11/13 validation for different assign user start.
sql = " SELECT ASSIGN_TO FROM REPL_ORD_HDR WHERE REPL_ORDER = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrder );
rs = pstmt.executeQuery();
if( rs.next() )
{
assignTo = checkNull (rs.getString("ASSIGN_TO"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("userId:"+userId);
System.out.println("assignTo:"+assignTo);
if(assignTo !=null && assignTo.trim().length() > 0 && !assignTo.trim().equalsIgnoreCase(userId) )
{
errList.add( "INVREPKTSK" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by sankara on 18/11/13 validation for different assign user end.
}
else if( "site_code".equalsIgnoreCase( childNodeName ) )
......@@ -3139,7 +3163,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
String objNameChk = "";
DistCommon distComm = new DistCommon();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
//changed by sankara on 18/11/13 for repl order set itm default
String assignTo = "";
String invstat = "";
try
......@@ -3191,33 +3217,47 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
if("repl_iss".equalsIgnoreCase(objNameChk))
{
sql =" SELECT REPL_ORDER,LOC_CODE FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE" +
//changed by sankara on 18/11/13 for rep order set itm default
//sql =" SELECT REPL_ORDER,LOC_CODE FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE" +
sql =" SELECT REPL_ORDER,LOC_CODE,ASSIGN_TO FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE,H.ASSIGN_TO" +
" FROM REPL_ORD_DET R,REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L,WAVE_TASK WH" +
" WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND" +
//Changed By Pragyan 01/03/13 To check the repl order cancel flag
" CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND " +
" R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE NOT IN ('E','Q','T','P','I') " +
" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE";
//Changed by sankara on 18/11/13 for rep order set itm default
//" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE";
" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND L.INV_STAT = ? " +
" AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) AND H.ASSIGN_TO = ? ORDER BY REPL_ORDER, LOC_CODE ";
}
else if("active_repl_iss".equalsIgnoreCase(objNameChk))
{
sql = " SELECT REPL_ORDER,LOC_CODE FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE FROM REPL_ORD_DET R,REPL_ORD_HDR H," +
//changed by sankara on 18/11/13 for rep order set itm default
//sql = " SELECT REPL_ORDER,LOC_CODE FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE FROM REPL_ORD_DET R,REPL_ORD_HDR H," +
sql = " SELECT REPL_ORDER,LOC_CODE,ASSIGN_TO FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE,H.ASSIGN_TO FROM REPL_ORD_DET R,REPL_ORD_HDR H," +
" WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND " +
//Changed By Pragyan 01/03/13 To check the repl order cancel flag
" CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' " +
" AND R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE IN ('E','Q','T','P','I') " +
" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE ";
//changed by sankara on 18/11/13 for rep order set itm default
// "AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE ";
" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND L.INV_STAT = ? " +
" AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) AND H.ASSIGN_TO = ? ORDER BY REPL_ORDER, LOC_CODE ";
}
System.out.println("CURRENT SQL["+sql+"]");
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, replOrderChkInv );
pstmt.setString( 2, loginCode );
pstmt.setString( 2, loginCode );
//Changed by sankara on 18/11/13 for rep order set itm default
pstmt.setString( 3, loginCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
replOrderChk = rs.getString("REPL_ORDER");
//changed by sankara on 18/11/13 for rep order set itm default
assignTo = checkNull(rs.getString("ASSIGN_TO"));
System.out.println("assignTo--->:"+assignTo);
}
if(rs != null )
{
......@@ -3236,10 +3276,74 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//Changed By Pragyan To send the Fatal Error.
return itmDBAccessEJB.getErrorString("","RECONEXIST","","",conn);
}
valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
//changed by sankara on 18/11/13 for rep order set itm default start.
//valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
if(assignTo !=null && assignTo.trim().length() > 0 )
{
valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
}
//changed by sankara on 18/11/13 for rep order set itm default end.
}
//Changed By Pragyan 26/11/12 To set the last used Inventory for scaning.end
//changed by sankara on 18/11/13 for rep order set itm default start.
else
{
System.out.println("INSIDEELSE::::::::::::");
objNameChk = getObjNameFromDom(currFormDataDom, "objName", objContext);
System.out.println("objNameChk:"+objNameChk);
if("repl_iss".equalsIgnoreCase(objNameChk))
{
sql = " SELECT REPL_ORDER,LOC_CODE,INV_STAT,ASSIGN_TO FROM (SELECT DISTINCT R.REPL_ORDER ,L.LOC_CODE,L.INV_STAT,H.ASSIGN_TO" +
" FROM REPL_ORD_DET R,REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L,WAVE_TASK WH" +
" WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND" +
" CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND " +
" R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE NOT IN ('E','Q','T','P','I') " +
" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND H.ASSIGN_TO = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
" ORDER BY REPL_ORDER,ASSIGN_TO,LOC_CODE ";
}
else if("active_repl_iss".equalsIgnoreCase(objNameChk))
{
sql = " SELECT REPL_ORDER,LOC_CODE,INV_STAT,ASSIGN_TO FROM (SELECT DISTINCT R.REPL_ORDER,L.LOC_CODE,L.INV_STAT,H.ASSIGN_TO" +
" FROM REPL_ORD_DET R,REPL_ORD_HDR H, WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH" +
" WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND " +
" CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' " +
" AND R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE IN ('E','Q','T','P','I') " +
" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND H.ASSIGN_TO = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
" ORDER BY REPL_ORDER,ASSIGN_TO,LOC_CODE ";
}
System.out.println("CURRENT SQL["+sql+"]");
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, loginCode );
pstmt.setString( 2, loginCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
replOrderChk = rs.getString("REPL_ORDER");
System.out.println("replOrderChk:"+replOrderChk);
invstat = checkNull( rs.getString("INV_STAT"));
System.out.println("invstat:"+invstat);
assignTo = checkNull( rs.getString("ASSIGN_TO"));
System.out.println("assignTo:"+assignTo);
}
if(rs != null )
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(assignTo != null && assignTo.trim().length() > 0 )
{
valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
USER_DEFINED_VALUE_MAP.put(loginCode, invstat);
System.out.println("USER_DEFINED_VALUE_MAP->"+USER_DEFINED_VALUE_MAP);
}
}
//changed by sankara on 18/11/13 for rep order set itm default end.
//valueXmlString.append( "<trans_mode><![CDATA[" ).append( "E" ).append( "]]></trans_mode>\r\n" );
System.out.println("CHanges by rohan");
siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
......
webitm-wms/module-resource/sql/update.sql
View file @ 2c2a91f0
......@@ -44721,4 +44721,65 @@ convQtyStdU)-quantityAlloc );
END;
/
COMMIT;
\ No newline at end of file
COMMIT;
--changed by sankara on 18/11/13 for pophelp of replenishment and assigned user message.
UPDATE POPHELP SET SQL_STR='SELECT REPL_ORDER,LOC_CODE FROM (SELECT DISTINCT R.REPL_ORDER,L.LOC_CODE
FROM REPL_ORD_DET R,REPL_ORD_HDR H, WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH
WHERE W.WAVE_ID = WH.WAVE_ID
AND R.REPL_ORDER = H.REPL_ORDER
AND R.REPL_ORDER =W.REF_ID
AND W.STATUS = ''N''
AND H.ORDER_TYPE NOT IN (''E'',''Q'',''T'',''I'',''P'')
AND CASE WHEN R.CANCEL_MODE IS NULL THEN ''N'' ELSE R.CANCEL_MODE END <> ''Y''
AND FN_VALID_REPL(H.REPL_ORDER) =''Y''
AND R.LOC_CODE = L.LOC_CODE
AND L.INV_STAT = ''?''
AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,''?'') = 1
AND (H.ASSIGN_TO =''?'' OR H.ASSIGN_TO IS NULL ))
ORDER BY REPL_ORDER, LOC_CODE',SQL_INPUT=':1.repl_order,:1.chg_user,:1.login_code' where mod_name = 'W_REPL_ISS';
UPDATE POPHELP SET SQL_STR='SELECT REPL_ORDER,LOC_CODE FROM (SELECT DISTINCT R.REPL_ORDER , L.LOC_CODE FROM REPL_ORD_DET R,
REPL_ORD_HDR H,WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH
WHERE W.WAVE_ID = WH.WAVE_ID
AND R.REPL_ORDER = H.REPL_ORDER
AND R.REPL_ORDER = W.REF_ID
AND W.STATUS = ''N''
AND H.ORDER_TYPE IN (''E'',''Q'',''T'',''I'',''P'')
AND CASE WHEN R.CANCEL_MODE IS NULL THEN ''N'' ELSE R.CANCEL_MODE END <> ''Y''
AND FN_VALID_REPL (H.REPL_ORDER) = ''Y''
AND R.LOC_CODE = L.LOC_CODE
AND L.INV_STAT = ''?''
AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,''?'') = 1
AND (H.ASSIGN_TO =''?'' OR H.ASSIGN_TO IS NULL ))
ORDER BY REPL_ORDER, LOC_CODE ',SQL_INPUT=':1.repl_order,:1.chg_user,:1.login_code' where mod_name = 'W_ACTIVE_REPL_ISS';
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 (
'INVREPKTSK',
'Invalid Task',
'Task is already assigned to another User',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
commit;
\ 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