Scrap item considered in QC transfer

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

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

@@ -3,6 +3,7 @@ package ibase.webitm.ejb.mfg;
 import java.rmi.RemoteException;
 import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.*;
+import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.dis.StockUpdate;
 import ibase.webitm.ejb.sys.CreateRCPXML;
 import org.w3c.dom.*;
@@ -164,11 +165,15 @@ QCTransferConfLocal, QCTransferConfRemote
 		String available="";
 		double aprvLeadTime = 0;
 		Timestamp qcOrderDate = null,newQCOrderDate=null; // added by cpatil on 02/11/13
+		String qcOrderItem="";
+		String qcOrdItemUnit="",byprodUnit="";
+		double convertedQty=0;
+		boolean isByProduct=false;
 
 		try 
 		{
 			StockUpdate stockUpdate = new StockUpdate();
-
+			DistCommon dcommon=new DistCommon();
 			System.out.println("@@@@@@@@@@@@@@@ confirmQcTransfer method called next..............");
 			Calendar currentDate = Calendar.getInstance();
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -202,7 +207,7 @@ QCTransferConfLocal, QCTransferConfRemote
 			pstmt = null;
 
 
-			sql = " Select status,Quantity from qc_order where qorder_no = ? ";
+			sql = " Select status,Quantity,item_code from qc_order where qorder_no = ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, qorderNo);
 			rs = pstmt.executeQuery();
@@ -211,6 +216,8 @@ QCTransferConfLocal, QCTransferConfRemote
 				cnt++;
 				status = rs.getString("status");
 				qcQty= rs.getDouble("Quantity");
+				qcOrderItem= rs.getString("item_code");
+				
 			}
 			rs.close();
 			rs = null;
@@ -314,8 +321,47 @@ QCTransferConfLocal, QCTransferConfRemote
 				rs = null;
 				pstmt.close();
 				pstmt = null;
+				sql="SELECT UNIT FROM ITEM WHERE ITEM_CODE=?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1,itemCode);
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					byprodUnit=rs.getString("UNIT");
+				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
 				
+				sql="SELECT UNIT FROM ITEM WHERE ITEM_CODE=?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1,qcOrderItem);
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					qcOrdItemUnit=rs.getString("UNIT");
+				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
+				
+				//if(!byprodUnit.equalsIgnoreCase(qcOrdItemUnit))
+				if(!qcOrderItem.equalsIgnoreCase(itemCode))
+				{
+					convertedQty=dcommon.convQtyFactor(byprodUnit, qcOrdItemUnit, "X", qty, conn);
+					if(qcQty < convertedQty )
+					{
+						errCode = "QCTRFQTY";    //'QC Transfer quantity more then QC Order Quantity'
+						return errCode;
+					}
+					isByProduct=true;
+					itemCode=qcOrderItem;
 					
+				}
+				else
+				{
 					if(qcQty < qty )
 					{
 						errCode = "QCTRFQTY";    //'QC Transfer quantity more then QC Order Quantity'
@@ -324,6 +370,10 @@ QCTransferConfLocal, QCTransferConfRemote
 				}
 				
 				
+				
+			}
+
+
 			if ( errCode == null || errCode.trim().length() == 0 )
 			{		
 				cnt=0;
@@ -334,7 +384,15 @@ QCTransferConfLocal, QCTransferConfRemote
 						" from  Stock" +
 						" Where item_code = ? and site_code = ? and loc_code = ? and lot_no = ? and lot_Sl = ? ";
 				pstmt = conn.prepareStatement(sql);
+				if(isByProduct)
+				{
+					pstmt.setString(1, qcOrderItem);
+				}
+				else
+				{
 					pstmt.setString(1, itemCode);	
+				}
+				
 				pstmt.setString(2, siteCode);
 				pstmt.setString(3, fromLoc);
 				pstmt.setString(4, lotNo);
@@ -391,7 +449,14 @@ QCTransferConfLocal, QCTransferConfRemote
 				{	
 					sql = " Select unit From item where item_code = ? ";
 					pstmt =  conn.prepareStatement(sql);
+					if(isByProduct)
+					{
+						pstmt.setString(1,qcOrderItem);
+					}
+					else
+					{
 						pstmt.setString(1,itemCode);
+					}
 					rs = pstmt.executeQuery();
 					if(rs.next())
 					{   
@@ -418,14 +483,31 @@ QCTransferConfLocal, QCTransferConfRemote
 					stockUpd.put("tran_type", "I");
 					stockUpd.put("tran_ser","QC-TRF" );
 					stockUpd.put("tranid",tranId );   //pending
+					if(isByProduct)
+					{
+						stockUpd.put("item_code", qcOrderItem);
+					}
+					else
+					{
 						stockUpd.put("item_code", itemCode);	
+					}
+					
 					stockUpd.put("site_code", siteCode);
 					stockUpd.put("loc_code", fromLoc );
 					stockUpd.put("lot_no",lotNo );
 					stockUpd.put("lot_sl",lotSl );
 					stockUpd.put("tran_date", tranDate);
+					if(isByProduct)
+					{
+						stockUpd.put("quantity",convertedQty );
+						stockUpd.put("qty_stduom",convertedQty );
+					}
+					else
+					{
 						stockUpd.put("quantity",qty );
 						stockUpd.put("qty_stduom",qty );	
+					}
+					
 
 					if ( qtyPerArt == 0 )		//isnull(lc_qtyperart) or lc_qtyperart = 0 then 
 					{
@@ -464,6 +546,12 @@ QCTransferConfLocal, QCTransferConfRemote
 					pstmt = null;
 
 
+					if(isByProduct)
+					{
+						stockUpd.put("quantity",qty );
+						stockUpd.put("qty_stduom",qty );	
+						stockUpd.put("item_code",itemCode);
+					}
 					stockUpd.put("tran_type", "R");
 					stockUpd.put("loc_code", toLoc );
 
@@ -493,6 +581,32 @@ QCTransferConfLocal, QCTransferConfRemote
 
 			if (errCode == null || errCode.trim().length() == 0 )
 			{																			//if  gs_run_mode = 'I' then
+				if(isByProduct)
+				{
+					if ( qcQty > convertedQty )
+					{	
+						sql = " Update qc_order set quantity = (quantity - ? ) where qorder_no = ? ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setDouble(1, convertedQty);
+						pstmt.setString(2, qorderNo);
+						updCnt = pstmt.executeUpdate();
+						pstmt.close();
+						pstmt = null;
+					}
+					else
+					{
+						sql = " Update qc_order set quantity = (quantity - ? ), status = 'C' where qorder_no = ? " ;
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setDouble(1, convertedQty);
+						pstmt.setString(2, qorderNo);
+						updCnt = pstmt.executeUpdate();
+						pstmt.close();
+						pstmt = null;
+					} //end if
+					
+				}
+				else
+				{	
 					if ( qcQty > qty )
 					{	
 						sql = " Update qc_order set quantity = (quantity - ? ) where qorder_no = ? ";
@@ -513,6 +627,7 @@ QCTransferConfLocal, QCTransferConfRemote
 						pstmt.close();
 						pstmt = null;
 					} //end if
+				}
 
 				if (updCnt == 0)   //         get_sqlcode() <> 0 then
 				{	
@@ -526,7 +641,15 @@ QCTransferConfLocal, QCTransferConfRemote
 					sql = " update qc_order_lots set quantity = (quantity - ? ) " +
 							" where qc_order = ? and lot_no = ? and lot_sl = ? ";
 					pstmt = conn.prepareStatement(sql);
+					//if(convertedQty>0)
+					if(isByProduct)
+					{
+						pstmt.setDouble(1, convertedQty);
+					}
+					else
+					{
 						pstmt.setDouble(1, qty);
+					}
 					pstmt.setString(2, qorderNo);
 					pstmt.setString(3, lotNo);
 					pstmt.setString(4, lotSl);