updated

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

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

@@ -102,36 +102,19 @@ public class WorderCampaign extends ProcessEJB implements WorderCampaignLocal, W
 		fromDate = genericUtility.getColumnValue("date_from", headerDom);
 		toDate = genericUtility.getColumnValue("date_to", headerDom);
 		System.out.println(">>>>>>fromDate"+fromDate+">>>>D"+toDate);
-		if(fromDate != null){
+		
 			System.out.println(">>>>>>>>>>MNNNN");
 	    fromDateDtUtil = sdf.parse(fromDate);
 		fromDateDtSql = new java.sql.Date(fromDateDtUtil.getTime());
-		}
-		if(toDate != null){
+		
+		
 			System.out.println(">>>>>>>>>>MNNNN>>>");
 		toDateDtUtil = sdf.parse(toDate);
 		toDateDtSql = new java.sql.Date(toDateDtUtil.getTime());
-		}
+		
 		
 	    }
-if(fromDate == null || toDate == null)
-{
-	sql ="SELECT WORKORDER.TRAN_ID,WORKORDER.WORK_ORDER,"
-    		+ "WORKORDER.ORDER_TYPE,"
-    		+ "WORKORDER.ITEM_CODE,WORKORDER.SITE_CODE,WORKORDER.QUANTITY,"
-    		+ "WORKORDER.ORD_DATE,WORKORDER.REL_DATE,WORKORDER.DUE_DATE,WORKORDER.STATUS,WORKORDER.STATUS_DATE,WORKORDER.ACCT_CODE__WP,"
-    		+ "WORKORDER.CCTR_CODE__WP,ITEM.SH_DESCR,WORKORDER.LOT_NO,WORKORDER.BOM_CODE,WORKORDER.CURRENT_BATCH_QTY,WORKORDER.VAL_MFG_TAXTRAN,"
-    		+ "WORKORDER.UNIT__STD,WORKORDER.CONV__QTY_STDUOM,WORKORDER.STD_QTY,WORKORDER.QUANTITY__MPS,"
-    		+ "ITEM.PHY_ATTRIB_1,ITEM.PHY_ATTRIB_2,ITEM.PHY_ATTRIB_3,"
-    		+ "ITEM.PHY_ATTRIB_4,ITEM.PHY_ATTRIB_5,ITEM.PHY_ATTRIB_6,"
-    		+ "WORKORDER.TRAN_ID__MPS,"
-    		+ "WORKORDER.ADD_DATE,WORKORDER.ADD_USER,WORKORDER.ADD_TERM,WORKORDER.CHG_DATE,"
-    		+ "WORKORDER.CHG_USER,WORKORDER.CHG_TERM,WORKORDER.CAMPGN_NO"
-    		+ " FROM"
-    		+ "  WORKORDER  WORKORDER,ITEM  ITEM";
-	pStmt = conn.prepareStatement(sql);
-	
-	}else{
+
 	    sql ="SELECT WORKORDER.TRAN_ID,WORKORDER.WORK_ORDER,"
 	    		+ "WORKORDER.ORDER_TYPE,"
 	    		+ "WORKORDER.ITEM_CODE,WORKORDER.SITE_CODE,WORKORDER.QUANTITY,"
@@ -148,8 +131,6 @@ if(fromDate == null || toDate == null)
 	    pStmt = conn.prepareStatement(sql);
 	    pStmt.setDate(1, fromDateDtSql);
 		pStmt.setDate(2, toDateDtSql);
-	}
-		
 	    rs = pStmt.executeQuery();
 	    while (rs.next()) {
 		dataFound = true;