提交后端的提示语

core/CoreApp/controllers/Fullorder.php

@@ -1020,7 +1020,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;
 			}
 			//减少代码复用吧
 			$lo_ret = $this->logic_order->checkEditExpress($post);
@@ -1308,6 +1308,7 @@ class Fullorder extends Start_Controller {
 			}
 			**/
 			$warehouse = $this->warehouse->read($post['type']);
+			//未出库或者（已退库并且订单的状态不是等待买家收货和代发货状态）
 			if($data['library'] == 1 || ($data['library'] != 2 && ($post['state'] != '207' || $post['state'] == '209')))
 			{
 			    $kcyz = $this->ck->get_kc($post['state'],$warehouse,$thisdata['shop'],$thisdata['number'],$whlabel,$fpdata);