Selaa lähdekoodia

添加郑鑫云途的欧盟dpd

lvhao 3 viikkoa sitten
vanhempi
commit
a16f90f457

+ 2 - 2
core/CoreApp/controllers/Systembound.php

@@ -1222,11 +1222,11 @@ 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')
+				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')
 				{
 					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')
+				if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA' && $sex['printcode'] != 'HUALEI-DHL' && $sex['printcode']   !=  'ZXDPD_UK'  && $sex['printcode']   !=  'ZXDPD_EU')
 				{
 					echo json_encode(array('msg'=>'运单号和快递类型不符!D','success'=>false));exit;
 				}

+ 2 - 2
core/CoreApp/controllers/Systemfout.php

@@ -656,11 +656,11 @@ class Systemfout extends Start_Controller {
 			if($y['type'] != 7 && $y['waybill'] != '' && $y['printtype'] == '1')
 			{
 				$y['waybill'] = trim($y['waybill'],' ');
-			    if(strlen($y['waybill']) == 12 && $y['express'] != 24 && $y['express'] != 31 && $y['express'] != 38 && $y['express'] != 41 && $y['express'] != 6 && $y['express'] != 43 && $y['express'] != 48 && $y['express'] != 50  && $y['express'] != 51 && $y['express'] != 63 && $y['express'] != 70 && $y['express'] != 71 &&  $y['express'] != 73  &&  $y['express'] !=  74   &&  $y['express'] !=  75 && $y['express'] != 78)
+			    if(strlen($y['waybill']) == 12 && $y['express'] != 24 && $y['express'] != 31 && $y['express'] != 38 && $y['express'] != 41 && $y['express'] != 6 && $y['express'] != 43 && $y['express'] != 48 && $y['express'] != 50  && $y['express'] != 51 && $y['express'] != 63 && $y['express'] != 70 && $y['express'] != 71 &&  $y['express'] != 73  &&  $y['express'] !=  74   &&  $y['express'] !=  75 && $y['express'] != 78 && $y['express'] != 79)
 				{
 					echo json_encode(array('msg'=>'出库物流和系统不匹配,请联系梦体解决'.$y['express'].'-1','success'=>false));exit;
 				}
-				else if(strlen($y['waybill']) == 10 && $y['express'] != 1 && $y['express'] != 37 && $y['express'] != 49 && $y['express'] != 42 && $y['express'] != 69  && $y['express'] != 78)
+				else if(strlen($y['waybill']) == 10 && $y['express'] != 1 && $y['express'] != 37 && $y['express'] != 49 && $y['express'] != 42 && $y['express'] != 69  && $y['express'] != 78  && $y['express'] != 79)
 				{
 					echo json_encode(array('msg'=>'出库物流和系统不匹配,请联系梦体解决'.$y['express'].'-2','success'=>false));exit;
 				}

+ 1 - 1
core/CoreApp/controllers/Systemprint.php

@@ -1654,7 +1654,7 @@ class Systemprint extends Start_Controller {
 					
 					//die;
 				}
-				elseif(($fullorder['printcode'] == "USKD01") || ($fullorder['printcode'] == "ZXDPD_UK")){
+				elseif(($fullorder['printcode'] == "USKD01") || ($fullorder['printcode'] == "ZXDPD_UK") || ($fullorder['printcode'] == "ZXDPD_EU")){
 					if($fullorder['waybillid'] != '')
 					{
 						 $del = $this->zxyuntu->get_del($fullorder['waybillid']);