bug fixes and added case SUPP_CODE__MNFR whille updating in porcpdet

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

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

@@ -1624,7 +1624,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				
 				//Added By PriyankaC on 16May2019.[Start]
 				System.out .println("Value of lotNo in Detail: "+lotNo );
-				if(lotNo == null && lotNo.trim().length() == 0)
+				if(lotNo == null || lotNo.trim().length() == 0)
 				{
 					sql = "select stk_opt, qc_reqd from item where item_code = ? ";
 					pstmt1 = conn.prepareStatement(sql);
@@ -4093,6 +4093,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 							// on
 							// 8/11/12
 							System.out.println("suppCodeMnfr = " + suppCodeMnfr);							
+							if(suppCodeMnfr == null || suppCodeMnfr.trim().length()==0 || "null".equals(suppCodeMnfr))
+							{
+								suppCodeMnfr= " ";
+								System.out.println("suppCodeMnfr---2 = " + suppCodeMnfr);
+							}							
 							//Changed by Jagruti Shinde Req id:[W16CSUN009]
 							//sql="SELECT PURC_ORDER, LINE_NO__ORD"
 							sql = "SELECT PURC_ORDER, LINE_NO__ORD , LOT_SL ,LINE_NO "
@@ -4518,7 +4523,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 										// "UPDATE PORCPDET SET 	LOT_NO = ?, LOT_SL = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND		   LOC_CODE  = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND (CASE		   WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END)	= ? AND (CASE WHEN MFG_DATE IS NULL		   THEN ? ELSE MFG_DATE END) = ? ";
 										//Pavan R on 25jun19 start [grouping done in where on updating lot_no in porcpdet as per same as get data]
 										//sql = "UPDATE PORCPDET SET 	LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND		   LOC_CODE  = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND (CASE		   WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END)	= ? AND (CASE WHEN MFG_DATE IS NULL		   THEN ? ELSE MFG_DATE END) = ? ";
-										sql = "UPDATE PORCPDET SET LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND LOC_CODE  = ? AND UNIT__STD = ? AND (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) = ? AND (CASE WHEN MFG_DATE IS NULL THEN ? ELSE MFG_DATE END) = ? AND EXPIRY_DATE = ? AND SUPP_CODE__MNFR = ? ";
+										sql = "UPDATE PORCPDET SET LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND LOC_CODE  = ? AND UNIT__STD = ? AND (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) = ? AND (CASE WHEN MFG_DATE IS NULL THEN ? ELSE MFG_DATE END) = ? AND EXPIRY_DATE = ? AND (CASE WHEN SUPP_CODE__MNFR IS NULL THEN ' ' ELSE SUPP_CODE__MNFR END) = ? ";
 										//Pavan R on 25jun19 end
 										pstmtUpd = conn.prepareStatement(sql);
 										pstmtUpd.setString(1, lotNoRcp);
@@ -4567,7 +4572,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 											// "UPDATE PORCPDET SET   LOT_NO = ?, LOT_SL = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND		   LOC_CODE  = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND		   (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END)	= ?	 AND (CASE WHEN			   MFG_DATE IS NULL THEN ? ELSE MFG_DATE END) 	= ?";
 											//Pavan R on 25jun19 start [grouping done in where on updating lot_no in porcpdet as per same as get data]
 											//sql = "UPDATE PORCPDET SET   LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND		   LOC_CODE  = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND		   (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END)	= ?	 AND (CASE WHEN	 MFG_DATE IS NULL THEN ? ELSE MFG_DATE END) 	= ? AND (CASE WHEN	 EXPIRY_DATE IS NULL THEN ? ELSE EXPIRY_DATE END) 	= ? ";
-											sql = "UPDATE PORCPDET SET LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND LOC_CODE  = ? AND UNIT__STD = ? AND (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) = ? AND (CASE WHEN MFG_DATE IS NULL THEN ? ELSE MFG_DATE END) = ? AND EXPIRY_DATE = ? AND SUPP_CODE__MNFR = ? ";
+											sql = "UPDATE PORCPDET SET LOT_NO = ? WHERE TRAN_ID = ? AND ITEM_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ? AND LOC_CODE  = ? AND UNIT__STD = ? AND (CASE WHEN SPEC_REF IS NULL THEN ' ' ELSE SPEC_REF END) = ? AND (CASE WHEN MFG_DATE IS NULL THEN ? ELSE MFG_DATE END) = ? AND EXPIRY_DATE = ? AND (CASE WHEN SUPP_CODE__MNFR IS NULL THEN ' ' ELSE SUPP_CODE__MNFR END) = ? ";
 											//Pavan R on 25jun19 end
 											pstmtUpd = conn.prepareStatement(sql);
 											pstmtUpd.setString(1, lotNoRcp);