merge changes done by Manoj Sir

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

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

@@ -4159,12 +4159,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				rs.close();
 				rs = null;
 					
-				sql = "INSERT INTO RECEIPT_BACKFLUSH( TRAN_ID,TRAN_DATE, SITE_CODE, ITEM_CODE, BOM_CODE, QUANTITY, UNIT, BACKFLUSH_TYPE,LOT_SL, QC_REQD, LOC_CODE, CHG_DATE, MFG_DATE, EXP_DATE, CHG_USER, CHG_TERM, ACCT_CODE__CONV_GL, CCTR_CODE__CONV_GL,LOT_NO, AMOUNT, NET_AMT, INV_VALUE, TAX_AMT, DISCOUNT) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+				sql = "INSERT INTO RECEIPT_BACKFLUSH( TRAN_ID,TRAN_DATE, SITE_CODE, ITEM_CODE, BOM_CODE, QUANTITY, UNIT, BACKFLUSH_TYPE,LOT_SL, QC_REQD, LOC_CODE, CHG_DATE, MFG_DATE, EXP_DATE, CHG_USER, CHG_TERM, ACCT_CODE__CONV_GL, CCTR_CODE__CONV_GL,LOT_NO, AMOUNT, NET_AMT, INV_VALUE, TAX_AMT, DISCOUNT,ORDER_NO,REF_NO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 				pstmtRbHdr = conn.prepareStatement(sql);
 				sql = "INSERT INTO RECEIPT_BACKFLUSH_DET(TRAN_ID, LINE_NO, ITEM_CODE, SITE_CODE, QUANTITY, UNIT,UNIT__DOC, LOC_CODE, LOT_NO, LOT_SL, TAX_AMT, DISCOUNT, RATE, AMOUNT, NET_AMT, CONV_QTY_DOC, QTY_DOC, RATE_DOC)	 VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 				pstmtRbDet = conn.prepareStatement(sql);	
 					
-				sql = "SELECT PORCPDET.PURC_ORDER, PORCPDET.LINE_NO__ORD , PORCPDET.ITEM_CODE ,	PORCPDET.QUANTITY, PORDDET.QUANTITY	,PORDDET.BOM_CODE , PORCPDET.UNIT, PORCPDET.LINE_NO FROM PORCPDET, PORDDET WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.PURC_ORDER = PORDDET.PURC_ORDER  AND PORCPDET.LINE_NO__ORD = PORDDET.LINE_NO AND  PORDDET.BOM_CODE IS NOT NULL";
+				sql = "SELECT PORCPDET.PURC_ORDER, PORCPDET.LINE_NO__ORD , PORCPDET.ITEM_CODE ,	PORCPDET.QUANTITY, PORDDET.QUANTITY	,PORDDET.BOM_CODE , PORCPDET.UNIT, PORCPDET.LINE_NO,PORCPDET.LOT_SL FROM PORCPDET, PORDDET WHERE PORCPDET.TRAN_ID = ? AND PORCPDET.PURC_ORDER = PORDDET.PURC_ORDER  AND PORCPDET.LINE_NO__ORD = PORDDET.LINE_NO AND  PORDDET.BOM_CODE IS NOT NULL";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranId);	
 				rs = pstmt.executeQuery();
@@ -4204,6 +4204,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					innerHashMap.put("bomCodeOrd", bomCodeTemp);
 					innerHashMap.put("unitOrd", unitTemp);
 					innerHashMap.put("lnnoPoRcpDet", lnoPoRcpDet);
+					innerHashMap.put("poRcpdetlotSL", rs.getString("LOT_SL"));//Added by manoj dtd 25/09/2013 to set lotSL from porcpdet
 					
 					outerHashMap.put(lnoPoRcpDet,innerHashMap);
 					
@@ -4361,7 +4362,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmtRbHdr.setDouble(6, Double.parseDouble(((outerHashMap.get(entry.getKey())).get("quantityPoRcpDet"))));
 					pstmtRbHdr.setString(7, ((outerHashMap.get(entry.getKey())).get("unitOrd")));
 					pstmtRbHdr.setString(8, "J");
-					pstmtRbHdr.setString(9, "1S");
+					//pstmtRbHdr.setString(9, "1S");//Commented by manoj dtd 25/09/2013 to set lotSL from porcpdet
+					System.out.println("Print lotSL----"+((outerHashMap.get(entry.getKey())).get("poRcpdetlotSL")));
+					pstmtRbHdr.setString(9, ((outerHashMap.get(entry.getKey())).get("poRcpdetlotSL")));
 					pstmtRbHdr.setString(10, "N");
 					pstmtRbHdr.setString(11, locHdr);
 					pstmtRbHdr.setTimestamp(12, this.getCurrtDate());
@@ -4844,6 +4847,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmtRbHdr.setDouble(22, amountHdr );
 					pstmtRbHdr.setDouble(23, 0.0);
 					pstmtRbHdr.setDouble(24, 0.0);
+					pstmtRbHdr.setString(25, ((outerHashMap.get(entry.getKey())).get("purcOrderDet")));//Added by Manoj dtd 25/09/2013 to store porder no.
+					pstmtRbHdr.setString(26,tranId);
 					pstmtRbHdr.addBatch();
 					pstmtRbHdr.clearParameters();
 					amountHdr = 0;