Changes during testing

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

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

@@ -105,7 +105,7 @@ public class WorkorderRelease extends ProcessEJB implements WorkorderReleaseLoca
 	
 		String sql = null, mfgDateOn = "";
 
-		String siteCode = "", bomCode = "", status = "", orderType = "", lotNoIssue = "", itemCode = "", saleOrder = "", routeCode = "";
+		String siteCode = "", bomCode = "", status = "", orderType = "", lotNoIssue = "", itemCode = "", saleOrder = "", routeCode = "",templateName = "";
 		double quantity = 0;
 		int count = 0,mfgLeadTime = 0;
 		java.sql.Timestamp dueDate = null, mfgDate = null, expDate = null, today = null, mfgDateWO = null, expDateWO = null, completionDate = null;
@@ -332,12 +332,12 @@ public class WorkorderRelease extends ProcessEJB implements WorkorderReleaseLoca
 
 				sql = " INSERT INTO WORDER_RT_STEPS (" 
 					+ " WORK_ORDER, OPERATION, SEQ_NO, SEQ_NO__LEVEL, "
-					+ " DESCR, 	STATUS, SCH_DATE, START_DATE, END_DATE, DATA_XML )"
-					+ " VALUES ( ?,?,?,?,?,?,?,?,?,XmlType(?))" ; 
+					+ " DESCR, 	STATUS, SCH_DATE, START_DATE, END_DATE, TEMPLATE_NAME, DATA_XML )"
+					+ " VALUES ( ?,?,?,?,?,?,?,?,?,?,XmlType(?))" ; 
 				pstmtInsert = conn.prepareStatement( sql );
 
-				sql = "SELECT P.OPERATION, P.SEQ_NO, P.SEQ_NO__LEVEL,P.DESCR, T.DEFAULT_XML "
-					+ " FROM procroute_oper_instr p, BMR_TEMPLETE T "
+				sql = "SELECT P.OPERATION, P.SEQ_NO, P.SEQ_NO__LEVEL,P.DESCR, T.TEMPLATE_NAME, T.DEFAULT_XML.getClobval() "
+					+ " FROM procroute_oper_instr p, BMR_TEMPLATE T "
 					+ " WHERE T.TEMPLATE_CODE = P.TEMPLATE_CODE "
 					+ " AND P.ROUTE_CODE = ? ";
 				pstmt = conn.prepareStatement( sql );
@@ -354,7 +354,8 @@ public class WorkorderRelease extends ProcessEJB implements WorkorderReleaseLoca
 					pstmtInsert.setTimestamp( 7, mfgDate); // rs.getTimestamp("SCH_DATE") );
 					pstmtInsert.setTimestamp( 8, mfgDate); // rs.getTimestamp("START_DATE") );
 					pstmtInsert.setTimestamp( 9, dueDate); //rs.getTimestamp("END_DATE") );
-					pstmtInsert.setString( 10, rs.getString("DEFAULT_XML") );
+					pstmtInsert.setString( 10, rs.getString("TEMPLATE_NAME") );
+					pstmtInsert.setString( 11, rs.getString(6) );
 					
 					pstmtInsert.addBatch();
 				}
@@ -374,8 +375,9 @@ public class WorkorderRelease extends ProcessEJB implements WorkorderReleaseLoca
 				pstmtInsert = conn.prepareStatement( sql );
 				
 				pstmtInsert.setTimestamp(1,new Timestamp(System.currentTimeMillis()));
-				pstmtInsert.setTimestamp(3,new Timestamp(System.currentTimeMillis()));
+				pstmtInsert.setTimestamp(2,today);
 				pstmtInsert.setTimestamp(3,dueDate);
+				pstmtInsert.setString(4,workOrder);
 				count = pstmtInsert.executeUpdate();
 			}