Browse Source

对于使用readonly的数据补充

lvhao 2 months ago
parent
commit
684231555b

+ 10 - 1
core/CoreApp/controllers/Fullorder.php

@@ -1760,7 +1760,7 @@ class Fullorder extends Start_Controller {
 			}
 			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))
 			{
-				echo json_encode(array('msg'=>'此快递方式必须选择美仓!','success'=>false));exit;
+				echo json_encode(array('msg'=>'此快递方式必须选择美仓!','success'=>false));exit;
 			}
 			if($way == count($whlabeldata) && $post['type'] != 12)
 			{
@@ -1829,6 +1829,15 @@ class Fullorder extends Start_Controller {
 			{
 				echo json_encode(array('msg'=>'此省/州不可使用 '.$expt['servicename'],'success'=>false));exit;
 			}
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式必须从美仓发货!",'success'=>false));exit;
+			}
+	
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式不能美仓发货!",'success'=>false));exit;
+			}
 			/**
 			if($warehouse['zd'] == '1' && $warehouse['ys'] != '1' && $thisdata['library'] == '2' && $post['fpdata'] != $thisdata['fpdata'])
 			{

+ 10 - 1
core/CoreApp/controllers/Fullorderamz.php

@@ -1666,7 +1666,7 @@ class Fullorderamz extends Start_Controller {
 			}
 			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))
 			{
-				echo json_encode(array('msg'=>'此快递方式必须选择美仓!','success'=>false));exit;
+				echo json_encode(array('msg'=>'此快递方式必须选择美仓!','success'=>false));exit;
 			}
 			if($way == count($whlabeldata) && $post['type'] != 12)
 			{
@@ -1676,6 +1676,15 @@ class Fullorderamz extends Start_Controller {
 			{
 				echo json_encode(array('msg'=>'特殊仓必须包含特殊仓货物!','success'=>false));exit;
 			}
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式必须从美仓发货!",'success'=>false));exit;
+			}
+	
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式不能美仓发货!",'success'=>false));exit;
+			}
 			$fpcount = $this->input->post('fpcount',true);
 			if(!$fpcount)
 			{

+ 12 - 0
core/CoreApp/controllers/Fullordersmt.php

@@ -1388,6 +1388,18 @@ class Fullordersmt extends Start_Controller {
 			    {
 				    echo json_encode(array('msg'=>'非英国无法选择CNE和GES!','success'=>false));exit;
 			    }
+
+
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式必须从美仓发货!",'success'=>false));exit;
+			}
+	
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式不能美仓发货!",'success'=>false));exit;
+			}
+			
 			$express = $this->express->read($post['express']);
 			/**
 			if($express['ioss'] == 1 && $post['ioss'] == '')

+ 10 - 0
core/CoreApp/controllers/Fullordertt.php

@@ -1714,6 +1714,16 @@ class Fullordertt extends Start_Controller {
 			{
 				echo json_encode(array('msg'=>'非英国无法选择CNE和GES!','success'=>false));exit;
 			}
+
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式必须从美仓发货!",'success'=>false));exit;
+			}
+	
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			{
+				echo json_encode(array('msg'=>"此快递方式不能美仓发货!",'success'=>false));exit;
+			}
 			$express = $this->express->read($post['express']);
 			/**
 			if($express['ioss'] == 1 && $post['ioss'] == '')