bug fixing

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

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java

@@ -183,7 +183,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					if( connStatus )//Condition added - 25/11/11 - Gulzar as confirm method is called from post save component
 					{
 						conn.commit();
-						retString = itmDBAccessLocal.getErrorString("","VTMCONF20","");
+						retString = itmDBAccessLocal.getErrorString("","VTMCONF2","");
 					}
 				}
 				else
@@ -3677,7 +3677,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 
 					//ldt_qcduedate = datetime(relativedate(date(ldt_tran_date),lc_qcleadtime))
 
-					sql = "SELECT ITEM_SER , QC_REQD, PROC_MTH  FROM SITEITEM WHERE ITEM_CODE = ? AND SITE_CODE = ? ";
+					sql = "SELECT SITEITEM.ITEM_SER , SITEITEM.QC_REQD, SITEITEM. PROC_MTH,ITEM.QC_REQD_TYPE  FROM SITEITEM , ITEM WHERE ITEM.ITEM_CODE = SITEITEM.ITEM_CODE AND SITEITEM.ITEM_CODE = ? AND SITEITEM.SITE_CODE = ? ";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, itemCode);
 					pstmt1.setString(2, siteCode);
@@ -3687,6 +3687,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						itemSer = checkNull(rs1.getString("ITEM_SER"));
 						qcReqdSite = checkNull(rs1.getString("QC_REQD"));
 						procMth = checkNull(rs1.getString("PROC_MTH"));
+						qcType = checkNull(rs1.getString("QC_REQD_TYPE")); //added by Kunal Mandhre on 29/10/12
 					}
 					else
 					{
@@ -3714,15 +3715,19 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					{
 						qtySample = 0.0; 
 					}
-
-					if ( qcType == null )
+					
+					if ( qcType == null || qcType.trim().length() == 0) //change done by Kunal on 26/10/12 add trim() cond. 
 					{
 						qcType = "S";
 					}
+					System.out.println("qc type new = "+qcType);
 
 					if ( "S".equalsIgnoreCase(qcType) && "Y".equalsIgnoreCase(qcReqdSite) ) 
 					{
-						sql = "SELECT LINE_NO, LOC_CODE	, LOT_NO, LOT_SL, (CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END + CASE		   WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END) , (CASE WHEN CONV__QTY_STDUOM IS NULL         THEN 1 ELSE CONV__QTY_STDUOM END) , UNIT__STD, (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END)	       , EXPIRY_DATE , PURC_ORDER, LINE_NO__ORD ,  UNIT, (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF          END ) , MFG_DATE FROM  PORCPDET WHERE TRAN_ID   = ? AND   ITEM_CODE = ? ORDER BY LINE_NO ASC";
+						//change done by Kunal on 26/10/12 rename column as   CONV__QTY_STDUOM,SPEC_REF,BATCH_NO
+						sql = "SELECT LINE_NO, LOC_CODE	, LOT_NO, LOT_SL, (CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END + CASE		   WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END) , (CASE WHEN CONV__QTY_STDUOM IS NULL         THEN 1 ELSE CONV__QTY_STDUOM END) as CONV__QTY_STDUOM ,"
+							+" UNIT__STD, (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) as BATCH_NO	       , EXPIRY_DATE , PURC_ORDER, LINE_NO__ORD ,  "
+							+" UNIT, (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF          END ) as SPEC_REF, MFG_DATE FROM  PORCPDET WHERE TRAN_ID   = ? AND   ITEM_CODE = ? ORDER BY LINE_NO ASC";
 						pstmt1 = conn.prepareStatement(sql);
 						pstmt1.setString(1, tranId);
 						pstmt1.setString(2, itemCode);
@@ -3734,7 +3739,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							lotNoRcp =  checkNull(rs1.getString("LOT_NO"));
 							lotSl =  checkNull(rs1.getString("LOT_SL"));
 							qty	= rs1.getDouble(5);
-							convQty =  rs1.getDouble("CONV__QTY_STDUOM");
+							convQty =  rs1.getDouble("CONV__QTY_STDUOM"); 
 							unit = checkNull(rs1.getString("UNIT__STD"));
 							batchNo	  = checkNull(rs1.getString("BATCH_NO")); 
 							expiryDate =  rs1.getTimestamp("EXPIRY_DATE") ;
@@ -3783,7 +3788,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 								rs2 = pstmt2.executeQuery();
 								if ( rs2.next() )
 								{
-									spec = checkNull(rs2.getString("SPEC_REF"));
+									spec = checkNull(rs2.getString(1));
 								}
 								pstmt2.close();
 								pstmt2 = null;
@@ -3808,6 +3813,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							System.out.println("xmlValues  :["+xmlValues+"]");
 							TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", commonConstants.DB_NAME);
 							qcNo = tg.generateTranSeqID("QC-ORD", "qorder_no", key, conn);
+							System.out.println("qcNo1="+qcNo);
 							
 							if ( "ERROR".equals(qcNo) )
 							{
@@ -3822,17 +3828,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							else
 							{
 								sql = "SELECT LOC_CODE__APRV, LOC_CODE__REJ FROM SITEITEM WHERE SITE_CODE = ? AND ITEM_CODE = ? ";
-								pstmtSql = conn.prepareStatement(sql);
-								pstmtSql.setString(1, siteCode);
-								pstmtSql.setString(2, itemCode);
-								rs2 = pstmtSql.executeQuery();
+								pstmt2 = conn.prepareStatement(sql);
+								pstmt2.setString(1, siteCode);
+								pstmt2.setString(2, itemCode);
+								rs2 = pstmt2.executeQuery();
 								if ( rs2.next() )
 								{
 									aprv = checkNull(rs2.getString("LOC_CODE__APRV"));
 									rej =  checkNull(rs2.getString("LOC_CODE__REJ"));
 								}
-								pstmtSql.close();
-								pstmtSql = null;
+								pstmt2.close();
+								pstmt2 = null;
 								rs2.close();
 								rs2 = null;
 
@@ -3983,12 +3989,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							+ " (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * "
 							+ " (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) IS NULL "
 							+ " THEN 0 ELSE (((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + "
-							+ " CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * "
+							+ " ( CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * "  //bug fixing done by kunal on 29/10/12 add bracket
 							+ " (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) END)) IS NULL THEN 0"
 							+ " ELSE (SUM(CASE WHEN (((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + "
 							+ " (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * "
 							+ " (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END)) IS NULL THEN "
-							+ " 0 ELSE ((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + "
+							+ " 0 ELSE ( ((CASE WHEN QUANTITY IS NULL THEN 0 ELSE QUANTITY END) + "  //bug fixing done by kunal on 29/10/12 add bracket
 							+ " (CASE WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END)) * "
 							+ " (CASE WHEN CONV__QTY_STDUOM IS NULL THEN 1 ELSE CONV__QTY_STDUOM END))END)) END, "
 							+ " MIN(LINE_NO), MFG_DATE ,LOT_NO, "
@@ -4010,9 +4016,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							unit = checkNull(rs1.getString(3));  
 						    qty	= rs1.getDouble(4); 
 							lineNo = checkNull(rs1.getString(5));
-							spec = checkNull(rs1.getString(6));
-							mfgDate = rs1.getTimestamp(7); 
-							lotNoRcp = checkNull(rs1.getString(8)); 
+							
+							spec = checkNull(rs1.getString(8));
+							mfgDate = rs1.getTimestamp(6); 
+							lotNoRcp = checkNull(rs1.getString(7)); 
 
 							sql = "SELECT PURC_ORDER, LINE_NO__ORD, EXPIRY_DATE	, LOT_SL , LINE_NO, MFG_DATE FROM PORCPDET WHERE		   TRAN_ID = ? AND ITEM_CODE = ? AND LOC_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE               BATCH_NO END) = ?";
 							pstmt2 = conn.prepareStatement(sql);
@@ -4067,6 +4074,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							System.out.println("xmlValues  :["+xmlValues+"]");
 							TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", commonConstants.DB_NAME);
 							qcNo = tg.generateTranSeqID("QC-ORD", "qorder_no", key, conn);
+							System.out.println("qcNo2="+qcNo);
 							
 							if ( "ERROR".equals(qcNo) )
 							{
@@ -4090,8 +4098,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 									aprv = checkNull(rs2.getString("LOC_CODE__APRV"));
 									rej = checkNull(rs2.getString("LOC_CODE__REJ"));
 								}
-								pstmtSql.close();
-								pstmtSql = null;
+								pstmt2.close();
+								pstmt2 = null;
 								rs2.close();
 								rs2 = null;
 
@@ -4122,7 +4130,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 									rs2 = pstmt2.executeQuery();
 									if ( rs2.next() )
 									{
-										spec =  checkNull(rs2.getString("SPEC_REF"));
+										spec =  checkNull(rs2.getString(1));
 									}
 									pstmt2.close();
 									pstmt2 = null;
@@ -4166,7 +4174,14 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 									}
 								}
 
-								sql = "INSERT INTO QC_ORDER( QORDER_NO, QORDER_TYPE, QORDER_DATE, SITE_CODE ,ITEM_CODE, ROUTE_CODE,		   QUANTITY, QTY_PASSED , QTY_REJECTED	, START_DATE , DUE_DATE	, PORCP_NO , PORCP_LINE_NO, LOT_NO,		   LOT_SL , CHG_DATE ,	CHG_USER, CHG_TERM	, LOC_CODE,	QTY_SAMPLE, STATUS,	UNIT, QC_CREATE_TYPE ,        BATCH_NO, EXPIRY_DATE, LOC_CODE__APRV , LOC_CODE__REJ , UNIT__SAMPLE, LOT_NO__NEW ,	RETEST_DATE        ,	EMP_CODE__QCAPRV, SPEC_REF, ITEM_CODE__NEW , MFG_DATE, EMP_CODE ) VALUES(                         ?,'I',?,?,?,NULL,?,? - ?,0	,?,?,?,?,?,?,?,?,?,?,?,'U',?,'A',?,?,?,?,?,?,?,?,?,?,?,? )";
+								sql = "INSERT INTO QC_ORDER( QORDER_NO, QORDER_TYPE, QORDER_DATE, SITE_CODE ,ITEM_CODE, ROUTE_CODE,		   QUANTITY, QTY_PASSED ,"
+									+" QTY_REJECTED	, START_DATE , DUE_DATE	, PORCP_NO , PORCP_LINE_NO, LOT_NO,	LOT_SL , CHG_DATE ,	CHG_USER, CHG_TERM	,"
+									+" LOC_CODE,	QTY_SAMPLE, STATUS,	UNIT, QC_CREATE_TYPE ,  BATCH_NO, EXPIRY_DATE, "
+									+" LOC_CODE__APRV , LOC_CODE__REJ , UNIT__SAMPLE, LOT_NO__NEW ,	RETEST_DATE  ,	EMP_CODE__QCAPRV, "
+									+" SPEC_REF, ITEM_CODE__NEW , MFG_DATE, EMP_CODE ) " 
+									+" VALUES(  ?,?,?,?,?,?,?,? ,?	," //bug fixing done by kunal on 29/10/12 
+									+" ?,?,?,?,?,?,?,?,?,?,?,?,?,?,"
+									+" ?,?,?,?,?,?,?,?,?,?,?,? )";
 								pstmtInsert = conn.prepareStatement(sql);
 								pstmtInsert.setString(1, qcNo);
 								pstmtInsert.setString(2, "I");
@@ -4175,7 +4190,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 								pstmtInsert.setString(5, itemCode);
 								pstmtInsert.setString(6, null);
 								pstmtInsert.setDouble(7, qty);
-								pstmtInsert.setDouble(8, qty - qtySample);
+								double qtypass =  qty - qtySample;
+								//pstmtInsert.setDouble(8, qty - qtySample);
+								pstmtInsert.setDouble(8, qtypass);
 								pstmtInsert.setDouble(9, 0);
 								pstmtInsert.setTimestamp(10, tranDate);
 								pstmtInsert.setTimestamp(11, qcDueDate);
@@ -4293,6 +4310,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							System.out.println("xmlValues  :["+xmlValues+"]");
 							TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", commonConstants.DB_NAME);
 							qcNo = tg.generateTranSeqID("QC-ORD", "qorder_no", key, conn);
+							System.out.println("qcNo3="+qcNo);
 							
 							if ( "ERROR".equals(qcNo) )
 							{
@@ -4503,6 +4521,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						System.out.println("xmlValues  :["+xmlValues+"]");
 						TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", commonConstants.DB_NAME);
 						qcNo = tg.generateTranSeqID("QC-ORD", "qorder_no", key, conn);
+						System.out.println("qcNo4="+qcNo);
 						
 						if ( "ERROR".equals(qcNo) )
 						{