Change Logic for Lot No and Lot Sl For Despatch In AutoBackflush

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

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

@@ -5058,7 +5058,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				
 				//* Despatch Detail Data*\\
 				
-				sql = "SELECT ITEM_CODE, LINE_NO FROM PORCPDET WHERE TRAN_ID = ? ";
+				sql = "SELECT ITEM_CODE, LINE_NO ,LOT_NO, LOT_SL  FROM PORCPDET WHERE TRAN_ID = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranId);
 				rs = pstmt.executeQuery();
@@ -5200,8 +5200,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmtDspDtl.setString(8, expLev );
 					//pstmtDspDtl.setString(9, itemCodeRcp.get(linePoRcpDetInInt)); //replaced by swati
 					pstmtDspDtl.setString(9,((outerHashMap.get(linePoRcpDet))).get("itemCodeRcp"));
-					pstmtDspDtl.setString(10, lotNoMap.get(linePoRcpDetInInt));
-					pstmtDspDtl.setString(11, "1S" );
+					//pstmtDspDtl.setString(10, lotNoMap.get(linePoRcpDetInInt));
+					pstmtDspDtl.setString(10, rs.getString("LOT_NO"));
+					
+					//pstmtDspDtl.setString(11, "1S" );
+					
+					pstmtDspDtl.setString(11, rs.getString("LOT_SL"));
 					pstmtDspDtl.setString(12, stUnit );
 					pstmtDspDtl.setDouble(13, conQtyStd );
 					pstmtDspDtl.setString(14, unitStd );
@@ -5260,13 +5264,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				     additionalCost = 0;
 					 if ( ordType.equalsIgnoreCase(jobWorkType) || ordType.equalsIgnoreCase(subContractType) )
 					{
-						sql = "SELECT RATE FROM	STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND	LOC_CODE  = ? AND LOT_NO = ? AND LOT_SL ='1S' ";
+						sql = "SELECT RATE FROM	STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND	LOC_CODE  = ? AND LOT_NO = ? AND LOT_SL = ? ";
 						pstmt1 = conn.prepareStatement(sql);
 					//	pstmt1.setString(1, itemCodeRcp.get(linePoRcpDetInInt)); //replaced by swati
 						pstmt1.setString(1,((outerHashMap.get(linePoRcpDet))).get("itemCodeRcp"));
 						pstmt1.setString(2, siteCodeDet );
 						pstmt1.setString(3, locHdr );
-						pstmt1.setString(4, lotNoMap.get(linePoRcpDetInInt));
+						//pstmt1.setString(4, lotNoMap.get(linePoRcpDetInInt));
+						pstmt1.setString(4, rs.getString("LOT_NO"));
+						pstmt1.setString(4, rs.getString("LOT_SL"));
+						
 						rs1 = pstmt1.executeQuery();
 						if ( rs1.next() )
 						{
@@ -5309,8 +5316,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					hashMap.put("site_code",sordSite);
 					hashMap.put("item_code",itemCodeOrd);
 					hashMap.put("loc_code",locHdr);
-					hashMap.put("lot_no",lotNoMap.get(linePoRcpDetInInt));
-					hashMap.put("lot_sl","1S");
+					hashMap.put("lot_no",rs.getString("LOT_NO"));
+					hashMap.put("lot_sl",rs.getString("LOT_SL"));
 					hashMap.put("alloc_qty",qtyDesp);
 					hashMap.put("chg_user",this.userId);
 					hashMap.put("chg_term",this.termId);
@@ -5328,12 +5335,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 
 					//lc_tax_amt = gf_calc_tax_ds(desp_det, lds_tax, 'S-DSP', ls_tran_id, ldt_today, "rate__stduom", "quantity__stduom",0,ls_curr_code);
 					
-					if  ((-999999999)==taxAmt  )
-					{
-						retString =  itmDBAccessLocal.getErrorString("","Error calculating tax","");
-						return retString;
-					}
-					
 
 					sql = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ?";
 					pstmt1 = conn.prepareStatement(sql);
@@ -5349,7 +5350,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					rs1.close();
 					rs1 = null;
 					
-					sql = "SELECT COUNT(*) AS CNT FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?  AND	EXP_LEV = ? AND	 ITEM_CODE__ORD = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = '1S'  AND LOC_CODE = ?";
+					sql = "SELECT COUNT(*) AS CNT FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?  AND	EXP_LEV = ? AND	 ITEM_CODE__ORD = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = ?  AND LOC_CODE = ?";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, saleOrder );
 					pstmt1.setString(2, lineNoSord );
@@ -5357,8 +5358,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmt1.setString(4, itemCodeOrd );
 					//pstmt1.setString(5, itemCodeRcp.get(linePoRcpDetInInt)); // replaced by swati
 					pstmt1.setString(5, ((outerHashMap.get(linePoRcpDet))).get("itemCodeRcp"));
-					pstmt1.setString(6, lotNoMap.get(linePoRcpDetInInt));
-					pstmt1.setString(7, locHdr );
+					pstmt1.setString(6, rs.getString("LOT_NO"));
+					pstmt1.setString(7, rs.getString("LOT_SL"));
+					pstmt1.setString(8, locHdr );
 					rs1 = pstmt1.executeQuery();
 					if ( rs1.next() )
 					{
@@ -5375,7 +5377,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					
 						if ( ("Y").equalsIgnoreCase(allocated) )
 						{
-							sql = "UPDATE SORDALLOC SET STATUS = 'D' WHERE  SALE_ORDER 	 = ? AND LINE_NO = ? AND EXP_LEV = ?  AND ITEM_CODE__ORD = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = '1S' AND LOC_CODE = ?";
+							sql = "UPDATE SORDALLOC SET STATUS = 'D' WHERE  SALE_ORDER 	 = ? AND LINE_NO = ? AND EXP_LEV = ?  AND ITEM_CODE__ORD = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND LOC_CODE = ?";
 							pstmtUpd = conn.prepareStatement(sql);
 							pstmtUpd.setString(1, saleOrder);
 							pstmtUpd.setString(2, lineNoSord);
@@ -5383,8 +5385,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							pstmtUpd.setString(4, itemCodeOrd);
 							//pstmtUpd.setString(5, itemCodeRcp.get(linePoRcpDetInInt)); // replaced by swati
 							pstmtUpd.setString(5, ((outerHashMap.get(linePoRcpDet))).get("itemCodeRcp"));
-							pstmtUpd.setString(6, lotNoMap.get(linePoRcpDetInInt));
-							pstmtUpd.setString(7, locHdr );
+							pstmtUpd.setString(6, rs.getString("LOT_NO"));
+							pstmtUpd.setString(7, rs.getString("LOT_SL"));
+							pstmtUpd.setString(8, locHdr );
 							updCnt = pstmtUpd.executeUpdate();
 							
 							pstmtUpd.close();