Skip to content

B
business-java
Commit 0c99cb11 authored by mchaudhari's avatar mchaudhari
Browse files
Options

Changes after demo 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96447 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 30dabdc1
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 17 deletions
webitm-dis/ibase/webitm/ejb/dis/ChgUserAlloc.java
View file @ 0c99cb11
......@@ -103,7 +103,7 @@ public class ChgUserAlloc extends ValidatorEJB implements ChgUserAllocLocal, Chg
ResultSet rs = null;
String sql = "";
String distOrderNo = "", chguser = "", chgUserNew = "";
String distOrderNo = "", chguser = "", chgUserNew = "", issDspNo = "";
try {
System.out.println("editFlag>>>>wf"+editFlag);
......@@ -181,6 +181,56 @@ public class ChgUserAlloc extends ValidatorEJB implements ChgUserAllocLocal, Chg
}
}
// Added by mahesh on 26-09-2014
else if(childNodeName.equalsIgnoreCase("iss_dsp_no")){
issDspNo = genericUtility.getColumnValue("iss_dsp_no",dom);
if (issDspNo == null || issDspNo.trim().length() == 0)
{
errCode = "ISSDSPNULL";
errString = getErrorString("iss_dsp_no",errCode,userId);
break;
}
else
{
sql = "select count(1) from distord_iss diss join distorder dord on dord.dist_order = diss.dist_order and dord.dist_order = ? and diss.tran_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrderNo);
pstmt.setString(2,issDspNo);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt = rs.getInt(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
sql = "select count(1) from sorder sord join despatch desp on sord.sale_order = desp.sord_no and sord.sale_order = ? and desp.desp_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrderNo);
pstmt.setString(2,issDspNo);
rs = pstmt.executeQuery();
if(rs.next())
{
cnt2 = rs.getInt(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
if(cnt == 0 && cnt2 == 0)
{
errCode = "ISDSPNOTEX";
errString = getErrorString("iss_dsp_no",errCode,userId);
break;
}
}
}
}
break;
case 2:
......@@ -309,7 +359,7 @@ public class ChgUserAlloc extends ValidatorEJB implements ChgUserAllocLocal, Chg
System.out.println("DOM322 Elements>>>********************************["+genericUtility.serializeDom(dom2).toString()+"]");
String sql="";
int cnt = 0, cnt2 = 0;
String distOrderNo = "";
String distOrderNo = "", issDspNo = "";
try
{
......@@ -340,13 +390,14 @@ public class ChgUserAlloc extends ValidatorEJB implements ChgUserAllocLocal, Chg
distOrderNo = genericUtility.getColumnValue("dist_order", dom1);
issDspNo = genericUtility.getColumnValue("iss_dsp_no", dom1);
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{
sql = "select count(1) from distorder dord join distord_iss diss on dord.dist_order = diss.dist_order and dord.dist_order = ? and dord.status = 'P' and dord.confirmed = 'Y'";
sql = "select count(1) from distord_iss where tran_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrderNo);
pstmt.setString(1,issDspNo);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -357,9 +408,9 @@ public class ChgUserAlloc extends ValidatorEJB implements ChgUserAllocLocal, Chg
pstmt = null;
rs = null;
sql = "select count(1) from sorder sord join despatch desp on sord.sale_order = desp.sord_no and sord.status = 'P' and sord.confirmed = 'Y' and sord.sale_order = ?";
sql = "select count(1) from despatch where desp_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,distOrderNo);
pstmt.setString(1,issDspNo);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -371,12 +422,12 @@ public class ChgUserAlloc extends ValidatorEJB implements ChgUserAllocLocal, Chg
rs = null;
if(cnt > 0){
sql = "select chg_user from distord_iss where dist_order = ? and (confirmed is null or confirmed = 'N')";
sql = "select chg_user from distord_iss where tran_id = ?";
}else{
sql = "select chg_user from despatch where sord_no = ? and (confirmed is null or confirmed = 'N')";
sql = "select chg_user from despatch where desp_id = ?";
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, distOrderNo);
pstmt.setString(1, issDspNo);
rs = pstmt.executeQuery();
if(rs.next())
{
......
webitm-dis/ibase/webitm/ejb/dis/ChgUserAllocPostSave.java
View file @ 0c99cb11
......@@ -61,7 +61,7 @@ public class ChgUserAllocPostSave extends ValidatorEJB implements ChgUserAllocPo
{
System.out.println("post save dom arg --------------- > "+dom);
String sql = "", error = "";
String distOrder="", chgTerm = "", chgUserNew = "";
String issDspNo="", chgTerm = "", chgUserNew = "";
String errString = "", errCode = "", chgUser = "", chgUserDom = "", userId = "";
int cnt = 0;
GenericUtility genericUtility;
......@@ -125,17 +125,17 @@ public class ChgUserAllocPostSave extends ValidatorEJB implements ChgUserAllocPo
detailListLength = parentNodeList.getLength();
for(ctr = 0; ctr < detailListLength; ctr++)
{
distOrder = GenericUtility.getInstance().getColumnValue("dist_order",dom);
issDspNo = GenericUtility.getInstance().getColumnValue("iss_dsp_no",dom);
//chgUserNew = GenericUtility.getInstance().getColumnValue("code",dom);
System.out.println("dist_order in DOM --->>" +distOrder);
System.out.println("issDspNo in DOM --->>" +issDspNo);
System.out.println("chgUserNew in DOM --->>" +chgUserNew);
sql = "update distord_iss set chg_user = ?, chg_term = ?, chg_date = sysdate where dist_order = ? and (confirmed is null or confirmed = 'N')";
sql = "update distord_iss set chg_user = ?, chg_term = ?, chg_date = sysdate where tran_id = ? and (confirmed is null or confirmed = 'N')";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, chgUserNew);
pstmt.setString(2, chgTerm);
pstmt.setString(3, distOrder);
pstmt.setString(3, issDspNo);
cnt = pstmt.executeUpdate();
if(pstmt != null){
......@@ -143,11 +143,11 @@ public class ChgUserAllocPostSave extends ValidatorEJB implements ChgUserAllocPo
pstmt = null;
}
sql = "update despatch set chg_user = ?, chg_term = ?, chg_date = sysdate where sord_no = ? and (confirmed is null or confirmed = 'N')";
sql = "update despatch set chg_user = ?, chg_term = ?, chg_date = sysdate where desp_id = ? and (confirmed is null or confirmed = 'N')";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, chgUserNew);
pstmt.setString(2, chgTerm);
pstmt.setString(3, distOrder);
pstmt.setString(3, issDspNo);
cnt = pstmt.executeUpdate();
if(pstmt != null){
......
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