Modify SQL in PendingQCWorkOrder EJB for Grid, Graph and Excel method.

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

webitm-dashboard/ibase/dashboard/mfg/ejb/PendingQCWorkOrder.java

@@ -164,8 +164,11 @@ public class PendingQCWorkOrder  implements PendingQCWorkOrderLocal, PendingQCWo
 						"AND WORKORDER.WORK_ORDER=WORKORDER_RECEIPT.WORK_ORDER AND WORKORDER_RECEIPT.CONFIRMED='Y' " +
 						"AND workorder_receipt.lot_no=qc_order.lot_no AND workorder_receipt.tran_id=qc_order.porcp_no " +
 						"AND workorder_receipt.item_code=qc_order.item_code AND QC_ORDER.STATUS='U' and d.work_order=workorder.work_order " +
-						"GROUP BY  WORKORDER_RECEIPT.TRAN_DATE, SITEITEM.ITEM_SER ORDER BY CHK_VAL,no_of_days,SITEITEM.ITEM_SER) z " +
-						"GROUP BY z.no_of_days,z.ITEM_SER,z.CHK_VAL ORDER BY z.ITEM_SER) ORDER BY CHK_VAL ASC";
+						"AND SITEITEM.SITE_CODE=WORKORDER.SITE_CODE " + // Add below 3 condition on Date 14-10-2015 by Dhanendra
+						"AND WORKORDER.ITEM_CODE=WORKORDER_RECEIPT.ITEM_CODE " +
+						"AND WORKORDER.ITEM_CODE=D.ITEM_CODE " +
+						" GROUP BY  WORKORDER_RECEIPT.TRAN_DATE, SITEITEM.ITEM_SER ORDER BY CHK_VAL,no_of_days,SITEITEM.ITEM_SER) z " +
+						" GROUP BY z.no_of_days,z.ITEM_SER,z.CHK_VAL ORDER BY z.ITEM_SER) ORDER BY CHK_VAL ASC";
 			    
 				pstmt = conn.prepareStatement(sql);
 				rs = pstmt.executeQuery();
@@ -602,8 +605,11 @@ public class PendingQCWorkOrder  implements PendingQCWorkOrderLocal, PendingQCWo
 						"AND WORKORDER.WORK_ORDER=WORKORDER_RECEIPT.WORK_ORDER AND WORKORDER_RECEIPT.CONFIRMED='Y' " +
 						"AND workorder_receipt.lot_no=qc_order.lot_no AND workorder_receipt.tran_id=qc_order.porcp_no " +
 						"AND workorder_receipt.item_code=qc_order.item_code AND QC_ORDER.STATUS='U' and d.work_order=workorder.work_order " +
-						"GROUP BY  WORKORDER_RECEIPT.TRAN_DATE, SITEITEM.ITEM_SER ORDER BY CHK_VAL,no_of_days,SITEITEM.ITEM_SER) z " +
-						"GROUP BY z.no_of_days,z.ITEM_SER,z.CHK_VAL ORDER BY z.ITEM_SER) ORDER BY CHK_VAL ASC";
+						"AND SITEITEM.SITE_CODE=WORKORDER.SITE_CODE " + // Add below 3 condition on Date 14-10-2015 by Dhanendra
+						"AND WORKORDER.ITEM_CODE=WORKORDER_RECEIPT.ITEM_CODE " +
+						"AND WORKORDER.ITEM_CODE=D.ITEM_CODE " +
+						" GROUP BY  WORKORDER_RECEIPT.TRAN_DATE, SITEITEM.ITEM_SER ORDER BY CHK_VAL,no_of_days,SITEITEM.ITEM_SER) z " +
+						" GROUP BY z.no_of_days,z.ITEM_SER,z.CHK_VAL ORDER BY z.ITEM_SER) ORDER BY CHK_VAL ASC";
 			    
 			
 				pstmt = conn.prepareStatement(sql);
@@ -963,11 +969,12 @@ public class PendingQCWorkOrder  implements PendingQCWorkOrderLocal, PendingQCWo
 				String sql = "SELECT SEND_TO, COPY_TO, BLIND_COPY FROM MAIL_FORMAT WHERE FORMAT_CODE = '"+city+"'";
 				pstmt = conn.prepareStatement(sql);
 				rs = pstmt.executeQuery();
+				
 				if (rs.next())
 				{
-					toMailId     = checkNull(rs.getString("SEND_TO").trim());
-					ccMailId     = checkNull(rs.getString("COPY_TO").trim());
-					bccAddress   = checkNull(rs.getString("BLIND_COPY").trim());
+					toMailId     = checkNull(rs.getString("SEND_TO")).trim();
+					ccMailId     = checkNull(rs.getString("COPY_TO")).trim();
+					bccAddress   = checkNull(rs.getString("BLIND_COPY")).trim();
 					System.out.println("No of Users for PendingQCWorkOrder.getPDFByScheduler city = "+city+" --- toMailId ="+toMailId +"AND According to the ccMailId ======="+ccMailId+"---- bccAddress ==  "+bccAddress);
 				}
 
@@ -1145,7 +1152,10 @@ public class PendingQCWorkOrder  implements PendingQCWorkOrderLocal, PendingQCWo
 					"AND QC_ORDER.STATUS='U' and d.work_order=workorder.work_ordeR " +
 					"AND workorder_RECEIPT.site_code=E.SITE_CODE " +
 					"AND E.CITY in("+city+") " +
-					"GROUP By WORKORDER_RECEIPT.lot_no,workorder_receipt.confirmed, " +
+					"AND SITEITEM.site_CODE=Workorder.site_code " +  // Add below 3 condition on Date 14-10-2015 by Dhanendra
+					"AND WORKORDER.item_code=WORKORDER_RECEIPT.item_code " +
+					"AND WORKORDER.item_code=d.item_code " +
+					" GROUP By WORKORDER_RECEIPT.lot_no,workorder_receipt.confirmed, " +
 					"WORKORDER_RECEIPT.TRAN_DATE,wORKORDER.ORDER_TYPE,WORKORDER_RECEIPT.TRAN_ID, " +
 					"WORKORDER_RECEIPT.WORK_ORDER,WORKORDER_RECEIPT.DATE__START,WORKORDER_RECEIPT.DATE__COMPL, " +
 					"WORKORDER_RECEIPT.ITEM_CODE,SITEITEM.ITEM_SER,ITEM.DESCR,WORKORDER_RECEIPT.UNIT,QC_ORDER.QORDER_NO ," +