|
|
@@ -9,7 +9,7 @@ use think\Exception;
|
|
|
use think\facade\Db;
|
|
|
use think\facade\Validate;
|
|
|
|
|
|
-
|
|
|
+//售后
|
|
|
class After extends \app\BaseController
|
|
|
{
|
|
|
public $post=[];
|
|
|
@@ -219,18 +219,22 @@ class After extends \app\BaseController
|
|
|
$info["addr_code"]=json_decode($info['addr_code'],true);
|
|
|
$out =Db::name("order_out")->where(["outCode"=>$info['outCode']])->find();
|
|
|
$info['out_num'] = isset($out['send_num'])?$out['send_num']:'';
|
|
|
- $customer = Db::name("customer_info")->where(["companyNo"=>$info['customer_code']])->find();
|
|
|
+// $customer = Db::name("customer_info")->where(["companyNo"=>$info['customer_code']])->find();
|
|
|
+
|
|
|
$wsmcode = Db::name("warehouse_info")
|
|
|
->alias("a")
|
|
|
->leftJoin("supplier b","a.supplierNo=b.code")
|
|
|
->where(["a.wsm_code"=>$info['return_wsm']])
|
|
|
- ->field("a.name as wsm_name,b.name,b.code,a.wsm_code,a.contactor_name,a.position,a.mobile,a.addrs_code,a.addr")
|
|
|
+ ->field("a.name as wsm_name,b.name,b.code,a.wsm_code,a.contactor_name,a.position,a.mobile,a.addrs_code,a.addr,a.companyNo")
|
|
|
->find();
|
|
|
$info['wsm_code'] =isset($wsmcode['wsm_code']) ? $wsmcode['wsm_code']:"";
|
|
|
$info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
|
|
|
$info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
|
|
|
$info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
- $info['customer_name'] = isset($customer['companyName']) ?trim($customer['companyName']):'';
|
|
|
+
|
|
|
+ $customer = Db::name("business")->field('id,company,companyNo')->where(["companyNo"=>$wsmcode['companyNo']])->find();
|
|
|
+ $info['customer_name'] = isset($customer['company']) ?trim($customer['company']):'';
|
|
|
+ $info['customer_code'] = isset($customer['companyNo']) ?trim($customer['companyNo']):'';
|
|
|
$info['can']=$int;
|
|
|
|
|
|
//仓库的联系人、职位、电话、省市区和地址
|
