pallet merging

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

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

@@ -269,12 +269,13 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
 								 {
 									 if("palletmerge".equalsIgnoreCase(objName))
 									 {
+										 int cnt = 0;
 										 pstmt = conn.prepareStatement(sqlCarton);
 										 pstmt.setString(1,palletNo);
 										 rs = pstmt.executeQuery();
 										 if( rs.next() )
 										 {
-											count = rs.getInt("COUNT");
+											 cnt = rs.getInt("COUNT");
 										 }
 										 if(pstmt != null)
 										 {
@@ -287,17 +288,18 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
 											 rs.close();
 											 rs = null;
 										 }
-										 
-										 if(count == 0)
+								
+										if(cnt == 0 && count == 0)
 										 {
-											 errString = getErrorString("pallet_no__new","INVPLTMST",userId);
+											 errString = getErrorString("pallet_no__new","INVPLTDESP",userId);
 											 break;
 										 }
-										 else
+										
+										/*if(cnt == 1 && )
 										 {
-											 errString = getErrorString("pallet_no__new","INVPLTDESP",userId);
+											 errString = getErrorString("pallet_no__new","INVPLTMST",userId);
 											 break;
-										 }
+										 }*/
 									 }
 									 else
 									 {