|
|
@@ -435,9 +435,9 @@ class Purchin extends BaseController
|
|
|
(['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'];
|
|
|
+ $return['return_contactor']=isset($return['return_contactor'])&&$return['return_contactor']!="" ?$return['return_contactor']:'';
|
|
|
+ $return['return_addr']=isset($return['return_addr'])&&$return['return_addr']!="" ?$return['return_addr']:'';
|
|
|
+ $return['return_mobile']=isset($return['return_mobile'])&&$return['return_mobile']!="" ?$return['return_mobile']:'';
|
|
|
$info['return']= $return;
|
|
|
$info['can']=$cat;
|
|
|
if(isset($dom['companyNo'])&&$dom['companyNo']!=""){
|
