lvhao 4 miesięcy temu
rodzic
commit
a6d63823aa

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

@@ -577,7 +577,7 @@ 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'] != 63 && $y['express'] != 70 )
+			    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'] != 63 && $y['express'] != 70 && $y['express'] != 71)
 				{
 					echo json_encode(array('msg'=>'出库物流和系统不匹配,请联系梦体解决'.$y['express'].'-1','success'=>false));exit;
 				}

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

@@ -1335,7 +1335,7 @@ class Systemprint extends Start_Controller {
 						$this->$fullorder_name->save(array('print'=>1,'failed'=>$failed),$va[$n]);
 					}
 				}
-				else if($fullorder['printcode'] == "DPEX" || $fullorder['printcode'] == "FedEx_2day" || $fullorder['printcode'] == "usps_priority"  )//官方FEDEX接口
+				else if($fullorder['printcode'] == "DPEX" || $fullorder['printcode'] == "FedEx_2day" || $fullorder['printcode'] == "usps_priority" || $fullorder['printcode'] == 'FEDEX_G' )//官方FEDEX接口
 				{
 					if($fullorder['waybillid'] != '')
 					{