|
|
@@ -131,13 +131,16 @@ class Purchin extends BaseController
|
|
|
$info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
$info['wsm_contactor'] =isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor']:"";
|
|
|
$info['wsm_mobile'] =isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile']:"";
|
|
|
- $data['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
|
|
|
- $data['wsm_addr'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
|
|
|
- $data['wsm_addr'].=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
|
|
|
+ $info['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
|
|
|
+ $info['wsm_addr'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
|
|
|
+ $info['wsm_addr'].=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
|
|
|
$check = Db::name("purchease_info")->alias("a")->leftJoin("result_info b","a.error_code=b.result_code")->where
|
|
|
(['wsm_in_code'=>$incode,"a.is_del"=>0])->field("a.id,a.wsm_in_code,a.num,a.error_code,b.result as error_msg,a.error_img,remark,a.is_del")->select();
|
|
|
$info['checkinfo']= $check;
|
|
|
$return = Db::name("purchease_return")->where(['wsm_in_code'=>$incode,"is_del"=>0])->find();
|
|
|
+ $return['return_contactor']=isset($return['return_contactor'])&&$return['return_contactor']!="" ?$return['return_contactor']:$info['wsm_contactor'];
|
|
|
+ $return['return_addr']=isset($return['return_addr'])&&$return['return_addr']!="" ?$return['return_addr']:$info['wsm_addr'];
|
|
|
+ $return['return_mobile']=isset($return['return_mobile'])&&$return['return_mobile']!="" ?$return['return_mobile']:$info['wsm_mobile'];
|
|
|
$info['return']= $return;
|
|
|
return app_show(0,'获取成功',$info);
|
|
|
}
|
