|
@@ -207,11 +207,16 @@ class After extends \app\BaseController
|
|
|
$out =Db::name("order_out")->where(["outCode"=>$info['outCode']])->find();
|
|
$out =Db::name("order_out")->where(["outCode"=>$info['outCode']])->find();
|
|
|
$info['out_num'] = isset($out['send_num'])?$out['send_num']:'';
|
|
$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")->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']):'';
|
|
$info['customer_name'] = isset($customer['companyName']) ?trim($customer['companyName']):'';
|
|
|
$info['can']=$int;
|
|
$info['can']=$int;
|
|
|
return app_show(0,"获取成功",$info);
|
|
return app_show(0,"获取成功",$info);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
public function status(){
|
|
public function status(){
|
|
|
$bkcode = isset($this->post['returnCode']) && $this->post['returnCode']!="" ? trim($this->post['returnCode']):"";
|
|
$bkcode = isset($this->post['returnCode']) && $this->post['returnCode']!="" ? trim($this->post['returnCode']):"";
|
|
|
if($bkcode==""){
|
|
if($bkcode==""){
|
panlumeng