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

app/admin/controller/Purchin.php

@@ -302,7 +302,7 @@ class Purchin extends BaseController
                                     ->toArray();
                                 if(!empty($out)){
                                     $up =Db::name("order_out")->where(["outCode"=>$send,"status"=>0])->update
-                                    (["status"=>1,"updatetime"=>date('Y-m-d H:i:s')]);
+                                    (["status"=>1,'wsm_code'=>$cgdinfo['wsm_code'],"updatetime"=>date('Y-m-d H:i:s')]);
                                     if($up==false){
                                         Db::rollback();
                                         return error_show(1004,"出库单出库失败");