Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Consult.php

@@ -1278,6 +1278,16 @@ class Consult extends Base
         $info['delivery_day'] =$bidinfos['delivery_day'];
         $info['expire_day'] =$bidinfos['expire_day'];
         $info['origin_place'] =$bidinfos['origin_place'];
+        $info['origin_addr'] ="";
+        if($bidinfos['origin_place']!=''){
+            $code = explode(",",$bidinfos['origin_place']);
+            $temp=[];
+            $temp['provice_code']=isset($code[0])?$code[0]:"";
+            $temp['city_code']=isset($code[1])?$code[1]:"";
+            $temp['area_code']=isset($code[2])?$code[2]:"";
+            $addr= GetAddr(json_encode($temp));
+            $info['origin_addr'] = $addr;
+        }
         $info['supplierNo'] =$bidinfos['supplierNo'];
         $supplier = Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
         $info['supplier_name'] = isset($supplier['name'])?$supplier['name']:"";
@@ -1301,6 +1311,8 @@ class Consult extends Base
         $info['total_fee'] =$bidinfos['total_fee'];
         $info['supply_area'] =$bidinfos['supply_area'];
         $info['remark'] =$bidinfos['remark'];
+        $info['is_addrs'] =$consultinfos['is_addrs'];
+        $info['is_custom'] =$consultinfos['is_custom'];
 
         $info['metal_name']=isset($bidinfos['metal_id'])&& $bidinfos['metal_id']!=0?$this->noble[$bidinfos['metal_id']]:"";
         $info['sale_price'] =round($bidinfos['sale_price'],2);

app/admin/controller/Sale.php

@@ -338,6 +338,11 @@ class Sale extends BaseController
         if($arrtime==""){
             return error_show(1004,"参数arrtime不能为空");
         }
+        $order =Db::name("order_num")->where(["orderCode"=>$orderCode,"status"=>1])->where([["wsend_num",">=",0]])
+            ->select()->toArray();
+        if(empty($order)){
+            return error_show(1004,"未找到可以发货得采购单数据");
+        }
         $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
         $apply_id =GetUserInfo($token);
         if(empty($apply_id)||$apply_id['code']!=0){