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

app/admin/controller/Purchin.php

@@ -441,7 +441,7 @@ class Purchin extends BaseController
 
         //以下字段临时补充到return中
         $return['wsm_in_code'] = $incode;
-        $return['wsm_num'] = $info['wsm_num'];
+        $return['wsm_num'] = isset($return['wsm_num']) ? $return['wsm_num'] : 0;
         $return['reissue_num'] = isset($return['reissue_num']) ? $return['reissue_num'] : 0;
         $return['return_num'] = isset($return['return_num']) ? $return['return_num'] : 0;
         $return['contactor'] = $return['return_contactor'];