竞价单创建编辑时，订单用途字段非必填

app/admin/controller/Consult.php

@@ -199,18 +199,23 @@ class Consult extends Base
         if($ladder==""){
             return error_show(1005,"参数ladder不能为空");
         }
-        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(105,"参数token不能为空");
-        }
+//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(105,"参数token不能为空");
+//        }
 
-        $user =GetUserInfo($token);
-        if(empty($user)||$user['code']!=0){
-            return error_show(102,"用户数据不存在");
-        }
-        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $depart= Db::name("depart_user")->where(["uid"=>$createrid,"status"=>1,"is_del"=>0])->find();
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(102,"用户数据不存在");
+//        }
+        $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+//        $depart= Db::name("depart_user")->where(["uid"=>$createrid,"status"=>1,"is_del"=>0])->find();
+        $depart = Db::connect('mysql_sys')
+            ->name('account_item')
+            ->field('itemid')
+            ->where('account_id',$createrid)
+            ->findOrEmpty();
         $zxNo=makeNo("ZX");
         Db::startTrans();
         try{
@@ -274,7 +279,7 @@ class Consult extends Base
                         "budget_price"=>$value['budget_price'],
                         "num"=>$value['num'],
                         "pgNo"=>isset($value['pgNo'])&&$value['pgNo']!==""?trim($value['pgNo']):"",
-                        "use_desc"=>$value['use_desc'],
+                        "use_desc"=>$value['use_desc']??'',
                         "remark"=>$value['remark'],
                         "status"=>1,
                         "is_del"=>0,
@@ -434,7 +439,7 @@ class Consult extends Base
             $zxinfo['pgNo'] = isset($projectinfo['pgNo']) ? $projectinfo['pgNo']:"";
         }
         if($zxorder['depart']>0){
-            $userCommon = new \app\admin\common\User();
+
             $tmp = $userCommon->handle('ciinfo',['id'=>$zxorder['depart']]);
             $zxinfo['departinfo']=$tmp['data'];
         }
@@ -518,9 +523,9 @@ class Consult extends Base
         }
         $pgNo = isset($this->post['pgNo'])&& $this->post['pgNo']!="" ? trim($this->post['pgNo']):"";
         $use_desc = isset($this->post['use_desc'])&& $this->post['use_desc']!="" ? trim($this->post['use_desc']):"";
-        if($use_desc==""){
-            return error_show(1003,"参数use_desc不能为空");
-        }
+//        if($use_desc==""){
+//            return error_show(1003,"参数use_desc不能为空");
+//        }
         $remark = isset($this->post['remark'])&& $this->post['remark']!="" ? trim($this->post['remark']):"";
         if($remark==""){
             return error_show(1003,"参数remark不能为空");
@@ -543,14 +548,14 @@ class Consult extends Base
                 return error_show(1003,"参数gold_price不能为空");
             }
         }
-        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(102,"参数token不能为空");
-        }
-        $user =GetUserInfo($token);
-        if(empty($user)||$user['code']!=0){
-            return error_show(105,"用户数据不存在");
-        }
+//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(102,"参数token不能为空");
+//        }
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(105,"用户数据不存在");
+//        }
         $specinfo=[];
         foreach ($specin as $v){
             $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
@@ -559,9 +564,9 @@ class Consult extends Base
             $v['spec_value_name']=isset($spec_value['spec_value'])?$spec_value['spec_value']:"";
             $specinfo[]=$v;
         }
-        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select();
+        $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+        $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select()->toArray();
         Db::startTrans();
         try{
             $innew =makeNo("IF");
@@ -605,7 +610,7 @@ class Consult extends Base
             if($up){
 
                 //操作记录
-                ActionLog::logAdd($this->post['token'], [
+                ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
                     "order_code" => $innew,//咨询单详情编号
                     "status" => 1,//这里的status是之前的值
                     "action_remark" => '',//备注
@@ -632,7 +637,7 @@ class Consult extends Base
                             Db::rollback();
                             return error_show(1004,"反馈商品新建失败");
                         }
-                        ActionLog::logAdd($this->post['token'], [
+                        ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
                             "order_code" => $innew,//咨询单详情编号
                             "status" => 1,//这里的status是之前的值
                             "action_remark" => '',//备注
@@ -650,7 +655,7 @@ class Consult extends Base
                     return error_show(1004,"反馈商品更新失败");
                 }else{
                     //修改状态，添加待办
-                    ActionLog::logAdd($this->post['token'], [
+                    ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
                         "order_code" => $zxinfo['infoNo'],//咨询单详情编号
                         "status" => $zxinfo['status'],//这里的status是之前的值
                         "action_remark" => '',//备注
@@ -718,7 +723,7 @@ class Consult extends Base
         if($up){
 
             //修改状态，添加待办
-            ActionLog::logAdd($this->post['token'], [
+            ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                 "order_code" => $zxinfo['infoNo'],//咨询单详情编号
                 "status" => $old_zxinfo_status,//这里的status是之前的值
                 "action_remark" => '',//备注
@@ -985,7 +990,7 @@ class Consult extends Base
                             $up = Db::name("project_info")->save($projectinfo);
                             if($up){
                                 //修改状态，添加待办，只记录动作
-                                ActionLog::logAdd($this->post['token'], [
+                                ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                                     "order_code" => $projectinfo['pgNo'],//编码
                                     "status" => $old_projectinfo_status,//这里的status是之前的值
                                     "action_remark" => '',//备注
@@ -1004,14 +1009,14 @@ class Consult extends Base
                                             return error_show(1006,"项目反馈失败");
                                         }else{
                                             //修改状态，添加待办
-                                            ActionLog::logAdd($this->post['token'], [
+                                            ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                                                 "order_code" => $projetc['projectNo'],//项目编码
                                                 "status" => 1,//这里的status是之前的值
                                                 "action_remark" => '',//备注
                                                 "action_type" => "status"//新建create，编辑edit，更改状态status
                                             ], "PRO", 2, $projetc);
 
-                                            ProcessOrder::AddProcess($this->post['token'], [
+                                            ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], [
                                                 "order_type" => 'PRO',
                                                 "order_code" => $projetc['projectNo'],
                                                 "order_id" => $projetc['id'],
@@ -1309,7 +1314,7 @@ class Consult extends Base
                           if ($up) {
 
                               //修改状态，添加待办，只记录动作
-                              ActionLog::logAdd($this->post['token'] , [
+                              ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname] , [
                                   "order_code"=>$projectinfo['pgNo'] ,//编码
                                   "status"=>$old_projectinfo_status ,//这里的status是之前的值
                                   "action_remark"=>'' ,//备注
@@ -1329,7 +1334,7 @@ class Consult extends Base
                                           return error_show(1006 , "项目反馈失败");
                                       } else {
                                           //修改状态，添加待办
-                                          ActionLog::logAdd($this->post['token'] , [
+                                          ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname] , [
                                               "order_code"=>$projectinfo['projectNo'] ,//项目编码
                                               "status"=>1 ,//这里的status是之前的值
                                               "action_remark"=>'' ,//备注
@@ -1337,7 +1342,7 @@ class Consult extends Base
                                           ] , "PRO" , 2 , $this->post
                                           );
 
-                                          ProcessOrder::AddProcess($this->post['token'] , [
+                                          ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname] , [
                                               "order_type"=>'PRO' ,
                                               "order_code"=>$projectinfo['projectNo'] ,
                                               "order_id"=>$project_id ,
@@ -1406,14 +1411,14 @@ class Consult extends Base
         if($infos['status']!=2&&$infos['status']!=3&&$infos['status']!=7){
             return error_show(1004,"咨询单招标未结束或已确认商品");
         }
-        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(105,"参数token不能为空");
-        }
-        $user =GetUserInfo($token);
-        if(empty($user)||$user['code']!=0){
-            return error_show(1002,"用户数据不存在");
-        }
+//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(105,"参数token不能为空");
+//        }
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(1002,"用户数据不存在");
+//        }
         //新增两个字段
         //议价备注
         $bargain_remark = isset($this->post['bargain_remark']) && $this->post['bargain_remark'] != "" ? trim($this->post['bargain_remark']) : "";
@@ -1424,8 +1429,8 @@ class Consult extends Base
             if (empty($temp)) return error_show(1004, "议价原因选择不正确");
         }
 
-        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+        $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $bargainNo =makeNo("BA");
         Db::startTrans();//::todo 金价 毛利计算
         try{
@@ -1455,14 +1460,14 @@ class Consult extends Base
             $int = Db::name("bargain_order")->insertGetId($data);
             if($int){
                 //修改状态，添加待办
-                ActionLog::logAdd($this->post['token'], [
+                ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                     "order_code" => $bargainNo,//咨询单详情编号
                     "status" => 0,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "status"//新建create，编辑edit，更改状态status
                 ], "YJD", $data['status'], $data);
 
-                ProcessOrder::AddProcess($this->post['token'], [
+                ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], [
                     "order_type" => 'YJD',
                     "order_code" => $bargainNo,
                     "order_id" => $int,
@@ -1476,7 +1481,7 @@ class Consult extends Base
                 $up =Db::name("consult_bids")->save($info);
                if($up){
                    //修改状态，添加待办
-                   ActionLog::logAdd($this->post['token'], [
+                   ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                        "order_code" => $bidNo,//咨询单详情编号
                        "status" => $odlstatus,//这里的status是之前的值
                        "action_remark" => '',//备注
@@ -1489,7 +1494,7 @@ class Consult extends Base
                    if($ups){
 
                        //修改状态，添加待办
-                       ActionLog::logAdd($this->post['token'], [
+                       ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                            "order_code" => $infos['infoNo'],//咨询单详情编号
                            "status" => $old_infos_status,//这里的status是之前的值
                            "action_remark" => '',//备注
@@ -1540,7 +1545,7 @@ class Consult extends Base
                 $bids = Db::name("consult_bids")->save($info);
                 if($bids){
                     //修改状态，添加待办
-                    ActionLog::logAdd($this->post['token'], [
+                    ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                         "order_code" =>$bidNo,//咨询单详情编号
                         "status" => $oldstattus,//这里的status是之前的值
                         "action_remark" => '',//备注
@@ -1553,7 +1558,7 @@ class Consult extends Base
                     if($se){
 
                         //修改状态，添加待办
-                        ActionLog::logAdd($this->post['token'], [
+                        ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                             "order_code" => $infos['infoNo'],//咨询单详情编号
                             "status" => $old_infos_status,//这里的status是之前的值
                             "action_remark" => '',//备注
@@ -1684,16 +1689,16 @@ class Consult extends Base
             }
         }
         $remark = isset($this->post['remark'])&& $this->post['remark']!=""?trim($this->post['remark']):"";
-        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(105,"参数token不能为空");
-        }
-        $user =GetUserInfo($token);
-        if(empty($user)||$user['code']!=0){
-            return error_show(1002,"用户数据不存在");
-        }
-        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(105,"参数token不能为空");
+//        }
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(1002,"用户数据不存在");
+//        }
+        $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         Db::startTrans();
         try{
             $examinfo = isset($info['exam_info'])&&$info['exam_info']!="" ? json_decode($info['exam_info'],true):[];
@@ -1706,14 +1711,14 @@ class Consult extends Base
             $up =Db::name("bargain_order")->save($info);
             if($up){
                 //修改状态，添加待办
-                ActionLog::logAdd($this->post['token'], [
+                ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                     "order_code" =>  $bargainNo,//咨询单详情编号
                     "status" =>$ra_status,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "status"//新建create，编辑edit，更改状态status
                 ], "YJD", $info['status'], $info);
                 $process=["order_code"=>$bargainNo,"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'YJD',"before_status"=>$ra_status,'holder_id'=>$info['createrid']];
-                ProcessOrder::AddProcess($token,$process);
+                ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname],$process);
                 if($info['status']==1||$info['status']==3||$info['status']==8||$info['status']==6||$info['status']==9||$info['status']==10||$info['status']==11){
                     $bidstatus=$bids['status'];
                     $bids['status']=5;
@@ -1734,7 +1739,7 @@ class Consult extends Base
                         Db::rollback();
                         return error_show(1004,"数据更新失败");
                     }
-                    ActionLog::logAdd($this->post['token'], [
+                    ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                         "order_code" => $info["bidsNo"],//咨询单详情编号
                         "status" => $bidstatus,//这里的status是之前的值
                         "action_remark" => '',//备注
@@ -1940,15 +1945,15 @@ class Consult extends Base
         }
         $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
         if($is_own==1){
-             $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-            if($token==""){
-                return error_show(101,'token不能为空');
-            }
-            $apply_id =GetUserInfo($token);
-            if(empty($apply_id)||$apply_id['code']!=0){
-                return error_show(1002,"申请人数据不存在");
-            }
-            $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+//             $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+//            if($token==""){
+//                return error_show(101,'token不能为空');
+//            }
+//            $apply_id =GetUserInfo($token);
+//            if(empty($apply_id)||$apply_id['code']!=0){
+//                return error_show(1002,"申请人数据不存在");
+//            }
+            $rm= $this->uid;//isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
             $where[]=['createrid',"=",$rm];
         }
 
@@ -2068,21 +2073,21 @@ class Consult extends Base
             ("zxNo");
             $where[] = ['zxNo','in',$zxlist];
         }
-        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(102,"参数token不能为空");
-        }
+//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(102,"参数token不能为空");
+//        }
         $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
         if($is_own==1){
-            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-            if($token==""){
-                return error_show(101,'token不能为空');
-            }
-            $apply_id =GetUserInfo($token);
-            if(empty($apply_id)||$apply_id['code']!=0){
-                return error_show(1002,"申请人数据不存在");
-            }
-            $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+//            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+//            if($token==""){
+//                return error_show(101,'token不能为空');
+//            }
+//            $apply_id =GetUserInfo($token);
+//            if(empty($apply_id)||$apply_id['code']!=0){
+//                return error_show(1002,"申请人数据不存在");
+//            }
+            $rm= $this->uid;//isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
             $where[]=['createrid',"=",$rm];
         }
         $list =Db::name('consult_bids')->where($where)->select();

app/admin/controller/Purchin.php

@@ -1033,11 +1033,11 @@ class Purchin extends Base
         }
         $error_remark = isset($this->post['error_remark']) &&$this->post['error_remark']!=="" ? trim($this->post['error_remark']):"" ;
         $remark = isset($this->post['remark']) &&$this->post['remark']!=="" ? trim($this->post['remark']):"" ;
-        $result = GetUserInfo($this->post['token']);
-        if((!empty($result) && $result['code']!=0) ||empty($result) ){
-            return error_show($result['code'],$result['message']);
-        }
-        $userinfo = $result['data'];
+//        $result = GetUserInfo($this->post['token']);
+//        if((!empty($result) && $result['code']!=0) ||empty($result) ){
+//            return error_show($result['code'],$result['message']);
+//        }
+//        $userinfo = $result['data'];
          $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
             if(empty($cgdinfo)){
                 return error_show(1002,"未找到采购单数据");
@@ -1056,13 +1056,16 @@ class Purchin extends Base
         $info['updatetime'] = date("Y-m-d H:i:s");
         $up= Db::name("purchease_in")->save($info);
         if($up){
-             //库存品，推给31库管人员、41库管-张凯旋
-                        $uid = Db::name('user_role')
-                            ->where([
-                                ['is_del', '=', 0],
-                                ['roleid', 'in', [31, 41]],
-                                ['status', '=', 1]
-                            ])->column('uid');
+            //库存品，推给仓库对应的管理员
+            $uid = Db::name('warehouse_info')
+                ->where(['wsm_code' => $info['wsm_code'], 'is_del' => 0])
+                ->column('contactor');
+//                        $uid = Db::name('user_role')
+//                            ->where([
+//                                ['is_del', '=', 0],
+//                                ['roleid', 'in', [31, 41]],
+//                                ['status', '=', 1]
+//                            ])->column('uid');
                 $handle_user_list=implode(",",$uid);
             if($info['status']==4){
                 $order = ["order_code"=>$info['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
@@ -1076,7 +1079,7 @@ class Purchin extends Base
                     Db::rollback();
                     return error_show(1002,"发货失败");
                 }
-                ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
+                ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], $order, "CGD", $cgdinfo['status'], $cgdinfo);
 
 //                $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
                 if($cgdinfo['status']==1 || $cgdinfo['status']==2){
@@ -1084,7 +1087,7 @@ class Purchin extends Base
                         ->where(['is_del'=>0,'spuCode'=>$cgdinfo['spuCode']])
                         ->value('is_stock');
                     if($is_stock==1){
-                        //库存品，推给31库管人员、41库管-张凯旋
+                        //库存品，推给仓库对应的负责人
 
                         if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
 
@@ -1096,7 +1099,7 @@ class Purchin extends Base
                     }//非库存品和采返商品，推给供应商负责人
                 }//else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
                 $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id];
-                ProcessOrder::AddProcess($this->post['token'],$process);
+                ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname],$process);
                 $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
                 if(empty($good)) {
                     $good=[
@@ -1139,7 +1142,7 @@ class Purchin extends Base
                 }
                 $good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1, 'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
                 $good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>2, 'stock'=>$info['wsm_num'],"stock_name"=>"wait_in_stock"];
-                GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
+                GoodLog::LogAdd(['id' => $this->uid, 'nickname' => $this->uname],$good_data,'RKD');
 
                 $bk =Db::name("order_bk")->where(['cgdNo'=>$cgdinfo['cgdNo']])->lock(true)->find();
                 if($bk==false){
@@ -1167,9 +1170,9 @@ class Purchin extends Base
 
 
             }
-            ActionLog::logAdd($this->post['token'],$sto,"RKD", $info['status'],$this->post);
+            ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname],$sto,"RKD", $info['status'],$this->post);
             $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'RKD',"before_status"=>$sto['status'],'holder_id' => $info['apply_id'],"handle_user_list"=>$handle_user_list??""];
-            ProcessOrder::AddProcess($this->post['token'],$process);
+            ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname],$process);
 
             //需要在详情页把相关退货记录原样取出来，所以这里把if去掉，所有记录都入purchease_return表
      if($info['status']==5){
@@ -1188,8 +1191,8 @@ class Purchin extends Base
                     "post_code"=>"",
                     "post_company"=>"",
                     "remark"=>$remark ,
-                    "apply_id"=>$userinfo['id'],
-                    "apply_name"=>$userinfo['nickname'],
+                    "apply_id"=>$this->uid,
+                    "apply_name"=>$this->uname,
                     "status"=>0,
                     "addtime"=>date("Y-m-d H:i:s"),
                     "updatetime"=>date("Y-m-d H:i:s")
@@ -1201,7 +1204,7 @@ class Purchin extends Base
                 }
 
                 $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$data);
+                ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname],$sto,"RKTHD",0,$data);
 
          //维护台账记录
 //         Db::name('standing_book')

app/admin/route/app.php

@@ -632,6 +632,14 @@ Route::rule('seooa', 'admin/SaleReport/orderOutAddr');//直接发货申请单统
 Route::rule('seooae', 'admin/SaleReport/orderOutAddrExport');//直接发货申请单统计 -导出
 Route::rule('sna', 'admin/SaleReport/saleNotAddr');//无地址销售订单统计
 Route::rule('snae', 'admin/SaleReport/saleNotAddrExport');//无地址销售订单统计
+Route::rule('sm', 'admin/SaleReport/saleMonth');//十一、销售订单商品类型
+Route::rule('sme', 'admin/SaleReport/saleMonthExport');//十一、销售订单商品类型-导出
+Route::rule('oom', 'admin/SaleReport/orderOutMonth');//十二、采购订单发货维度表
+Route::rule('oome', 'admin/SaleReport/orderOutMonthExport');//十二、采购订单发货维度表-导出
+Route::rule('pom', 'admin/SaleReport/purcheaseOrderMonth');//十三、供应商采购订单情况
+Route::rule('pome', 'admin/SaleReport/purcheaseOrderMonthExport');//十三、供应商采购订单情况-导出
+Route::rule('popm', 'admin/SaleReport/purcheaseOrderPersonMonth');//十四、供应商负责人采购订单情况
+Route::rule('popme', 'admin/SaleReport/purcheaseOrderPersonMonthExport');//十四、供应商负责人采购订单情况-导出
 
 Route::rule("catplatadd", "admin/CatPlat/add");
 Route::rule("catplatedit", "admin/CatPlat/edit");