瀏覽代碼

提交一下了its 3pe的配置

lvhao 2 月之前
父節點
當前提交
b056200d08

+ 4 - 0
core/CoreApp/controllers/Api.php

@@ -2370,6 +2370,10 @@ class Api extends Start_Controller {
 			{ 
 				$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'190258');
 			}
+			else if(stripos($express[$v['express']],'3PE') !== false)
+			{ 
+				$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'191376');
+			}
 			else
 			{
 				$fsdata[] = array('number'=>$v['waybill'],'auto_detection'=>'true');

+ 4 - 0
core/CoreApp/controllers/Boss.php

@@ -233,6 +233,10 @@ class Boss extends Start_Controller
 					echo json_encode(array('msg' => '出库物流和系统不匹配,请联系梦体解决' . $y['express'] . '-3', 'success' => false));
 					exit;
 				}
+				else if(strlen($y['waybill']) == 16 && $y['express'] != 76)
+				{
+					echo json_encode(array('msg'=>'出库物流和系统不匹配,请联系梦体解决'.$y['express'].'-4','success'=>false));exit;
+				}
 			}
 			// 			if(($y['express'] == '24' || $y['express'] == '3' || $y['express'] == '28' || $y['express'] == '33' || $y['express'] == '42') && $y['type'] != 6)//杭州除外
 			// 			{

+ 14 - 3
core/CoreApp/controllers/Systembound.php

@@ -899,18 +899,25 @@ 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' )
 				{
 					echo json_encode(array('msg'=>'运单号和快递类型不符!F','success'=>false));exit;
 				}
-				if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA')
+				if(strlen($number) == 10 && $sex['printcode'] != 'DHL' && $sex['printcode'] != 'DHLUSA' && $sex['printcode'] != 'HUALEI-DHL')
 				{
 					echo json_encode(array('msg'=>'运单号和快递类型不符!D','success'=>false));exit;
 				}
-				if(strlen($number) == 18 && $sex['printcode'] != 'UPS')
+				if(strlen($number) == 18 && $sex['printcode'] != 'UPS' && $sex['printcode'] != 'YunExpress' && $sex['printcode'] != 'YunExpress_BaoXian' && $sex['printcode'] != 'USKD01')
 				{
-					echo json_encode(array('msg'=>'运单号和快递类型不符!U','success'=>false));exit;
+					echo json_encode(array('msg'=>'运单号和快递类型不符!U'.$sex['printcode'],'success'=>false));exit;
 				}
+				if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB')
+				{
+					echo json_encode(array('msg'=>'运单号和快递类型不符!PE'.$sex['printcode'],'success'=>false));exit;
+				}
+
 				
 				$tmp_waybill = $number;
 				$yd = $this->fullorder->find_all("waybill = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
@@ -1227,6 +1234,10 @@ class Systembound extends Start_Controller {
 				{
 					echo json_encode(array('msg'=>'运单号和快递类型不符!U'.$sex['printcode'],'success'=>false));exit;
 				}
+				if(strlen($number) == 16 && $sex['printcode'] != '3PE_XB')
+				{
+					echo json_encode(array('msg'=>'运单号和快递类型不符!PE'.$sex['printcode'],'success'=>false));exit;
+				}
 				$yd = $this->fullorder->find_all("waybill = '$number' and library = '2' and librarytime > '".(time()-30*24*3600)."'");
 				if(isset($yd[0]['number']))
 				{

+ 4 - 0
core/CoreApp/controllers/Systemfout.php

@@ -618,6 +618,10 @@ class Systemfout extends Start_Controller {
 				{
 					echo json_encode(array('msg'=>'出库物流和系统不匹配,请联系梦体解决'.$y['express'].'-3','success'=>false));exit;
 				}
+				else if(strlen($y['waybill']) == 16 && $y['express'] != 76)
+				{
+					echo json_encode(array('msg'=>'出库物流和系统不匹配,请联系梦体解决'.$y['express'].'-4','success'=>false));exit;
+				}
 			}
 			if(stripos($weight,',') !== false){
                $tmp_arr = explode(",",$weight);