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

app/admin/controller/Reorder.php

@@ -235,6 +235,14 @@ class Reorder extends \app\BaseController
             $error = Db::name("result_info")->where(["result_code"=>$info['error_code']])->find();
             $info['error_msg']= isset($error['result'])?$error['result']:"";
         }
+        $info['wsm_name']='';
+        if($info['return_wsm']!=""){
+            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
+                ->where(["a.wsm_code"=>$info['return_wsm']])->field("a.name as wsm_name,b.name,b.code")->find();
+            $info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+//            $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+//            $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+        }
         $wsm_return = Db::name("sale_returninfo")->where(["returnCode"=>$info["returnCode"],"is_del"=>0])->select()->toArray();
         $wsm=[];
         if(!empty($wsm_return)){
@@ -379,7 +387,12 @@ class Reorder extends \app\BaseController
             if($return_wsm===""){
                 return error_show(1004,"参数return_wsm 不能为空");
             }
-
+            $wsmcode = Db::name("warehouse_info")->where(["wsm_code"=>$return_wsm])->find();
+            if($wsmcode==false){
+                return error_show(1004,"未找到对应得仓库");
+            }
+            $info['return_wsm']=$return_wsm;
+            $info['is_th']=$is_th;
         }
 
         Db::startTrans();