|
@@ -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)
|
|
|
{
|