calling of inv accounting and voucher generation dosne

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

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

@@ -13,10 +13,10 @@ import ibase.system.config.*;
 import ibase.webitm.utility.ITMException;
 
 import ibase.webitm.ejb.dis.DistCommon;
-import ibase.webitm.ejb.fin.FinCommon;
+import ibase.webitm.ejb.fin.*;
 import ibase.webitm.utility.TransIDGenerator;
 import ibase.webitm.ejb.ITMDBAccessEJB;
-import ibase.webitm.ejb.dis.StockUpdate;
+import ibase.webitm.ejb.dis.*;
 import ibase.webitm.ejb.dis.InvAllocTraceBean;	
 
 import java.io.*;
@@ -750,6 +750,20 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					retString = itmDBAccessLocal.getErrorString("","VTPORCP2","");	
 				}
 			}
+			if ( retString == null || retString.trim().length() == 0 ) 
+			{
+				InvAcct invAcct = new InvAcct();
+				retString = invAcct.acctPoRcpt( tranId, conn );
+				if ( retString != null && "CREATE-VOUCHER".equals(retString.trim()) )
+				{
+					CreatePoRcpVoucher createVouc = new CreatePoRcpVoucher();
+					retString = createVouc.createPoRcpVoucher( tranId, xtraParams, conn );
+				}
+				else if ( retString != null && retString.trim().length() > 0 )
+				{
+					retString = itmDBAccessLocal.getErrorString("",retString,"");
+				}
+			}
 			/*// not required for Taro to be done later
 			sql = "SELECT SALE_ORDER FROM PORDER A, PORCP B WHERE A.PURC_ORDER = B.PURC_ORDER AND B.TRAN_ID = ? ";
 			pstmtSql = conn.prepareStatement(sql);
@@ -821,7 +835,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		
 		PreparedStatement pstmt = null, pstmt1 = null;;
 		PreparedStatement pstmtUpd = null;
-		ResultSet rs = null, rs1 = null;;
+		PreparedStatement pstmtItemLotPack = null;
+		ResultSet rs = null, rs1 = null;
+		ResultSet rsItemLotPack = null;
 		String sql = "";
 		java.sql.Timestamp tranDate = null;
 		String siteRcp = "", tranSer = "",suppCode = "", currCode = "", invacctRate = "", errString = "" ;
@@ -838,6 +854,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		java.sql.Timestamp mfgDate = null, retestDate = null, expiryDate = null;
 
 		double  ordQuantity = 0, dlvQuantity =  0, batchSizeApprv = 0, effRate = 0, grossRate = 0;
+		double shipperSize = 0d, grossWt = 0d, netWt = 0d, tareWt = 0d;
+
 		String ordStatus =  "", siteCodeDet =  "", xmlValues = "", keyString = "",remarks = "";
 		String cctrCodeInv = "", acctCodeInv = "";
 		int lineNoInv = 0;
@@ -993,6 +1011,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 			}
 			
 			/////////////////////////////////////////////////
+			sql  = "SELECT SHIPPER_SIZE, GROSS_WEIGHT, NET_WEIGHT FROM ITEM_LOT_PACKSIZE WHERE ITEM_CODE = ? AND LOT_NO__FROM <= ? AND LOT_NO__TO >= ? ";
+				pstmtItemLotPack = conn.prepareStatement(sql);
+
 			sql = "select line_no, item_code, purc_order, quantity, " 
 				 + " unit, rate__stduom, discount, tax_amt, net_amt, }"
 				 + " loc_code, line_no__ord, canc_bo, lot_no, lot_sl, "
@@ -1046,6 +1067,27 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				receiptQty = rs.getDouble("excess_short_qty");
 				batchNo = rs.getString("batch_no");
 				noArt = rs.getDouble("no_art");
+				if ( noArt == 0 )
+				{
+					pstmtItemLotPack.setString(1, itemCode);
+					pstmtItemLotPack.setString(2, lotNo);
+					pstmtItemLotPack.setString(3, lotNo);
+					rsItemLotPack = pstmtItemLotPack.executeQuery();
+					if ( rsItemLotPack.next() )
+					{
+						shipperSize =  rsItemLotPack.getDouble("SHIPPER_SIZE");
+						grossWeight =  rsItemLotPack.getDouble("GROSS_WEIGHT");
+						netWeight =  rsItemLotPack.getDouble("NET_WEIGHT");
+						tareWeight = grossWeight - netWeight;
+						if ( shipperSize > 0 )
+						{
+							noArt = (int)(quantity / shipperSize);
+						}
+					}
+					rsItemLotPack.close();
+					rsItemLotPack = null;
+					pstmtItemLotPack.clearParameters();
+				}
 				mfgItemCode = rs.getString("item_code__mfg");
 				stdRate = rs.getDouble("std_rate");
 				effectStock = rs.getString("effect_stock");
@@ -1366,9 +1408,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						// added and rate > 0 by Manoj on 10/5/02 as per Kandarp since when sorder was posted 
 						// for free item and if porcp is created then eff rate and rate are 0 so to bypass that 
 						// check validation has been modified
-						if (effRate <= 0 && rate > 0 )
+						if ( effRate <= 0 && rate > 0 )
 						{
-							
 							errString = itmDBAccessLocal.getErrorString("","VTRATE","");
 		
 							String begPart = errString.substring(0,errString.indexOf("<message>")+9);
@@ -1381,8 +1422,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							break;
 						}
 						grossRate = calcEffRate(lineNo, receiptQty, rate, taxAmount, tranId,"G", conn );
-						
-						
 					}
 				
 					stkUpdMap.put("gross_rate",Double.toString(grossRate));
@@ -1422,9 +1461,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					stkUpdMap.put("mfg_date",mfgDate);
 					stkUpdMap.put("exp_date",expiryDate);
 					stkUpdMap.put("inv_stat",invStat);
-					stkUpdMap.put("gross_weight",Double.toString(grossWeight));
-	                stkUpdMap.put("tare_weight",Double.toString(tareWeight));
-	                stkUpdMap.put("net_weight",Double.toString(netWeight));
+					stkUpdMap.put("gross_weight",Double.toString(grossWeight * noArt));
+	                stkUpdMap.put("tare_weight",Double.toString(tareWeight * noArt));
+	                stkUpdMap.put("net_weight",Double.toString(netWeight * noArt));
 					stkUpdMap.put("retest_date",retestDate);
 					stkUpdMap.put("grade",grade);
 					stkUpdMap.put("conv__qty_stduom",Double.toString(convQtyStdUom));