|
@@ -381,7 +381,7 @@ class Resign extends BaseController
|
|
|
"warehouse"=>$wsm_code,
|
|
|
"num"=>$num,
|
|
|
'expecttime'=>$expecttime,
|
|
|
- 'supplier'=>isset($supplie) && $supplie['name']!=''? $supplie['name']:'',
|
|
|
+ 'supplier'=>isset($supplie) && $supplie['code']!=''? $supplie['code']:'',
|
|
|
'good_price'=>$good_price,
|
|
|
'pakge_fee'=>$pakge_fee,
|
|
|
'cert_fee'=>$cert_fee,
|
|
@@ -460,6 +460,10 @@ class Resign extends BaseController
|
|
|
$feed['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
|
|
|
$feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
}
|
|
|
+ if($feed['supplier']!=""){
|
|
|
+ $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
|
|
|
+ $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
|
|
|
+ }
|
|
|
return app_show(0,"获取成功",$feed);
|
|
|
}
|
|
|
|