Commit 2f063688 authored by smanohar's avatar smanohar

For GIT stock update channel_partner flag stored in transaction header...

For GIT stock update channel_partner flag stored in transaction header considered instead of from master

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209272 ce508802-f39f-4f6c-b175-0d175dae99d5
parent daaade20
...@@ -227,6 +227,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -227,6 +227,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
Timestamp tranDate = null; Timestamp tranDate = null;
String confPasswd = ""; String confPasswd = "";
String poRcpTranId = "";//Modified by Anjali R. on [12/11/2018] String poRcpTranId = "";//Modified by Anjali R. on [12/11/2018]
String gitUpdate = "N";// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
try try
{ {
postordact=new PostOrderActivity(); postordact=new PostOrderActivity();
...@@ -239,21 +240,22 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -239,21 +240,22 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
// Changed by Manish on 28/04/16 for update nowait [start] // Changed by Manish on 28/04/16 for update nowait [start]
// sql = "select confirmed from despatch where desp_id = ?"; // sql = "select confirmed from despatch where desp_id = ?";
// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
sql = "select confirmed, lr_date from despatch where desp_id = ? for update "; sql = "select confirmed, lr_date,channel_partner from despatch where desp_id = ? for update ";
//sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status , lr_date from despatch where desp_id = ? for update "; //sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status , lr_date from despatch where desp_id = ? for update ";
} }
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME )) else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
sql = "select confirmed, lr_date from despatch (updlock) where desp_id = ? " ; sql = "select confirmed, lr_date,channel_partner from despatch (updlock) where desp_id = ? " ;
//sql = "SELECT confirmed, (CASE WHEN status IS NULL THEN 'P' ELSE status END) as status, lr_date from despatch (updlock) where desp_id = ? " ; //sql = "SELECT confirmed, (CASE WHEN status IS NULL THEN 'P' ELSE status END) as status, lr_date from despatch (updlock) where desp_id = ? " ;
} }
else else
{ {
sql = "select confirmed, lr_date from despatch where desp_id = ? for update nowait" ; sql = "select confirmed, lr_date,channel_partner from despatch where desp_id = ? for update nowait" ;
//sql = "select confirmed, (CASE WHEN status IS NULL THEN 'P' ELSE status END) as status,lr_date from despatch where desp_id = ? for update nowait" ; //sql = "select confirmed, (CASE WHEN status IS NULL THEN 'P' ELSE status END) as status,lr_date from despatch where desp_id = ? for update nowait" ;
} }
...@@ -266,6 +268,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -266,6 +268,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
lockSuccess = true; lockSuccess = true;
confirm = rs.getString("confirmed"); confirm = rs.getString("confirmed");
lrDate = rs.getTimestamp("lr_date"); lrDate = rs.getTimestamp("lr_date");
gitUpdate = rs.getString("channel_partner");// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
} }
else else
{ {
...@@ -276,7 +280,14 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -276,7 +280,14 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
System.out.println("confirm despatch....gitUpdate before["+gitUpdate + "]");
if (gitUpdate == null || gitUpdate.trim().length() == 0)
{
gitUpdate = "N";
}
System.out.println("confirm despatch....gitUpdate after["+gitUpdate + "]");
sql = "select ledg_post_conf from transetup where tran_window = 'w_despatch' "; sql = "select ledg_post_conf from transetup where tran_window = 'w_despatch' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1127,7 +1138,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -1127,7 +1138,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
// 23-Nov-16 manoharan wrong syntax // 23-Nov-16 manoharan wrong syntax
//if(channelPartner == "Y" && disLink == "E") //if(channelPartner == "Y" && disLink == "E")
// 01-Mar-2019 in case dis_link A also to be updated // 01-Mar-2019 in case dis_link A also to be updated
if("Y".equalsIgnoreCase(channelPartner) && ("E".equalsIgnoreCase(disLink) || "A".equalsIgnoreCase(disLink))) // 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
//if("Y".equalsIgnoreCase(channelPartner) && ("E".equalsIgnoreCase(disLink) || "A".equalsIgnoreCase(disLink)))
if("Y".equalsIgnoreCase(gitUpdate) && ("E".equalsIgnoreCase(disLink) || "A".equalsIgnoreCase(disLink)))
{ {
// 23-Nov-16 manoharan included in previous select and commented // 23-Nov-16 manoharan included in previous select and commented
/*sql = "select exp_date,mfg_date,site_code__mfg,pack_code,acct_code__inv,cctr_code__inv " /*sql = "select exp_date,mfg_date,site_code__mfg,pack_code,acct_code__inv,cctr_code__inv "
......
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