W15GSUN010 merged for firmplan

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

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

@@ -57,6 +57,7 @@ public class ExplodeBom
 	String itemActive = null;
 	String siteItemActive = null;
 	String workOrder = "";
+	String considerPartAlt = "";//Changed by wasim on 17-05-2016 for firm plan
 	int pevoper = 0;
 	SimpleDateFormat simpleDateFormat = null;
 	double perQty = 0,minPotencyPerc =0,netWeight =0;
@@ -170,7 +171,7 @@ public class ExplodeBom
 			+ " ITEM.ACTIVE,  "
 			//Changed by dadaso pawar  16/10/15[start]
 			+ " BOMDET.SUPP_CODE__MFG,CASE WHEN BOMDET.USE_INVSTATUS IS NULL THEN 'U' ELSE BOMDET.USE_INVSTATUS END AS USE_INVSTATUS,"
-			+ " BOMDET.MFG_REF,BOMDET.DIMENSION,CASE WHEN MIN_REQ_QTY IS NULL THEN 0 ELSE MIN_REQ_QTY END as MIN_REQ_QTY,BOMDET.ITEM_CATEGORY "
+			+ " BOMDET.MFG_REF,BOMDET.DIMENSION,CASE WHEN MIN_REQ_QTY IS NULL THEN 0 ELSE MIN_REQ_QTY END as MIN_REQ_QTY,BOMDET.ITEM_CATEGORY,BOMDET.CONSIDER_PARTIAL_ALT "
 			//Changed by Dadaso pawar 16/10/15[End]
 			+ " FROM BOMDET LEFT OUTER JOIN ITEM ON BOMDET.ITEM_CODE = ITEM.ITEM_CODE , BOM "
 			+ " WHERE BOMDET.BOM_CODE = BOM.BOM_CODE "
@@ -214,6 +215,7 @@ public class ExplodeBom
 								dimension = rs.getString("DIMENSION");
 								minReqQty = rs.getDouble("MIN_REQ_QTY");
 								itemCategory = rs.getString("ITEM_CATEGORY");
+								considerPartAlt = rs.getString("CONSIDER_PARTIAL_ALT");//Changed by wasim on 17-05-2016 for firm plan
 								
 								System.out.println("12/06/14 itemActive before[ " +itemActive + "]");
 								if (itemActive == null || "null".equals(itemActive))
@@ -581,6 +583,8 @@ public class ExplodeBom
 				 valueXmlString.append("<dimension>").append("<![CDATA[").append(dimension).append("]]>").append("</dimension>");
 				 valueXmlString.append("<min_req_qty>").append("<![CDATA[").append(minReqQty).append("]]>").append("</min_req_qty>");
 				 valueXmlString.append("<item_category>").append("<![CDATA[").append(itemCategory).append("]]>").append("</item_category>");
+				//Changed by wasim on 24-02-2016 to add consider_partial_alt column from bomdet
+				 valueXmlString.append("<consider_partial_alt>").append("<![CDATA[").append(considerPartAlt).append("]]>").append("</consider_partial_alt>");
 				 valueXmlString.append("</Detail>");
 				//Changed by Dadaso pawar on 08/09/15 [End] [D15GSUN002]
 

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

@@ -25,10 +25,10 @@ public class WorkOrderRoute
 			chgDate = getCurrtDate();
 			System.out.println("Current date ="+chgDate);
 			
-			sqlInsert = "INSERT INTO WORDER_ROUTE (WORK_ORDER,OPERATION,PROC_CODE,SEQ_NO,ROUTE_CODE,ITEM_CODE,WORK_CTR,MC_CODE,CHG_STAT,"
-					+ "OPER_STAT,QUANTITY,WAIT_TIME,SET_TIME,RUN_TIME,RESET_TIME,CHG_DATE,CHG_USER,CHG_TERM,DEPT_CODE,"
-					+ "AUTO_ISSUE,OPERATION_LEVEL,QC_REQD,DESCR,"
-					+ "WORK_CTR__ALT,MC_CODE__ALT) "
+			sqlInsert = "INSERT INTO WORDER_ROUTE (WORK_ORDER,OPERATION,PROC_CODE,SEQ_NO,ROUTE_CODE,ITEM_CODE,WORK_CTR,MC_CODE,CHG_STAT,"//9
+					+ "OPER_STAT,QUANTITY,WAIT_TIME,SET_TIME,RUN_TIME,RESET_TIME,CHG_DATE,CHG_USER,CHG_TERM,DEPT_CODE,"//19
+					+ "AUTO_ISSUE,OPERATION_LEVEL,QC_REQD,DESCR,"//23
+					+ "WORK_CTR__ALT,MC_CODE__ALT) "//25
 					+ "values (?,?,?,?,?,?,?,?,?,?,  ?,?,?,?,?,?,?,?,?,?,  ?,?,?,?,?)";
 			pstmtInsert = conn.prepareStatement(sqlInsert);
 			
@@ -124,7 +124,7 @@ public class WorkOrderRoute
 						pstmtInsert.setString(25, mcCodeAlt);
 						//pstmtInsert.setString(34, procInstr);
 						
-						pstmtInsert.executeQuery();
+						pstmtInsert.addBatch();
 						pstmtInsert.clearParameters();
 					}
 					pstmtInsert.executeBatch();