Skip to content

B
business-java
Commit 21d8a1a2 authored by pjain's avatar pjain
Browse files
Options

changed by sankara on 06/08/14 update shipmentic and porcpic and messages sql 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95791 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 54fad8a5
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 7 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpIC.java
View file @ 21d8a1a2
......@@ -648,7 +648,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
}
else
{
//Changed by Dharnaj on 02/08/14 for genValidation hide this code,this validation call by genValidation(GENMST) Start. Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
//Changed by Dharnaj on 02/08/14 for genValidation hide this code,this validation call by genValidation(GENMST) Start.
//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
/*if(!lotSl.startsWith("NJ") && !lotSl.startsWith("CN") && !lotSl.startsWith("DM") && !lotSl.startsWith("EX"))
{
errList.add( "VTINVLPN" );
......@@ -660,8 +661,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
errList.add( "VTINVLEN" );
errFields.add( childNodeName.toLowerCase());
}*/
// Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.end
//End Changed by Dharnaj on 02/08/14 for genValidation hide this code,this validation call by genValidation(GENMST).
//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.end
//End Changed by Dharnaj on 02/08/14 for genValidation hide this code,this validation call by genValidation(GENMST).
//Changes made to check duplicate LPN no
String tranID = "";
String lpnNoExist = "";
......@@ -714,7 +715,10 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
else if ( tranID != null && tranID.trim().length() > 0 )
{
sql = "SELECT count(*) AS COUNT FROM PORCPDET WHERE TRAN_ID <> ? AND LOT_SL = ? ";
//Changed by sankara on 04/08/14 for multiple site canada
//sql = "SELECT count(*) AS COUNT FROM PORCPDET WHERE TRAN_ID <> ? AND LOT_SL = ? ";
sql = " SELECT COUNT(*) AS COUNT FROM PORCPDET PT, PORCP P WHERE P.TRAN_ID = PT.TRAN_ID AND P.PURC_ORDER = PT.PURC_ORDER AND PT.TRAN_ID <> ? " +
" AND PT.LOT_SL = ? AND P.SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
for( int idx = 0; idx < noOfLPN; idx++ )
......@@ -725,6 +729,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
pstmt.setString( 1, tranID );
pstmt.setString( 2, lpnNoExist );
//Changed by sankara on 04/08/14 for multiple site canada
pstmt.setString( 3, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -746,9 +752,14 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
}
else if ( tranID == null || tranID.trim().length() == 0 )
{
sql = "SELECT count(*) AS COUNT FROM PORCPDET WHERE LOT_SL = ? ";
//Changed by sankara on 04/08/14 for multiple site canada
//sql = "SELECT count(*) AS COUNT FROM PORCPDET WHERE LOT_SL = ? ";
sql = " SELECT COUNT(*) AS COUNT FROM PORCPDET PT, PORCP P WHERE P.TRAN_ID = PT.TRAN_ID AND P.PURC_ORDER = PT.PURC_ORDER " +
" AND PT.LOT_SL = ? AND P.SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, lotSl );
//Changed by sankara on 04/08/14 for multiple site canada
pstmt.setString( 2, siteCode );
rs = pstmt.executeQuery();
if( rs.next() )
{
......@@ -791,9 +802,13 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
}
//End changes by gulzar - 12/28/2011
//Added By Mahesh Patidar on 29/06/12
sql = "SELECT QUANTITY FROM STOCK WHERE LOT_SL = ? ";
//changed by sankara on 04/08/14 for multiple site code canada
//sql = "SELECT QUANTITY FROM STOCK WHERE LOT_SL = ? ";
sql = "SELECT QUANTITY FROM STOCK WHERE LOT_SL = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lotSl);
//changed by sankara on 04/08/14 for multiple site code canada
pstmt.setString(2, siteCode);
rs = pstmt.executeQuery();
while( rs.next() )
{
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ 21d8a1a2
......@@ -785,7 +785,32 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
errFields.add( childNodeName.toLowerCase() );
}
s.clear();
//Changed by sumit on 23/01/13 validating repeat ptcn end
//Changed by sumit on 23/01/13 validating repeat ptcn end
//changed by sankara on 04/08/14 for duplicate site start.
String despatchsiteCode = "";
siteCode = checkNull(genericUtility.getColumnValue("site_code", dom1));
refId = checkNull(genericUtility.getColumnValue("ref_id", dom));
System.out.println("siteCode::::::"+siteCode);
System.out.println("refId::::::"+refId);
sql = " SELECT SITE_CODE FROM DESPATCH WHERE DESP_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
rs = pstmt.executeQuery();
if( rs.next() )
{
despatchsiteCode = checkNull(rs.getString("SITE_CODE"));
System.out.println("despatchsiteCode::::::"+despatchsiteCode);
}
rs.close();rs = null;
pstmt.close();pstmt = null;
if( !siteCode.equalsIgnoreCase(despatchsiteCode) )
{
errList.add( "VTSITEDIFR" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by sankara on 04/08/14 for duplicate site end.
}
......
webitm-wms/module-resource/sql/update.sql
View file @ 21d8a1a2
......@@ -47399,6 +47399,36 @@ commit;
--End Dharnaj Changes on 02/08/14
commit;
-- changed by sankara on 06/08/14 for multiple site 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 (
'VTSITEDIFR',
'Site Code Different',
'Despatch Site Code is different from login Site Code ',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'BASE ',
'BASE ',
NULL,
NULL);
commit;
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