扫码校验数量

src/com/jiaju/activity/PieceActivity.java

@@ -355,20 +355,14 @@ public class PieceActivity extends Activity {
 					String zhuangbanshuliang=carbrandModel.getCarBrandName(); 
 					 
 					int num=Integer.parseInt(zhuangbanshuliang);
-					if( piecelist.size()>num) {
+					if( piecelist.size()>num-1) {
 						CommonUtil.setDefault(Notification.DEFAULT_VIBRATE, getApplicationContext());
 						CommonUtil.showBarCodeAlertDialog(0, "超过装板数量【" + num + "】", PieceActivity.this,
 								barcode, null, null);
 						ProcessDialogUtils.closeProgressDilog();
 						return;
 					}
-					else if( piecelist.size()<num){
-						CommonUtil.setDefault(Notification.DEFAULT_VIBRATE, getApplicationContext());
-						CommonUtil.showBarCodeAlertDialog(0, "未达到装板数量【" + num + "】", PieceActivity.this,
-								barcode, null, null);
-						ProcessDialogUtils.closeProgressDilog();
-					return;
-					}
+					 
 				
 				}
           
@@ -878,7 +872,22 @@ public class PieceActivity extends Activity {
           						
           						return;
           					}
-          				 } 
+          				 }
+                         
+                         if (collectType == 1 && nodeType == 3 &&proId==luociproId) {
+         					CarBrandModel carbrandModel = (CarBrandModel) trademarksource.getSelectedItem();
+         				     
+         					String zhuangbanshuliang=carbrandModel.getCarBrandName(); 
+         					 
+         					int num=Integer.parseInt(zhuangbanshuliang);
+         					if( piecelist.size()>num-1) {
+         						CommonUtil.setDefault(Notification.DEFAULT_VIBRATE, getApplicationContext());
+         						CommonUtil.showBarCodeAlertDialog(0, "超过装板数量【" + num + "】", PieceActivity.this,
+         								barcode, null, null);
+         						ProcessDialogUtils.closeProgressDilog();
+         						return;
+         					} 
+         				}
                       
 						thread = null;
 						thread = new HandlerThread("BarCoderThread", 5);
@@ -1084,7 +1093,21 @@ public class PieceActivity extends Activity {
                 						return true;
                 					}
                 					}
-                            
+                            if (collectType == 1 && nodeType == 3 &&proId==luociproId) {
+               					CarBrandModel carbrandModel = (CarBrandModel) trademarksource.getSelectedItem();
+               				     
+               					String zhuangbanshuliang=carbrandModel.getCarBrandName(); 
+               					 
+               					int num=Integer.parseInt(zhuangbanshuliang);
+               					if( piecelist.size()>num-1) {
+               						CommonUtil.setDefault(Notification.DEFAULT_VIBRATE, getApplicationContext());
+               						CommonUtil.showBarCodeAlertDialog(0, "超过装板数量【" + num + "】", PieceActivity.this,
+               								barcode, null, null);
+               						ProcessDialogUtils.closeProgressDilog();
+               						return true;
+               					}
+               					 
+               				}
                               
 							thread = null;
 							thread = new HandlerThread("BarCoderThread", 5);
@@ -2517,20 +2540,14 @@ public class PieceActivity extends Activity {
        				     
        					String zhuangbanshuliang=carbrandModel.getCarBrandName();        					 
        					int num=Integer.parseInt(zhuangbanshuliang);
-       					if( piecelist.size()>num) {
+       					if( piecelist.size()>num-1) {
        						CommonUtil.setDefault(Notification.DEFAULT_VIBRATE, getApplicationContext());
        						CommonUtil.showBarCodeAlertDialog(0, "超过装板数量【" + num + "】", PieceActivity.this,
        								barcode, null, null);
        						ProcessDialogUtils.closeProgressDilog();
        						return  ;
        					}
-       					else if( piecelist.size()<num){
-       						CommonUtil.setDefault(Notification.DEFAULT_VIBRATE, getApplicationContext());
-       						CommonUtil.showBarCodeAlertDialog(0, "未达到装板数量【" + num + "】", PieceActivity.this,
-       								barcode, null, null);
-       						ProcessDialogUtils.closeProgressDilog();
-       					return  ;
-       					}
+       					 
        				
        				}