lvhao il y a 2 semaines
Parent
commit
19a82d5675
1 fichiers modifiés avec 20 ajouts et 19 suppressions
  1. 20 19
      core/CoreApp/controllers/Systembound.php

+ 20 - 19
core/CoreApp/controllers/Systembound.php

@@ -967,27 +967,28 @@ class Systembound extends Start_Controller {
 					}
 				}
 				**/
-				if(strlen($number) == 12 && $sex['printcode'] != 'FEDEX' && $sex['printcode'] != 'FEDEXGF' && $sex['printcode'] != 'HUALEI-MLXY' && $sex['printcode'] != 'FEDEX_G' && $sex['printcode'] != 'HUALEIXW-USPS' && $sex['printcode'] != 'FedEx_GD' && $sex['printcode']   != 'HUALEI-GES-EU' && $sex['printcode']   !=  'ZXDPD_UK' && $sex['printcode']   !=  'ZXDPD_EU' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符!F','success'=>false));exit;
-				}
-				if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA' && $sex['printcode'] != 'HUALEI-DHL' && $sex['printcode']   !=  'ZXDPD_UK'  && $sex['printcode']   !=  'ZXDPD_EU' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符!D','success'=>false));exit;
-				}
-				if(strlen($number) == 18 && $sex['printcode'] != 'UPS' && $sex['printcode'] != 'YunExpress' && $sex['printcode'] != 'YunExpress_BaoXian' && $sex['printcode'] != 'USKD01'&& $sex['printcode'] != 'YunExpress_JFPHTKR' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符!U'.$sex['printcode'],'success'=>false));exit;
-				}
-				if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB' && $sex['printcode'] != 'TTUK' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
-				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符!PE'.$sex['printcode'],'success'=>false));exit;
-				}
 
-				// $r = $this->logic_express->ydCheckByPrintcode($number,$sex['printcode']);
-				// if(!$r){
-				// 	echo json_encode(array('msg'=>'运单号和快递类型不符-'.$sex['printcode'],'success'=>false));exit;
+				// if(strlen($number) == 12 && $sex['printcode'] != 'FEDEX' && $sex['printcode'] != 'FEDEXGF' && $sex['printcode'] != 'HUALEI-MLXY' && $sex['printcode'] != 'FEDEX_G' && $sex['printcode'] != 'HUALEIXW-USPS' && $sex['printcode'] != 'FedEx_GD' && $sex['printcode']   != 'HUALEI-GES-EU' && $sex['printcode']   !=  'ZXDPD_UK' && $sex['printcode']   !=  'ZXDPD_EU' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符!F','success'=>false));exit;
+				// }
+				// if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA' && $sex['printcode'] != 'HUALEI-DHL' && $sex['printcode']   !=  'ZXDPD_UK'  && $sex['printcode']   !=  'ZXDPD_EU' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符!D','success'=>false));exit;
 				// }
+				// if(strlen($number) == 18 && $sex['printcode'] != 'UPS' && $sex['printcode'] != 'YunExpress' && $sex['printcode'] != 'YunExpress_BaoXian' && $sex['printcode'] != 'USKD01'&& $sex['printcode'] != 'YunExpress_JFPHTKR' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符!U'.$sex['printcode'],'success'=>false));exit;
+				// }
+				// if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB' && $sex['printcode'] != 'TTUK' && $sex['printcode'] != 'TTUS' && $sex['printcode'] != 'TTSP' && $sex['printcode'] != 'TTSP-Fedex')
+				// {
+				// 	echo json_encode(array('msg'=>'运单号和快递类型不符!PE'.$sex['printcode'],'success'=>false));exit;
+				// }
+
+				$r = $this->logic_express->ydCheckByPrintcode($number,$sex['printcode']);
+				if(!$r){
+					echo json_encode(array('msg'=>'运单号和快递类型不符-'.$sex['printcode'],'success'=>false));exit;
+				}