Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Orderback.php

@@ -464,9 +464,9 @@ class Orderback extends Base
             }
 			$sabebn =Db::name("sale_info")->where([["orderCode",'=',$info['orderCode']],["num",">",0]])->select()->toArray();
             if($param['can_sell_num']!=0&& $param['can_sell_wsm']!=''){
-                    if($sale['is_stock']==1){ //库存品退回原仓库 备库单释放数量 采购单
-                        $param['can_sell_wsm'] = $out['wsm_code'];
-                    }
+//                    if($sale['is_stock']==1){ //库存品退回原仓库 备库单释放数量 采购单
+//                        $param['can_sell_wsm'] = $out['wsm_code'];
+//                    }
                     $stock = Db::name("good_stock")->where(["spuCode"=>$spuCode,'wsm_code'=>$param['can_sell_wsm']])
                     ->find();
                     if(empty($stock)) {