|
|
@@ -152,8 +152,8 @@ class Orderback extends \app\BaseController
|
|
|
->alias('wi')
|
|
|
->where(['wi.is_del' => 0, 'wi.status' => 1])
|
|
|
->whereIn('wi.wsm_code', [$info['can_sell_wsm'], $info['defective_wsm']])
|
|
|
- ->leftJoin('business b', 'b.companyNo=wi.supplierNo AND b.is_del=0')
|
|
|
- ->column('wi.name,wi.supplierNo,b.company supplier', 'wi.wsm_code');
|
|
|
+ ->leftJoin('supplier s', 's.code=wi.supplierNo AND s.is_del=0')
|
|
|
+ ->column('wi.name,wi.supplierNo,s.name supplier', 'wi.wsm_code');
|
|
|
|
|
|
$info['can_sell_wsm_name'] = isset($warehouse[$info['can_sell_wsm']]['name']) ? $warehouse[$info['can_sell_wsm']]['name'] : '';
|
|
|
$info['can_sell_wsm_supplierNo'] = isset($warehouse[$info['can_sell_wsm']]['supplierNo']) ? $warehouse[$info['can_sell_wsm']]['supplierNo'] : '';
|
|
|
@@ -161,7 +161,7 @@ class Orderback extends \app\BaseController
|
|
|
$info['defective_wsm_name'] = isset($warehouse[$info['defective_wsm']]['name']) ? $warehouse[$info['defective_wsm']]['name'] : '';
|
|
|
$info['defective_wsm_supplierNo'] = isset($warehouse[$info['defective_wsm']]['supplierNo']) ? $warehouse[$info['defective_wsm']]['supplierNo'] : '';
|
|
|
$info['defective_wsm_supplier'] = isset($warehouse[$info['defective_wsm']]['supplier']) ? $warehouse[$info['defective_wsm']]['supplier'] : '';
|
|
|
- return app_show(0,"获取成功",$info);
|
|
|
+ return app_show(0, "获取成功", $info);
|
|
|
}
|
|
|
|
|
|
/**
|
