添加了 UPS-US 可以美仓发货

core/CoreApp/controllers/Fullorder.php

@@ -1081,7 +1081,10 @@ class Fullorder extends Start_Controller {
 				echo json_encode(array('msg'=>'此快递方式必须从美仓发货！','success'=>false));exit;
 			}
 
-			if( ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['express'] != 85 && $post['express'] != 87 && $post['type'] == 5)){
+			// if( ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['express'] != 85 && $post['express'] != 87 && $post['type'] == 5)){
+			// 	echo json_encode(array('msg'=>'此快递方式不能美仓发货！','success'=>false));exit;
+			// }
+			if((!in_array($post['express'],[2,63,64,81,85,86,87])) && ($post['type'] == 5)){
 				echo json_encode(array('msg'=>'此快递方式不能美仓发货！','success'=>false));exit;
 			}
 			//仅独立站 地址美国对电话 10或者11位进行判断
@@ -1928,9 +1931,12 @@ class Fullorder extends Start_Controller {
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
-			{
-				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
+			// {
+			// 	echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// }
+			if((!in_array($post['express'],[2,63,64,81,85,86,87])) && ($post['type'] == 5)){
+				echo json_encode(array('msg'=>'此快递方式不能美仓发货！','success'=>false));exit;
 			}
 			/**
 			if($warehouse['zd'] == '1' && $warehouse['ys'] != '1' && $thisdata['library'] == '2' && $post['fpdata'] != $thisdata['fpdata'])

core/CoreApp/controllers/Fullorderamz.php

@@ -1714,9 +1714,12 @@ class Fullorderamz extends Start_Controller {
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
-			{
-				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
+			// {
+			// 	echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// }
+			if((!in_array($post['express'],[2,63,64,81,85,86,87])) && ($post['type'] == 5)){
+				echo json_encode(array('msg'=>'此快递方式不能美仓发货！','success'=>false));exit;
 			}
 			$fpcount = $this->input->post('fpcount',true);
 			if(!$fpcount)

core/CoreApp/controllers/Fullordersmt.php

@@ -1437,9 +1437,12 @@ class Fullordersmt extends Start_Controller {
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
-			{
-				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
+			// {
+			// 	echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// }
+			if((!in_array($post['express'],[2,63,64,81,85,86,87])) && ($post['type'] == 5)){
+				echo json_encode(array('msg'=>'此快递方式不能美仓发货！','success'=>false));exit;
 			}
 			
 			$express = $this->express->read($post['express']);

core/CoreApp/controllers/Fullordertt.php

@@ -1816,9 +1816,12 @@ class Fullordertt extends Start_Controller {
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85,87]))
-			{
-				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85,87]))
+			// {
+			// 	echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
+			// }
+			if((!in_array($post['express'],[2,63,64,81,85,86,87])) && ($post['type'] == 5)){
+				echo json_encode(array('msg'=>'此快递方式不能美仓发货！','success'=>false));exit;
 			}
 			$express = $this->express->read($post['express']);
 			/**

core/CoreApp/models/Model_logic_order.php

@@ -352,7 +352,7 @@ class Model_logic_order extends Lin_Model {
             ];
         }
 
-        if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85,87]))
+        if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85,86,87]))
         {
             return [
                 'code'=>-1,
@@ -613,7 +613,7 @@ class Model_logic_order extends Lin_Model {
             ];
         }
 
-        if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85,87]))
+        if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85,86,87]))
         {
             return [
                 'code'=>-1,