Ver Fonte

修改毛利率优化

wufeng há 2 anos atrás
pai
commit
deb843606d
2 ficheiros alterados com 4 adições e 3 exclusões
  1. 3 2
      app/admin/controller/Project.php
  2. 1 1
      app/admin/controller/Purch.php

+ 3 - 2
app/admin/controller/Project.php

@@ -907,6 +907,7 @@ class Project extends Base
     }
 
     public function changeRate(){
+
         $projectNo = isset($this->post['projectNo'])&&$this->post['projectNo']!==""?trim($this->post['projectNo']):"";
         if($projectNo==""){
             return error_show(1004,"参数projectNo不能为空");
@@ -930,9 +931,9 @@ class Project extends Base
                 "status" =>0,//这里的status是之前的值
                 "action_remark" => '',//备注
                 "action_type" => "edit"//新建create,编辑edit更改状态status
-            ], "PRT", 1, $info);
+            ], "PRO", 7, $info);
 
-            $process = ["order_code" => $projectNo, "order_id" => $info['id'], "order_status" =>1, "order_type" => 'PRT',"before_status"=>1];//order_status==7修改毛利率
+            $process = ["order_code" => $projectNo, "order_id" => $info['id'], "order_status" =>7, "order_type" => 'PRO',"before_status"=>7];//order_status==7修改毛利率
             ProcessOrder::AddProcess($this->post['token'], $process);
 
             return app_show(0,"利润率修改成功");

+ 1 - 1
app/admin/controller/Purch.php

@@ -114,7 +114,7 @@ class Purch extends Base
         $count=Db::name("purchease_order")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name("purchease_order")->where($where)->page($page,$size)->order("addtime desc")->select();
+        $list = Db::name("purchease_order")->where($where)->page($page,$size)->order("addtime desc")->select()->toArray();
         $all_orderCodes = Db::name('order_num')
             ->whereIn('cgdNo',array_column($list,'cgdNo'))
             ->column('orderCode','cgdNo');