change in quantity for qc_order insert

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

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

@@ -2541,7 +2541,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						pstmtUpd = conn.prepareStatement(sql);
 						pstmtUpd.setDouble(1, detCost);
 						pstmtUpd.setString(2, tranId);
-						pstmtUpd.setString(3, lineNo);
+						//pstmtUpd.setString(3, lineNo);
+						pstmtUpd.setInt(3,Integer.parseInt(lineNo.trim()));//change done by kunal  on 6/11/12
 						updCnt = pstmtUpd.executeUpdate();
 						if ( updCnt != 1 )
 						{
@@ -3517,6 +3518,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		double passedQty = 0.0;
 		double qcLeadTime = 0.0;
 		double convQty = 0.0;
+		double quantity = 0.0, excessShortQty = 0.0 ,quantityStduom = 0.0; //added by Kunal on 5/11/12 
 
 		java.sql.Timestamp expiryDate = null;
 		java.sql.Timestamp qcDueDate = null;
@@ -3744,9 +3746,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					if ( "S".equalsIgnoreCase(qcType) && "Y".equalsIgnoreCase(qcReqdSite) ) 
 					{
 						//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 ,"
+						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";
+							+" UNIT, (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF          END ) as SPEC_REF, MFG_DATE, "
+							+"  ( CASE		   WHEN EXCESS_SHORT_QTY IS NULL THEN 0 ELSE EXCESS_SHORT_QTY END) as EXCESS_SHORT_QTY , ( CASE		   WHEN quantity__stduom IS NULL THEN 0 ELSE quantity__stduom END) as quantity__stduom " //added by kunal on 5/11/12
+							+" 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);
@@ -3767,6 +3772,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							unitPur	= checkNull(rs1.getString("UNIT"));	
 							spec = checkNull(rs1.getString("SPEC_REF"));	
 						    mfgDate = rs1.getTimestamp("MFG_DATE") ;
+						    //added by kunal on 5/11/12 start  as per Pravin Sali Sir instruction  
+							excessShortQty	= rs1.getDouble("EXCESS_SHORT_QTY"); //added by Kunal on 5/11/12
+							quantityStduom	= rs1.getDouble("quantity__stduom"); //added by Kunal on 5/11/12
+							System.out.println("excessShortQt ="+excessShortQty);
+							System.out.println("quantityStduom ="+quantityStduom);
+						    if(excessShortQty == 0)
+						    {
+						    	System.out.println("get qty from quantityStduom");
+						    	qty = quantityStduom;
+						    }
+						   //added by kunal on 5/11/12 end  as per Pravin Sali Sir instruction
 
 							//if ( "Q".equalsIgnoreCase(value) || "B".equalsIgnoreCase(value) )
 							//{
@@ -4017,7 +4033,8 @@ 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))END)) END, "
 							+ " MIN(LINE_NO), MFG_DATE ,LOT_NO, "
-							+ " ( CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) "
+							+ " ( CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END), "
+							+ " sum(case when excess_short_qty is null then 0 else excess_short_qty end) as excess_short_qty ,sum((case when quantity__stduom is null then 0 else quantity__stduom end)) as quantity__stduom " //added by kunal on 5/11/12
 							+ " FROM PORCPDET  WHERE TRAN_ID = ? "
 							+ " AND ITEM_CODE = ? "
 							+ " GROUP BY (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END), "
@@ -4039,6 +4056,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							spec = checkNull(rs1.getString(8));
 							mfgDate = rs1.getTimestamp(6); 
 							lotNoRcp = checkNull(rs1.getString(7)); 
+							//added by kunal on 5/11/12 start  as per Pravin Sali Sir instruction  
+							excessShortQty	= rs1.getDouble("excess_short_qty"); //added by Kunal on 5/11/12
+							quantityStduom	= rs1.getDouble("quantity__stduom"); //added by Kunal on 5/11/12
+							System.out.println("excessShortQt ="+excessShortQty);
+							System.out.println("quantityStduom ="+quantityStduom);
+						    if(excessShortQty == 0)
+						    {
+						    	System.out.println("qty get from qtystduom");
+						    	qty = quantityStduom;
+						    }
+						   //added by kunal on 5/11/12 end  as per Pravin Sali Sir instruction
 
 							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);
@@ -4304,7 +4332,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					}
 					else if ( "I".equalsIgnoreCase(qcType) && "Y".equalsIgnoreCase(qcReqdSite) )
 					{
-						sql = "SELECT LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) AS SPEC_REF, CASE WHEN (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) + (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)) 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) + (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 FROM PORCPDET WHERE		   TRAN_ID = ? AND ITEM_CODE = ? GROUP BY LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF		   END) ";
+						sql = "SELECT LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) AS SPEC_REF, CASE WHEN (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) + (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)) 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) + (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 ,sum(case when excess_short_qty is null then 0 else excess_short_qty end) as excess_short_qty ,sum((case when quantity__stduom is null then 0 else quantity__stduom end)) as quantity__stduom FROM PORCPDET WHERE		   TRAN_ID = ? AND ITEM_CODE = ? GROUP BY LOC_CODE , (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF		   END) ";
 						pstmt1 = conn.prepareStatement(sql);
 						pstmt1.setString(1, tranId);
 						pstmt1.setString(2, itemCode);
@@ -4313,7 +4341,18 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						{
 							locCode = checkNull(rs1.getString("LOC_CODE"));
 							spec = checkNull(rs1.getString("SPEC_REF"));
-							qty = rs1.getDouble("QUANTITY");
+							qty = rs1.getDouble(3);
+							//added by kunal on 5/11/12 start  as per Pravin Sali Sir instruction
+							excessShortQty	= rs1.getDouble("excess_short_qty"); //added by Kunal on 5/11/12
+							quantityStduom	= rs1.getDouble("quantity__stduom"); //added by Kunal on 5/11/12
+							System.out.println("excessShortQt ="+excessShortQty);
+							System.out.println("quantityStduom ="+quantityStduom);
+						    if(excessShortQty == 0)
+						    {
+						    	System.out.println("qty get from qty stduom");
+						    	qty = quantityStduom;
+						    }
+						   //added by kunal on 5/11/12 end  as per Pravin Sali Sir instruction
 							//tranDate = getCurrdateAppFormat(); 
 							xmlValues = "";
 							xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";