Merge branch 'master' of http://gogs.hnwmzp.cn/chengwenliang/erp

core/CoreApp/controllers/Systembound.php

@@ -954,7 +954,7 @@ class Systembound extends Start_Controller {
 				if(isset($dd[0]['waybill'])){
 				    $tmp_waybill= $dd[0]['waybill'];
 				}
-				if($dd[0]['printtype'] != 2)
+				if($dd[0]['printtype'] != 2 &&  $dd[0]['express'] != 73 && $dd[0]['express'] != 50)
 				{
 					echo json_encode(array('msg'=>'请扫描正确的条码！','success'=>false));exit;
 				}
@@ -1252,7 +1252,7 @@ class Systembound extends Start_Controller {
 						}
 					}
 				}
-				if($dd[0]['printtype'] != 2 && ($dd[0]['express'] != 73 || $dd[0]['express'] != 50 ))
+				if($dd[0]['printtype'] != 2 && $dd[0]['express'] != 73 && $dd[0]['express'] != 50 )
 				{
 					echo json_encode(array('msg'=>'请扫描正确的条码！','success'=>false));exit;
 				}