change logic for lot no in auto backflush

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

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

@@ -415,15 +415,20 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 			
 			
 			// to be implemented later
-			 if ( autoBkFlush.trim().equals("Y") && detCnt > noStk )
+			if (autoBkFlush.trim().equals("Y") && detCnt > noStk )
 			{
 				retString = autoBackflush(tranId, conn,xtraParams);
-				if ( retString != null && retString.trim().length() > 0)
+				
+				if(retString !=null && retString.trim().length()> 0 && retString.indexOf("VTSUCC1")==-1)
+				 {
+					 return retString;
+				 }
+				 
+				/*if ( retString != null && retString.trim().length() > 0)
 				{
 					return retString;
-				}
+				}*/
 			}
-
 			retString = chkUpdAddlCost(tranId, conn);
 
 			if ( retString != null && retString.trim().length() > 0)
@@ -3867,7 +3872,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		String itemCodeTemp = "", bomCodeTemp = "", unitTemp = "",  locDetNoBom = "",func = "";
 		String totFunc = "",lot_Sl = "",  sql = "",  itemStru = "",  convrReqd = "", today="";
 		String tranSer="", generatedTranId="",xmlValues="", bomXml="",xmlStringFrmBom="",tranType="";	 
-		
+		String lotNo="";
 		PreparedStatement pstmt = null,pstmt1=null,pstmt2=null ,pstmtRbHdr=null,pstmtRbDet=null,pstmtDspHdr=null,pstmtDspDtl=null,pstmtUpd=null;
 		ResultSet rs = null,rs1= null,rs2= null;
 		
@@ -3903,7 +3908,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 
 		int ctr = 0,row = 0,rtn = 0, setRow =0, count = 0,currRowNoBom = 0;
 		int iRow = 0, currRow = 0, hdrRow = 0, updCnt = 0; 
-		Timestamp ordDate = null,mfgDt = null, expDt = null;
+		Timestamp ordDate = null,mfgDt = null, expDt = null,expDate=null;
 		boolean noBom = true; 
 		try
 		{
@@ -4349,29 +4354,60 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					pstmtRbHdr.setString(11, locHdr);
 					pstmtRbHdr.setTimestamp(12, this.getCurrtDate());
 					pstmtRbHdr.setTimestamp(13, mfgDt);
-					pstmtRbHdr.setTimestamp(14, expDt);
 					pstmtRbHdr.setString(15, userId );
 					pstmtRbHdr.setString(16, termId );
 					pstmtRbHdr.setString(17, acctGl );
 					pstmtRbHdr.setString(18, cctrGl );
 					
 					//pstmtRbHdr.setString(19, lotNo.get(lnoPoRcpDetInInt)); // replaced by swati
-					pstmtRbHdr.setString(19, lotNoMap.get(Integer.parseInt(entry.getKey().toString())));
-					
 					
-					//double 	 dpurLeadTime =0;
-					//double 	 mfgLeadTime =0;
-					double 	 dmfgLeadTime =0;
-					double 	 dqcLeadTime =0;
-					//double 	 dleadTime =0;
-					//double 	 qcLeadTime =0;
-				//	double 	 leadTime =0;
-					//double batchSizeLead = 0;
 					
+			sql="select lot_no__passign,exp_date__passign FROM porddet where purc_order = ? and line_no = ? ";
+			pstmt1=conn.prepareStatement(sql);
+			pstmt1.setString(1,purcOrderTemp);
+			pstmt1.setString(2,lnoOrdTemp);
+			rs1=pstmt1.executeQuery();
+			
+			if(rs1.next())
+			{
+				 lotNo=rs1.getString("lot_no__passign");
+				 expDate=rs1.getTimestamp("exp_date__passign");
+			}
+			System.out.println("lot_no__passign is= "+lotNo +"and  exp_date__passign is ="+expDate);
+			pstmt1.close();
+			pstmt1=null;
+			rs1.close();
+			rs1=null;
+			
+			if(expDate!=null)
+			{
+			pstmtRbHdr.setTimestamp(14, expDate);
+			}
+			else
+			{
+				pstmtRbHdr.setTimestamp(14, expDt);	
+			}
+			
+			
+			if( lotNo!=null && lotNo.trim().length()>0)
+			{
+				pstmtRbHdr.setString(19,lotNo);
+			}
+			else
+			{
+				String generatedLotNo=tg.generateTranSeqID("QC-ORD", "lot_no", keyStr, conn);
+				if (("ERROR").equalsIgnoreCase(generatedLotNo))
+				{
+					retString = itmDBAccessLocal.getErrorString("","VTTRANID","");
+					return retString;
+				}
+				lotNoMap.put(Integer.parseInt(entry.getKey().toString()),generatedLotNo);
+				pstmtRbHdr.setString(19, lotNoMap.get(Integer.parseInt(entry.getKey().toString())));
+				
+			}
 					
-					
-					//String mfgLeadBasis = "F";
-					
+			double 	 dmfgLeadTime =0;
+			double 	 dqcLeadTime =0;
 					
 					sql = "SELECT PUR_LEAD_TIME, QC_LEAD_TIME, MFG_LEAD_TIME, mfg_lead_basis, batch_size_lead "
 							 + "FROM SITEITEM "
@@ -4386,19 +4422,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 
 						dqcLeadTime = rs1.getDouble(2);
 						dmfgLeadTime = rs1.getDouble(3);
-
-						//dpurLeadTime = rs1.getDouble(1);
-						//mfgLeadBasis = rs1.getString(4);
-					    //batchSizeLead = rs1.getDouble(5);
-						
 						pstmt1.close();
 						rs1.close();
 					}
 					else
 					{
-
-						//mfgLeadBasis = "F";
-					//	batchSizeLead = 0;
 						
 						sql = "SELECT PUR_LEAD_TIME, QC_LEAD_TIME, MFG_LEAD "
 								 + "FROM ITEM "