Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/abutment/controller/Order.php

@@ -625,6 +625,7 @@ class Order extends HomeBaseController
                     $upd = Db::name("good_stock")->save($good);
                     $stockid=$good['id']?? Db::name("good_stock")->getLastInsID();
                     //商品变动日志表，good_log_code字段存储采购单单号
+                     $good_data=[];
                     $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" =>$stockid, "type" => 1, 'stock' => $send_num, "stock_name" => "usable_stock"];
                     $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" =>$stockid, "type" => 2, 'stock' => $send_num, "stock_name" => "wait_in_stock"];
                     if ($upd) {
@@ -732,7 +733,7 @@ class Order extends HomeBaseController
                                     $good1['updatetime'] = date("Y-m-d H:i:s");
                                     $upd = Db::name("good_stock")->save($good1);
                                     if ($upd == false) throw new Exception('库存数量更新失败');
-
+									$good_data=[];
                                     $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $send_num, "stock_name" => "wait_out_stock"];
                                     $good_data[] = ['good_log_code' => $wsm_in_code, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $send_num, "stock_name" => "usable_stock"];
                                     GoodLog::LogAdd(['id' => $uid, 'nickname' => $nickname], $good_data, 'RKD');

app/admin/controller/Consult.php

@@ -1802,8 +1802,8 @@ class Consult extends Base
         $unit =Db::name("unit")->where(["id"=>$bidinfos['unit_id']])->find();
         $info['unit'] = isset($unit['unit'])?$unit['unit']:'';
         $bidinfoe = Db::name("consult_info")->where(["infoNo"=>$info["infoNo"]])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
-        $lower_rate = isset($catinfo['lower_rate']) ? $catinfo['lower_rate']:0;//boss主管利率
+        $budget = isset($catinfo['rate']) ? $catinfo['rate']:0;
+        $lower_rate = isset($catinfo['rate']) ? $catinfo['rate']:0;//业务烛光
         $info['budget'] =$budget;
         $info['rate_status'] =0; //利率状态 0 业务主管利率无法通过 1 财务主管利率无法通过 2 boos利率无法通过 3 完全通过
         if($info['after_rate']>=$catinfo['rate']){
@@ -1889,7 +1889,7 @@ class Consult extends Base
         $info['metal_name']=isset($bidinfos['metal_id'])&& $bidinfos['metal_id']!=0?$this->noble[$bidinfos['metal_id']]:"";
 //        $info['sale_price'] =round($bidinfos['sale_price'],2);//议价前价格
         $info['specinfo'] = isset($bidinfos['specinfo'])&&$bidinfos['specinfo']!=""?json_decode($bidinfos['specinfo'],true):[];
-        if($info['status']==7){
+        if($info['status']==2){
             $info['lower_price'] =round($lower_price,2);
         }
         //获取议价原因

app/admin/controller/Purchin.php

@@ -375,11 +375,11 @@ class Purchin extends Base
                     $upd=  Db::name("good_stock")->save($good);
                     $stockid=$good['id']?? Db::name("good_stock")->getLastInsID();
                     //商品变动日志表，good_log_code字段存储采购单单号
+                    $good_data=[];
                     $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>$stockid,"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
                     $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>$stockid,"type"=>2,'stock'=>$send_num,"stock_name"=>"wait_in_stock"];
                     if($upd){
                     	GoodLog::LogAdd(['id'=>$this->uid,'nickname'=>$this->uname],$good_data,'RKD');
-
                         $bnin=GoodStockInfo::AddBn($stockid,$bn_code,$send_num,$cgdinfo['good_price']);
                         if($bnin==false){
                             Db::rollback();