changes for adding addDate,addUser,addTerminal for workorder_receipt

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

webitm-mfg/ibase/webitm/ejb/mfg/WorkOrdRcpDet.java

@@ -678,6 +678,8 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 		String xmlString = "";
 		String todayDate = "";
 		String noOfArts = "";
+		String addUser1="",addTerm1="",saddDate="";
+		java.sql.Timestamp addDate = null;
 		try
 		{   
 
@@ -742,7 +744,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 							sql = "select a.tran_id,a.tran_date,a.site_code,a.work_order,a.date__start,"
 									+ "a.item_code,b.descr,a.loc_code,a.lot_sl,a.quantity,a.no_art,a.unit,a.lot_no,a.gross_weight,a.net_weight," 
 									+" a.qc_reqd,a.tran_type, a.operation, a.date__compl,a.exp_date,a.site_code__own,a.pack_code,a.confirmed,a.mfg_date,"
-									+ "a.conv__qty_stduom,a.unit__std,a.std_qty,a.create_stab,a.loc_code__aprv,a.potency_perc,a.lock_group,a.conf_date "
+									+ "a.conv__qty_stduom,a.unit__std,a.std_qty,a.create_stab,a.loc_code__aprv,a.potency_perc,a.lock_group,a.conf_date,a.add_user,a.add_term,a.add_date  "
 									+ "FROM workorder_receipt a,item b WHERE a.item_code = b.item_code  and CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and work_order = ?";
 							pstmt=conn.prepareStatement(sql);
 							pstmt.setString(1,workOrder);
@@ -784,6 +786,9 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 								potencyPerc = rs.getDouble("potency_perc");
 								locGrp = rs.getString("lock_group") == null ? "":rs.getString("lock_group");
 								confDate = rs.getTimestamp("conf_date");
+								addUser1 = rs.getString("add_user") == null ? "":rs.getString("add_user");//added by chandrashekar on 11-11-2014
+								addTerm1 = rs.getString("add_term") == null ? "":rs.getString("add_term");//added by chandrashekar on 11-11-2014
+								addDate = rs.getTimestamp("add_date");//added by chandrashekar on 11-11-2014
 								tareWeight = grossWeight - netWeight;
 								
 								simpleDateFormat=new SimpleDateFormat(genutility.getApplDateFormat());
@@ -811,6 +816,10 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 								{
 									sConfDate = simpleDateFormat.format(confDate);
 								}
+								if(addDate != null)
+								{
+									saddDate = simpleDateFormat.format(addDate);
+								}
 								
 								sdf=new SimpleDateFormat(genutility.getApplDateFormat());
 								tdate = new java.sql.Timestamp(System.currentTimeMillis()) ;
@@ -863,9 +872,9 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
 								//valueXmlString.append("<process_hours>").append("<![CDATA[0]]>").append("</process_hours>");
 								valueXmlString.append("<potency_perc>").append("<![CDATA[" + potencyPerc + "]]>").append("</potency_perc>");
 								/*valueXmlString.append("<emp_code__aprv>").append("<![CDATA[" + userId + "]]>").append("</emp_code__aprv>"); */
-								//valueXmlString.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>"); //changes done by deepak
-								//valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
-								//valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
+								valueXmlString.append("<add_user>").append("<![CDATA[" + addUser1 + "]]>").append("</add_user>"); //changes done by deepak
+								valueXmlString.append("<add_term>").append("<![CDATA[" + addTerm1 + "]]>").append("</add_term>");
+								valueXmlString.append("<add_date>").append("<![CDATA[" + saddDate + "]]>").append("</add_date>");
 								valueXmlString.append("<lock_group>").append("<![CDATA[" + locGrp + "]]>").append("</lock_group>");
 								valueXmlString.append("</Detail2>");