Changes related to Process based costing as per SM sir.

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

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

@@ -770,7 +770,14 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
 					   valueXmlString.append("<proc_code protect = \"0\">").append("<![CDATA[" + procCode + "]]>").append("</proc_code>");
 					   procCodeLDesc=getColumnDescr(conn,"descr","process","proc_code",procCode);
 					   valueXmlString.append("<process_descr>").append("<![CDATA[" +procCodeLDesc+ "]]>").append("</process_descr>");					
+					   // 27-mar-2019 manoharan to set new proc_code__o
+					   valueXmlString.append("<proc_code__o protect = \"0\">").append("<![CDATA[" + procCode + "]]>").append("</proc_code__o>");
+					   // end 27-mar-2019 manoharan to set new proc_code__o
 					 }
+					 // 01-apr-2019 manoharan to set new proc_code__o
+					 procCodeLDesc=getColumnDescr(conn,"ohd_table__post","process","proc_code",procCode);
+					 valueXmlString.append("<ohd_table__post protect = \"0\">").append("<![CDATA[" + procCodeLDesc + "]]>").append("</ohd_table__post>");
+					 // end 01-apr-2019 manoharan to set new proc_code__o
 					 
 					
 				}
@@ -835,6 +842,10 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
 					System.out.println("Process code dom---->>["+procCodeL+"]");
 					procCodeLDesc=getColumnDescr(conn,"descr","process","proc_code",procCodeL);
 					valueXmlString.append("<process_descr>").append("<![CDATA[" +procCodeLDesc+ "]]>").append("</process_descr>");
+					 // 01-apr-2019 manoharan to set new proc_code__o
+					 procCodeLDesc=getColumnDescr(conn,"ohd_table__post","process","proc_code",procCodeL);
+					 valueXmlString.append("<ohd_table__post protect = \"0\">").append("<![CDATA[" + procCodeLDesc + "]]>").append("</ohd_table__post>");
+					 // end 01-apr-2019 manoharan to set new proc_code__o
 						
 				}
 				else if(currentColumn.trim().equalsIgnoreCase("work_ctr"))
@@ -879,6 +890,10 @@ public class WorkOrderRouteAlt extends ValidatorEJB implements WorkOrderRouteAlt
 						rs=null;
 						pstmt.close();
 						pstmt=null;
+						 // 01-apr-2019 manoharan to set new proc_code__o
+						 procCodeLDesc=getColumnDescr(conn,"ohd_table__post","process","proc_code",procCode);
+						 valueXmlString.append("<ohd_table__post protect = \"0\">").append("<![CDATA[" + procCodeLDesc + "]]>").append("</ohd_table__post>");
+						 // end 01-apr-2019 manoharan to set new proc_code__o
 						
 						sql="select work_ctr,mc_code,item_code from workorder_feedback where work_order = ? and operation = ?";
 						pstmt=conn.prepareStatement(sql);

webitm-mfg/ibase/webitm/ejb/mfg/adv/WorkOrderRouteAltConf.java

@@ -67,7 +67,8 @@ public class WorkOrderRouteAltConf  extends ActionHandlerEJB implements WorkOrde
 		try{
 			ConnDriver connDriver = null;
 			connDriver = new ConnDriver();
-			conn = connDriver.getConnectDB("DriverValidator");			
+			//conn = connDriver.getConnectDB("DriverValidator");
+			conn = getConnection();
 			conn.setAutoCommit(false);
 			String confirmed="";
 			sql = "select confirmed from worder_route_alt WHERE amd_no = ?";
@@ -1150,12 +1151,29 @@ public class WorkOrderRouteAltConf  extends ActionHandlerEJB implements WorkOrde
 	{
 		System.out.println("updateOnConfirmation--->>["+updateParamMapL+"]");		
 		PreparedStatement pstmt=null;
+		ResultSet rs=null;
 		int count=0;
-		String sql = "",sql1="";
+		String sql = "",sql1="", ohdTablePost= "";
 		try{
+
+		// 27-mar-2019 manoharan to update workorder_feedback with the new proc_code
+		sql1 = "select ohd_table__post from process where proc_code = ?";
+		pstmt=conn.prepareStatement(sql1);
+		pstmt.setString(1, updateParamMapL.get("procCode"));
+		rs=pstmt.executeQuery();
+		if(rs.next())
+		{
+			ohdTablePost=rs.getString("ohd_table__post");
+			
+		}
+		rs.close();
+		rs=null;
+		pstmt.close();
+		pstmt=null;
+
 		//sql="update worder_route set mc_code = ? where work_order = ? and operation = ?";
 		sql="update worder_route set mc_code = ?,item_code = ?,proc_code = ?,wait_time = ?,set_time = ?,"
-				+ "run_time = ?,reset_time = ?,work_ctr = ?,dept_code = ? where work_order = ? and operation = ?";
+				+ "run_time = ?,reset_time = ?,work_ctr = ?,dept_code = ?, ohd_table__post = ?  where work_order = ? and operation = ?";
 		pstmt=conn.prepareStatement(sql);
 		pstmt.setString(1, updateParamMapL.get("mcCode"));
 		pstmt.setString(2, updateParamMapL.get("itemCode"));
@@ -1165,12 +1183,10 @@ public class WorkOrderRouteAltConf  extends ActionHandlerEJB implements WorkOrde
 		pstmt.setDouble(6, Double.parseDouble(updateParamMapL.get("runT")));
 		pstmt.setDouble(7, Double.parseDouble(updateParamMapL.get("resetT")));
 		pstmt.setString(8, updateParamMapL.get("workCtr"));
-		
 		pstmt.setString(9, updateParamMapL.get("deptCode"));
-		
-		pstmt.setString(10, updateParamMapL.get("worder"));
-		pstmt.setInt(11, Integer.parseInt(updateParamMapL.get("operation")));
-		
+		pstmt.setString(10, ohdTablePost);
+		pstmt.setString(11, updateParamMapL.get("worder"));
+		pstmt.setInt(12, Integer.parseInt(updateParamMapL.get("operation")));
 		
 		count=pstmt.executeUpdate();
 		if(pstmt!=null){
@@ -1179,6 +1195,17 @@ public class WorkOrderRouteAltConf  extends ActionHandlerEJB implements WorkOrde
 		}
 		System.out.println("First count in updateOnConfirmation11-->>["+count+"]");
 		
+		//sql1="update workorder_feedback set p ohd_table__post = ? "
+		sql1="update workorder_feedback set ohd_table__post = ? "
+				+ " where work_order = ? and operation = ? and confirmed = 'N'";
+		pstmt=conn.prepareStatement(sql1);
+		pstmt.setString(1, ohdTablePost);
+		pstmt.setString(2, updateParamMapL.get("worder"));
+		pstmt.setInt(3, Integer.parseInt(updateParamMapL.get("operation")));
+	
+		count=pstmt.executeUpdate();
+		
+		// end  27-mar-2019 manoharan to update workorder_feedback with the new proc_code
 		sql1="update worder_route_alt set confirmed = ?,conf_date = sysdate,emp_code__aprv = ?"
 				+ " where amd_no = ?";
 		pstmt=conn.prepareStatement(sql1);