changes for updating record

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96093 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/DistIssWiz.java

@@ -147,10 +147,10 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 					childNode = childNodeList.item(ctr);
 					childNodeName = childNode.getNodeName();
 
-					if(childNodeName.equalsIgnoreCase("dist_order"))
+					if(childNodeName.equalsIgnoreCase("dist_order1"))
 					{
 
-						distOrder = genericUtility.getColumnValue("dist_order",dom);
+						distOrder = genericUtility.getColumnValue("dist_order1",dom);
 
 						if (distOrder == null || distOrder.trim().length() == 0)
 						{
@@ -255,13 +255,30 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 					System.out.println("value of child node : "+childNode);
 
 
+					if(childNodeName.equalsIgnoreCase("add_user"))
+					{/*
+						System.out.println("in add user val");
 					
-					if("E".equalsIgnoreCase(editFlag))
-					{
 						addUser = genericUtility.getColumnValue("add_user",dom2);
 						chgUser = genericUtility.getColumnValue("chg_user",dom2);
-						System.out.println("addUser><><"+addUser+"chgUserDD"+chgUser);
+						distOrder = genericUtility.getColumnValue("dist_order1", dom1);
+						System.out.println("addUser><><"+addUser+"chgUserDD"+chgUser+"<D<V<V<V"+distOrder);
 						if ((addUser != null && addUser.trim().length() > 0) && (chgUser != null && chgUser.trim().length() > 0))
+						{
+							
+							sql = "select count(1) from distorder where dist_order = ?";
+							pstmt=conn.prepareStatement(sql);
+							pstmt.setString(1,distOrder);
+							rs = pstmt.executeQuery();
+							if(rs.next())
+							{
+								cnt = rs.getInt(1);
+							}
+							pstmt.close();
+							rs.close();
+							pstmt = null;
+							rs = null;
+							if(cnt > 0)
 							{
 								if(!addUser.equalsIgnoreCase(chgUser))
 								{
@@ -270,8 +287,11 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 									break;
 								}
 							}
+							
+							
 						}
 					
+				*/}
 					if(childNodeName.equalsIgnoreCase("tran_code"))
 					{
 						tranCode = genericUtility.getColumnValue("tran_code",dom2);
@@ -720,6 +740,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 
 				System.out.println("itm_default >>>>> 2>>");
 				distOrder = genericUtility.getColumnValue("dist_order1", dom1);
+				
 				sql = "select count(1) from distord_iss where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and dist_order = ? and tran_ser = 'D-ISS'";
 				pstmt=conn.prepareStatement(sql);
 				pstmt.setString(1,distOrder);
@@ -771,8 +792,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 
 							valueXmlString.append("<Detail2  domID='1' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
 							valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
+							valueXmlString.append("<tran_id>").append("<![CDATA[" + (rs.getString("tran_id")==null?"":rs.getString("tran_id").trim()) + "]]>").append("</tran_id>");
 							
-							valueXmlString.append("<tran_id><![CDATA["+(rs.getString("tran_id")==null?"":rs.getString("tran_id").trim())+"]]></tran_id>");
 							
 							simpleDateFormat=new SimpleDateFormat(genutility.getApplDateFormat());
 							currDate = rs.getTimestamp("tran_date");
@@ -797,7 +818,7 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 							valueXmlString.append("<amount><![CDATA[0]]></amount>");
 							valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
 							valueXmlString.append("<net_amt><![CDATA[0]]></net_amt>");
-							valueXmlString.append("<remarks><![CDATA[]]></remarks>");
+							valueXmlString.append("<remarks><![CDATA["+(rs.getString("remarks")==null?"":rs.getString("remarks").trim())+"]]></remarks>");
 							valueXmlString.append("<frt_type><![CDATA[T]]></frt_type>");
 							valueXmlString.append("<chg_user><![CDATA["+(rs.getString("CHG_USER")==null?"":rs.getString("CHG_USER").trim())+"]]></chg_user>");
 							valueXmlString.append("<chg_term><![CDATA["+(rs.getString("CHG_TERM")==null?"":rs.getString("CHG_TERM").trim())+"]]></chg_term>");
@@ -1144,7 +1165,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 					{
 						valueXmlString.append("<Detail3 domID='" +rs.getInt("line_no")+ "'  objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
 						valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
-						valueXmlString.append("<tran_id><![CDATA["+tranid+"]]></tran_id>");
+						//valueXmlString.append("<tran_id><![CDATA["+tranid+"]]></tran_id>");
+						valueXmlString.append("<tran_id>").append("<![CDATA[" + tranid + "]]>").append("</tran_id>");
 						valueXmlString.append("<dist_order><![CDATA["+distOrder+"]]></dist_order>");
 						valueXmlString.append("<line_no_dist_order><![CDATA["+rs.getInt("line_no_dist_order")+"]]></line_no_dist_order>");
 						valueXmlString.append("<line_no><![CDATA["+rs.getInt("line_no")+"]]></line_no>");