ad

app/admin/controller/Log.php

@@ -3,9 +3,10 @@ declare (strict_types = 1);
 
 namespace app\admin\controller;
 
+use app\BaseController;
 use think\Request;
 
-class Log
+class Log extends BaseController
 {
     /**
      * 显示资源列表

app/admin/controller/Purch.php

@@ -136,6 +136,23 @@ class Purch extends \app\BaseController
             $inorder= Db::name("purchease_in")->where(['cgdNo'=>$data['cgdNo'],"is_del"=>0])->select();
             $data['child']=empty($inorder)? [] : $inorder;
         }
+        $feed = Db::name("purchease_feedback")->where(['bkcode'=>$data['bkcode'],'is_del'=>0])->find();
+        $data['feedback'] = [];
+        if(!empty($feed)){
+            $feed['wsm_name']="";
+            if($feed['warehouse']!=""){
+                $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
+                    ->where(["a.wsm_code"=>$feed['warehouse']])->field("a.name as wsm_name,b.name,b.code")->find();
+                $feed['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+                $feed['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+                $feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+            }
+            if($feed['supplier']!=""){
+                $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
+                $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
+            }
+            $data['feedback'] = $feed;
+        }
         return app_show(0,"获取成功",$data);
     }
 
@@ -175,10 +192,10 @@ class Purch extends \app\BaseController
         if($good_num!=""){
             $data['good_num'] = $good_num;
         }
-        $good_price = isset($this->post['good_price'])&&$this->post['good_price']!=""?$this->post['good_price']:"";
-        if($good_price!=""){
-            $data['good_price'] = $good_price;
-        }
+//        $good_price = isset($this->post['good_price'])&&$this->post['good_price']!=""?$this->post['good_price']:"";
+//        if($good_price!=""){
+//            $data['good_price'] = $good_price;
+//        }
 //        $total_fee = isset($this->post['total_fee'])&&$this->post['total_fee']!=""?$this->post['total_fee']:"";
 //        if($total_fee!=""){
 //            $data['total_fee'] = $total_fee;

app/admin/controller/Resign.php

@@ -212,6 +212,24 @@ class Resign extends BaseController
             $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
             $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
         }
+        $feed = Db::name("purchease_feedback")->where(['bkcode'=>$info['bk_code'],'is_del'=>0])->find();
+        $info['feedback'] = [];
+        if(!empty($feed)){
+        $feed['wsm_name']="";
+        if($feed['warehouse']!=""){
+            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
+                ->where(["a.wsm_code"=>$feed['warehouse']])->field("a.name as wsm_name,b.name,b.code")->find();
+            $feed['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+            $feed['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+            $feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+        }
+        if($feed['supplier']!=""){
+            $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
+            $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
+        }
+        $info['feedback'] = $feed;
+        }
+
         return app_show(0,"获取成功",$info);
     }
     public  function edit(){