|
|
@@ -110,7 +110,7 @@ public function flist(){
|
|
|
->where($condtion)->page($page,$size)->select();
|
|
|
$data=[];
|
|
|
foreach ($list as $key=>$value){
|
|
|
- $supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();
|
|
|
+ $supplier = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
|
|
|
$value['supplier_name'] =isset($supplier['name']) ?$supplier['name'] :"";
|
|
|
$wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")->where(["a.wsm_code"=>$value['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
|
|
|
$value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
|
