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

@@ -70,12 +70,12 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				packInstr = "",suppCodeMfg = "",unitAlt = "",batchNo = "",unit = "",grade = "",stkOpt = "",	
 				expLev = "",itemCodeOrd = "",itemRef = "",status = "",itemGrade = "",waveId = "",retString = "",
 				allocMode = "",reasCode = "",unitStd = "",sSQL = "",updateSql = "",ptcn = "",refSer = "",lineNoStr = "";
-		int lineNoOrd= 0,lineNo= 0,updCnt = 0,rowsCount = 0;  
+		int lineNoOrd= 0,lineNo= 0,updCnt = 0,rowsCount = 0;		
 		double quantity = 0,noArt =0,stkGrossRate = 0,convQtyStduom = 0,batchSize = 0,holdQuantity = 0,stkRate = 0;
 		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,26 +912,28 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 					isError = true;
 					return errorString;					
 				}
-				//insert record in pallet_no and update carton master table
-				String str = insertPalletNoAndUpdCartonMast(ptcnScanSet,conn);
-				System.out.println("After insertPalletNo str----->>["+str+"]");	
-				updateSql = "UPDATE MULTI_PICK_ISS SET CONFIRMED = 'Y', CONF_DATE = ?, EMP_CODE__USER = ?"
-						+ " WHERE TRAN_ID = ? ";
-				pstmt = conn.prepareStatement(updateSql);
-				pstmt.setTimestamp(1, currDate);
-				pstmt.setString(2, empCode);
-				pstmt.setString(3, tranId);				
-
-				updCnt = pstmt.executeUpdate();
-
-				if( updCnt > 0 )
-				{					
-					System.out.println( updCnt + " MULTI_PICK_ISS rows updated successfully" );
-				}	
-				pstmt.close();
-				pstmt = null;
+				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+"]");	
+					updateSql = "UPDATE MULTI_PICK_ISS SET CONFIRMED = 'Y', CONF_DATE = ?, EMP_CODE__USER = ?"
+							+ " WHERE TRAN_ID = ? ";
+					pstmt = conn.prepareStatement(updateSql);
+					pstmt.setTimestamp(1, currDate);
+					pstmt.setString(2, empCode);
+					pstmt.setString(3, tranId);				
 
+					updCnt = pstmt.executeUpdate();
 
+					if( updCnt > 0 )
+					{					
+						System.out.println( updCnt + " MULTI_PICK_ISS rows updated successfully" );
+					}	
+					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");