update CARTON_MASTER status for carton typ M

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

webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizConf.java

@@ -75,7 +75,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 		double shipperSize = 0,	itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0,
 				qtyOrd = 0,sordAllocQty = 0;
 		isError = false;		
-		boolean isUpdatehdr= false;
+		boolean isUpdatehdr= false,isRecordFound = false;
 		java.sql.Timestamp expDate = null,currDate = null, mfgDate = null,restestDate = null,dateAlloc = null;		
 
 		HashMap updateRowMap = new HashMap();
@@ -164,6 +164,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 						System.out.println("dataMap clear..............");
 						dataMap.clear();
 					}
+					isRecordFound = true;
 					System.out.println("WHILE CONDITION12.........."+(++rowsCount));					
 					lineNoOrd = rs.getInt( "LINE_NO__ORD" );
 					waveId = checkNull(rs.getString( "WAVE_ID" ));
@@ -911,6 +912,9 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 					isError = true;
 					return errorString;					
 				}
+				System.out.println("isRecordFound -------->>["+isRecordFound+"]");
+				if(isRecordFound && !isError)
+				{
 					//insert record in pallet_no and update carton master table
 					String str = insertPalletNoAndUpdCartonMast(ptcnScanSet,conn);
 					System.out.println("After insertPalletNo str----->>["+str+"]");	
@@ -929,8 +933,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 					}	
 					pstmt.close();
 					pstmt = null;
-
-
+				}
 
 			}//end else of confirmed cndition
 
@@ -1440,7 +1443,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				}
 				mark = mark.substring(0,mark.length() - 1);
 				sqlBuf.append(mark);
-				sqlBuf.append( ")  AND STATUS <> ? AND CARTON_TYPE IN ('A','C')");
+				sqlBuf.append( ")  AND STATUS <> ? AND CARTON_TYPE IN ('A','C','M')");
 
 				pstmt = conn.prepareStatement(sqlBuf.toString());
 				pstmt.setString(1,"U");