Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Orderback.php

@@ -145,6 +145,16 @@ class Orderback extends \app\BaseController
       $info['child']=empty($inorder)? [] : $inorder;
 
       $info['can']=$int;
+
+
+      //补充仓库名称
+      $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']] : '';
       return  app_show(0,"获取成功",$info);
   }