ko

app/admin/controller/Purch.php

@@ -347,18 +347,19 @@ class Purch extends \app\BaseController
         }
         $rid= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
         $rname= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
-        $diff_price = $cg['weight']*$cg['gold_price'];
+        $diff_price = $diff_weight*$cg['gold_price'];
        // $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
         $data=[
             "cgdNo"=>$cgdNo,
-            "good_code"=>$gd['good_code'],
+            "good_code"=>$gd['good_type_code'],
+            "good_kode"=>$gd['good_code'],
             "good_name"=>$cg['good_name'],
             "sale_price"=>$cg['good_price'],
             "good_weight"=>$cg['weight'],
             "good_num"=>$cg['good_num'],
             "apply_id"=>$rid,
             "apply_name"=>$rname,
-            "diff_weight"=> $diff_weight,
+            "diff_weight"=>$diff_weight,
             "diff_price"=>$diff_price,
             "gold_price"=>$cg['gold_price'],
             "status"=>1,
@@ -397,11 +398,11 @@ class Purch extends \app\BaseController
         if($apply_name!==""){
             $where[]=['a.apply_name',"like","%$apply_name%"];
         }
-        $count = Db::name('purchease_diff')->alias('a')->join("good b","b.good_code=a.good_code","left")
+        $count = Db::name('purchease_diff')->alias('a')->join("good b","b.good_code=a.good_kode","left")
             ->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('purchease_diff')->alias('a')->join("good b","b.good_code=a.good_code","left")
+        $list = Db::name('purchease_diff')->alias('a')->join("good b","b.good_code=a.good_kode","left")
             ->where($where)->page($page,$size)->order("a.addtime desc")->select();
         $data=[];
         foreach ($list as $value){
@@ -419,7 +420,7 @@ class Purch extends \app\BaseController
         if($idinf==false){
             return error_show(1002,"未找到采购工差单数据");
         }
-        $goon = Db::name('good')->where(['good_code'=>$idinf['good_code']])->find();
+        $goon = Db::name('good')->where(['good_code'=>$idinf['good_kode']])->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
         }

app/admin/controller/Purchin.php

@@ -85,7 +85,7 @@ class Purchin extends BaseController
         $list = Db::name('purchease_in')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
             ->where($where)->page($page,$size)
             ->field("a.apply_name,a.sendtime,b.order_type,a.status,a.cgdNo,a.wsm_in_code,b.good_name,a.send_num,a.wsm_code,b.good_name,b.good_code,
-            a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode")
+            a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo")
             ->order("a.addtime desc")->select();
         $data=[];
         foreach ($list as $value){