|
|
@@ -226,11 +226,16 @@ class Reorder extends \app\BaseController
|
|
|
$info['total_price'] = isset($orderinfo['total_price'])?$orderinfo['total_price']:'0';
|
|
|
$info['post_fee'] = isset($orderinfo['post_fee'])?$orderinfo['post_fee']:'0';
|
|
|
$info['customer_code'] = isset($orderinfo['customer_code'])?$orderinfo['customer_code']:'';
|
|
|
- $info['customer_name']='';
|
|
|
+ $info['customer_name']='';
|
|
|
if(isset($orderinfo['customer_code'])&&$orderinfo['customer_code']!=''){
|
|
|
$customerinfo = Db::name("customer_info")->where(['companyNo'=>$orderinfo['customer_code']])->find();
|
|
|
$info['customer_name'] = isset($customerinfo['companyName']) ? $customerinfo['companyName']:"";
|
|
|
}
|
|
|
+ $info['cgd_wsend']="";
|
|
|
+ if($orderinfo['order_type']==2){
|
|
|
+ $cgd = Db::name("purchease_order")->where(["bkcode"=>$info["orderCode"],"order_type"=>2])->find();
|
|
|
+ $info['cgd_wsend'] = isset($cgd['wsend_num']) ? $cgd['wsend_num']:0;
|
|
|
+ }
|
|
|
$info['error_msg']='';
|
|
|
if($info['error_code']!=''){
|
|
|
$error = Db::name("result_info")->where(["result_code"=>$info['error_code']])->find();
|
