退货详情接口补全信息

app/admin/controller/Orderback.php

@@ -149,12 +149,18 @@ class Orderback extends \app\BaseController
 
       //补充仓库名称
       $warehouse = Db::name('warehouse_info')
-          ->where(['is_del' => 0, 'status' => 1])
-          ->whereIn('wsm_code', [$info['can_sell_wsm'], $info['defective_wsm']])
-          ->column('name', 'wsm_code');
-
-      $info['can_sell_wsm_name'] = isset($warehouse[$info['can_sell_wsm']]) ? $warehouse[$info['can_sell_wsm']] : '';
-      $info['defective_wsm_name'] = isset($warehouse[$info['defective_wsm']]) ? $warehouse[$info['defective_wsm']] : '';
+          ->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');
+
+      $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'] : '';
+      $info['can_sell_wsm_supplier'] = isset($warehouse[$info['can_sell_wsm']]['supplier']) ? $warehouse[$info['can_sell_wsm']]['supplier'] : '';
+      $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);
   }