Merge branch 'bug_20220510_wf' into dev_wf

app/admin/controller/Goodup.php

@@ -451,6 +451,7 @@ class Goodup extends Base
                         $lemp['package_fee'] = $value['package_fee'];
                         $lemp['other_fee'] = $value['other_fee'];
                         if($is_gold_price==1){
+
                             $gold = Db::name("gold_price1")->where(["type" => $noble_metal, "status" => 1, "is_del" => 0])->order("addtime desc")->find();
                             $lemp['nake_total'] = $noble_weight * $gold['price'] + $value['cost_fee'] * $noble_weight + $value['mark_fee'] + $value['package_fee'] + $value['cert_fee'] + $value['nake_fee'] + $value['delivery_fee'] + $value['other_fee'];
 

app/admin/controller/Reorder.php

@@ -237,14 +237,15 @@ 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']:"";
-            $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
-            $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
         }
+        $info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+//        $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+//        $info['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)){
@@ -389,12 +390,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();
+            $wsmcode = Db::name("warehouse_info")->where(['wsm_code'=>$return_wsm])->find();
             if($wsmcode==false){
-                return error_show(1004,"未找到对应得仓库");
+                return error_show(1004,"为找到仓库数据");
             }
-            $info['return_wsm']=$return_wsm;
-            $info['is_th']=$is_th;
+            $info['return_wsm'] =$return_wsm ;
+            $info['is_th'] =$is_th ;
         }
 
         Db::startTrans();