项目、咨询、销售和采购都添加待办

app/admin/controller/After.php

@@ -398,10 +398,27 @@ class After extends \app\BaseController
                         return app_show(1004,"退货仓库地址录入失败");
                     }
                 }
+                $old_info_status = $info['status'];
                 $info['status']=4;
                 $info["updatetime"]=date("Y-m-d H:i:s");
                 $up =Db::name("order_return")->save($info);
                 if($up){
+
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $info['returnCode'],//销售单code
+                        "status" => $old_info_status,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "SHD", $info['status'], $info);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'SHD',
+                        "order_code" => $info['returnCode'],//销售单code
+                        "order_id" => $info['id'],
+                        "order_status" => $info['status']
+                    ]);
+
                     Db::commit();
                     return app_show(0,"退货仓库设置成功");
                 }
@@ -487,7 +504,23 @@ class After extends \app\BaseController
             $info['updatetime']=date("Y-m-d H:i:s");
             $up =Db::name("order_return")->save($info);
             if($up){
-              //  var_dump($contactor);
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $info['returnCode'],//销售单code
+                    "status" => $var,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "SHD", $info['status'], $info);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SHD',
+                    "order_code" => $info['returnCode'],//销售单code
+                    "order_id" => $info['id'],
+                    "order_status" => $info['status']
+                ]);
+
+                //  var_dump($contactor);
                 $returninfo = Db::name("order_returninfo")->where(["returnCode"=>$bkcode])->find();
                 if(empty($returninfo)){
                     $returninfo=[
@@ -869,10 +902,27 @@ class After extends \app\BaseController
             }
             $up =Db::name("order_returninfo")->save($returninfo);
             if($up){
+                $old_info_status = $info['status'];
                 $info['status']=5;
                 $info['updatetime']=date("y-m-d H:i:s");
                 $ro =Db::name("order_return")->save($info);
                 if($ro){
+
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $info['returnCode'],//销售单code
+                        "status" => $old_info_status,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "SHD", $info['status'], $info);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'SHD',
+                        "order_code" => $info['returnCode'],//销售单code
+                        "order_id" => $info['id'],
+                        "order_status" => $info['status']
+                    ]);
+
                     $thNo =makeNo("ST");
                     $thdata=[
                         "thNo"=>$thNo,
@@ -903,8 +953,24 @@ class After extends \app\BaseController
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
-                    $sav= Db::name("order_back")->insert($thdata);
+                    $sav= Db::name("order_back")->insert($thdata,true);
                     if($sav){
+
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $thdata['thNo'],//销售单code
+                            "status" => $thdata['status'],//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "CKTHD", $thdata['status'], $thdata);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'CKTHD',
+                            "order_code" => $thdata['thNo'],//销售单code
+                            "order_id" => $sav,
+                            "order_status" => $thdata['status']
+                        ]);
+
                         Db::commit();
                         return app_show(0,"退货单新建成功",["thNo"=>$thNo]);
                     }
@@ -941,7 +1007,7 @@ class After extends \app\BaseController
             if (!$res) throw new Exception('该售后单记录修改失败');
 
             //记录日志
-            ActionLog::logAdd($data['token'], ["order_code" => $data['returnCode'], "status" => 8, "action_remark" => '', "action_type" => "cancel"], 'SHD', 8, $this->post);
+            ActionLog::logAdd($data['token'], ["order_code" => $data['returnCode'], "status" => $rs['status'], "action_remark" => '', "action_type" => "cancel"], 'SHD', 8, $this->post);
             ProcessOrder::AddProcess($this->post['token'], ["order_code" => $data['returnCode'], "order_id" => $rs['id'], "order_status" => 8, "order_type" => 'SHD']);
 
             //提交

app/admin/controller/Consult.php

@@ -227,6 +227,21 @@ class Consult extends Base
                     if(!$up){
                         Db::rollback();
                         return error_show(1004,'添加失败');
+                    }else{
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $infoNo,//咨询单详情编号
+                            "status" => 1,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "ZXD", 1, $info);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'ZXD',
+                            "order_code" => $infoNo,//咨询单详情编号
+                            "order_id" => 0,
+                            "order_status" => 1
+                        ]);
                     }
                 }
                 $stn = ["order_code"=>$zxNo,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
@@ -478,6 +493,22 @@ class Consult extends Base
             ];
             $up = Db::name("consult_info")->insert($info);
             if($up){
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $innew,//咨询单详情编号
+                    "status" => 1,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "ZXD", 1, $info);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'ZXD',
+                    "order_code" => $innew,//咨询单详情编号
+                    "order_id" => 0,
+                    "order_status" => 1
+                ]);
+
                 if (!empty($bidlist)){
                     foreach ($bidlist as $value){
                         unset($value['id']);
@@ -500,6 +531,22 @@ class Consult extends Base
                 if($bar==false){
                     Db::rollback();
                     return error_show(1004,"反馈商品更新失败");
+                }else{
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+                        "status" => $zxinfo['status'],//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "edit"//新建create，编辑edit，更改状态status
+                    ], "ZXD", $zxinfo['status'], $zxinfo);
+
+//                    并没有修改状态
+//                    ProcessOrder::AddProcess($this->post['token'], [
+//                        "order_type" => 'ZXD',
+//                        "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+//                        "order_id" => $zxinfo['id'],
+//                        "order_status" => $zxinfo['status']
+//                    ]);
                 }
 
                 //更新consule_order记录
@@ -531,11 +578,27 @@ class Consult extends Base
         if($status==1&&$zxinfo['status']>1){
             $zxinfo['bargain_num']=+1;
         }
+        $old_zxinfo_status = $zxinfo['status'];
         $zxinfo['status']=$status;
         $zxinfo['updatetime']=date("Y-m-d H:i:s");
         $up = Db::name("consult_info")->save($zxinfo);
         if($up){
 
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+                "status" => $old_zxinfo_status,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "status"//新建create，编辑edit，更改状态status
+            ], "ZXD", $zxinfo['status'], $zxinfo);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'ZXD',
+                "order_code" => $zxinfo['infoNo'],//咨询单详情编号
+                "order_id" => $zxinfo['id'],
+                "order_status" => $zxinfo['status']
+            ]);
+
             return app_show(0,"状态更新成功");
         }else{
             return error_show(1003,"状态更新失败");
@@ -765,10 +828,20 @@ class Consult extends Base
                             Db::rollback();
                             return error_show(1006,"项目反馈失败");
                         }else{
+                            $old_projectinfo_status = $projectinfo['status'];
                             $projectinfo['status']=2;
                             $projectinfo['updatetime']=date("Y-m-d H:i:s");
                             $up = Db::name("project_info")->save($projectinfo);
                             if($up){
+
+                                //修改状态，添加待办，只记录动作
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $projectinfo['pgNo'],//编码
+                                    "status" => $old_projectinfo_status,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                                ], "PRO", 2, $projectinfo);
+
                                 $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])
                                     ->count();
                                 if($count==0){
@@ -779,16 +852,22 @@ class Consult extends Base
                                         if($proc==false){
                                             Db::rollback();
                                             return error_show(1006,"项目反馈失败");
-                                        }
+                                        }else{
+                                            //修改状态，添加待办
+                                            ActionLog::logAdd($this->post['token'], [
+                                                "order_code" => $projetc['projectNo'],//项目编码
+                                                "status" => 1,//这里的status是之前的值
+                                                "action_remark" => '',//备注
+                                                "action_type" => "status"//新建create，编辑edit，更改状态status
+                                            ], "PRO", 2, $projetc);
 
-                                        //修改状态，添加待办
-                                        $process = [
-                                            "order_code" => $projectinfo['projectNo'],//把项目编码放到这儿
-                                            //"order_id"=>0,//没有订单id，默认0
-                                            "order_status" => 2,//2表示'流程中'
-                                            "order_type" => 'PRO'//PRO表示'项目'
-                                        ];
-                                        ProcessOrder::AddProcess($this->post['token'], $process);
+                                            ProcessOrder::AddProcess($this->post['token'], [
+                                                "order_type" => 'PRO',
+                                                "order_code" => $projetc['projectNo'],
+                                                "order_id" => $projetc['id'],
+                                                "order_status" => 2
+                                            ]);
+                                        }
 
                                     }
                                 }
@@ -1016,10 +1095,20 @@ class Consult extends Base
                     Db::rollback();
                     return error_show(1006,"项目反馈失败");
                 }else{
+                    $old_projectinfo_status = $projectinfo['status'];
                     $projectinfo['status']=2;
                     $projectinfo['updatetime']=date("Y-m-d H:i:s");
                     $up = Db::name("project_info")->save($projectinfo);
                     if($up){
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $projectinfo['pgNo'],//编码
+                            "status" => $old_projectinfo_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 2, $projectinfo);
+
                         $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->count();
 
                         if ($count == 0) {
@@ -1030,16 +1119,22 @@ class Consult extends Base
                                 if ($proc == false) {
                                     Db::rollback();
                                     return error_show(1006, "项目反馈失败");
-                                }
+                                }else{
+                                    //修改状态，添加待办
+                                    ActionLog::logAdd($this->post['token'], [
+                                        "order_code" => $projectinfo['projectNo'],//项目编码
+                                        "status" => 1,//这里的status是之前的值
+                                        "action_remark" => '',//备注
+                                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                                    ], "PRO", 2, $this->post);
 
-                                //修改状态，添加待办
-                                $process = [
-                                    "order_code" => $projectinfo['projectNo'],//把项目编码放到这儿
-                                    //"order_id"=>0,//没有订单id，默认0
-                                    "order_status" => 2,//2表示'流程中'
-                                    "order_type" => 'PRO'//PRO表示'项目'
-                                ];
-                                ProcessOrder::AddProcess($this->post['token'], $process);
+                                    ProcessOrder::AddProcess($this->post['token'], [
+                                        "order_type" => 'PRO',
+                                        "order_code" => $projectinfo['projectNo'],
+                                        "order_id" => $project_id,
+                                        "order_status" => 2
+                                    ]);
+                                }
 
                             }
                         }
@@ -1133,10 +1228,27 @@ class Consult extends Base
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $up =Db::name("consult_bids")->save($info);
                if($up){
+                   $old_infos_status = $infos['status'];
                    $infos['status']=3;
                    $infos['updatetime']=date("Y-m-d H:i:s");
                    $ups =Db::name("consult_info")->save($infos);
                    if($ups){
+
+                       //修改状态，添加待办
+                       ActionLog::logAdd($this->post['token'], [
+                           "order_code" => $infos['infoNo'],//咨询单详情编号
+                           "status" => $old_infos_status,//这里的status是之前的值
+                           "action_remark" => '',//备注
+                           "action_type" => "status"//新建create，编辑edit，更改状态status
+                       ], "ZXD", $infos['status'], $infos);
+
+                       ProcessOrder::AddProcess($this->post['token'], [
+                           "order_type" => 'ZXD',
+                           "order_code" => $infos['infoNo'],//咨询单详情编号
+                           "order_id" => $infos['id'],
+                           "order_status" => $infos['status']
+                       ]);
+
                        Db::commit();
                        return app_show(0,"议价单生成成功",["bargainNo"=>$bargainNo]);
                    }
@@ -1173,10 +1285,27 @@ class Consult extends Base
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $bids = Db::name("consult_bids")->save($info);
                 if($bids){
+                    $old_infos_status = $infos['status'];
                     $infos['status']=4;
                     $infos['updatetime']=date("Y-m-d H:i:s");
                     $se = Db::name("consult_info")->save($infos);
                     if($se){
+
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $infos['infoNo'],//咨询单详情编号
+                            "status" => $old_infos_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "ZXD", $infos['status'], $infos);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'ZXD',
+                            "order_code" => $infos['infoNo'],//咨询单详情编号
+                            "order_id" => $infos['id'],
+                            "order_status" => $infos['status']
+                        ]);
+
                         Db::commit();
                         return app_show(0,"商品确定成功");
                     }

app/admin/controller/Project.php

@@ -2,6 +2,7 @@
 
 
 namespace app\admin\controller;
+use app\admin\model\ActionLog;
 use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
@@ -111,6 +112,15 @@ class Project extends Base
                     }
                     $in = Db::name("project_info")->insertAll($la);
                     if($in>0){
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $projectNo,//编码,这里是project的编码
+                            "status" => 1,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "PRO", 1, $la);
+
                         Db::commit();
                         return app_show(0,"项目新建成功",['projectNo'=>$projectNo]);
                     }
@@ -202,10 +212,21 @@ class Project extends Base
             }
             $nu = Db::name("project_feedback")->insertAll($data);
             if($nu>0){
+                $old_projectinfo_status = $projectinfo['status'];
                 $projectinfo['status']=2;
                 $projectinfo['updatetime']=date("Y-m-d H:i:s");
                 $up = Db::name("project_info")->save($projectinfo);
                 if($up){
+
+                    //修改状态，添加待办，只记录动作
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $pgNo,//编码,这里是project的编码
+                        "status" => $old_projectinfo_status,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "PRO", 2, $projectinfo);
+
+
                     $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])
                         ->count();
                     if($count==0){
@@ -214,13 +235,19 @@ class Project extends Base
                         if($proc){
 
                             //修改状态，添加待办
-                            $process = [
-                                "order_code" => $projectinfo['projectNo'],//把项目编码放到这儿
-                                //"order_id"=>0,//没有订单id，默认0
-                                "order_status" => 2,//2表示'流程中'
-                                "order_type" => 'PRO'//PRO表示'项目'
-                            ];
-                            ProcessOrder::AddProcess($this->post['token'], $process);
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code"=>$projectinfo['projectNo'],//项目编码
+                                "status"=>1,//这里的status是之前的值
+                                "action_remark"=>'',//备注
+                                "action_type"=>"status"//新建create，编辑edit，更改状态status
+                            ],"PRO",2,$this->post);
+
+                            ProcessOrder::AddProcess($this->post['token'],[
+                                "order_type"=>'PRO',
+                                "order_code"=>$projectinfo['projectNo'],
+                                "order_id"=>0,//这里更新是根据编码更新的，没有主键id
+                                "order_status"=>2
+                            ]);
 
                             Db::commit();
                             return app_show(0,"添加成功");
@@ -518,12 +545,29 @@ class Project extends Base
                             Db::rollback();
                             return error_show(1004,"未找到反馈商品咨询单");
                         }
+                        $old_bids_status = $bids["status"];
                         $bids["status"]=3;
                         $bids["updatetime"]=date("Y-m-d H:i:s");
                        $bd=Db::name("consult_info")->save($bids);
                        if($bd==false){
                            Db::rollback();
                            return error_show(1004,"反馈商品咨询单更新失败");
+                       }else{
+
+                           //修改状态，添加待办
+                           ActionLog::logAdd($this->post['token'], [
+                               "order_code" => $bids['infoNo'],//咨询单详情编号
+                               "status" => $old_bids_status,//这里的status是之前的值
+                               "action_remark" => '',//备注
+                               "action_type" => "status"//新建create，编辑edit，更改状态status
+                           ], "ZXD", 3, $bids);
+
+                           ProcessOrder::AddProcess($this->post['token'], [
+                               "order_type" => 'ZXD',
+                               "order_code" => $bids['infoNo'],//咨询单详情编号
+                               "order_id" => $bids['id'],
+                               "order_status" => 3
+                           ]);
                        }
                     }
 //                    $value['sale_price'] = $price['sale_price'];
@@ -565,19 +609,35 @@ class Project extends Base
                 ];
                 $up =Db::name("project_plan")->insert($data);
                 if($up){
+
+                    //修改状态，添加待办，只记录动作
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $planNo,//编码
+                        "status" => 0,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "create"//新建create，编辑edit，更改状态status
+                    ], "PRO", 0, $data);
+
+                    $old_project_status = $info['status'];
                     $info['status']=4;
                     $info['updatetime']=date("Y-m-d H:i:s");
                     $cr =Db::name("project")->save($info);
                     if($cr){
 
                         //修改状态，添加待办
-                        $process = [
-                            "order_code" => $projectNo,//把项目编码放到这儿
-                            //"order_id"=>0,//没有订单id，默认0
-                            "order_status" => 2,//2表示'流程中'
-                            "order_type" => 'PRO'//PRO表示'项目'
-                        ];
-                        ProcessOrder::AddProcess($this->post['token'], $process);
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $projectNo,//项目编码
+                            "status" => $old_project_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 4, $info);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'PRO',
+                            "order_code" => $projectNo,
+                            "order_id" => $info['id'],
+                            "order_status" => 4
+                        ]);
 
                         Db::commit();
                         return app_show(0,"方案制作成功",["planNo"=>$planNo]);
@@ -715,10 +775,20 @@ class Project extends Base
             if($up){
 
                 foreach ($infolist as $value){
+                    $old_projectinfo_status = $value['status'];
                     $value['status']=3;
                     $value['updatetime']=date("Y-m-d H:i:s");
                     $up = Db::name("project_info")->save($value);
                     if($up){
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $value['pgNo'],//编码
+                            "status" => $old_projectinfo_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 3, $value);
+
                         $count = Db::name("project_info")->where(["projectNo"=>$value['projectNo'],"status"=>2])
                             ->count();
                         if($count==0){
@@ -728,14 +798,22 @@ class Project extends Base
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
                             }else{
+
                                 //修改状态，添加待办
-                                $process = [
-                                    "order_code" => $value['projectNo'],//把项目编码放到这儿
-                                    //"order_id"=>0,//没有订单id，默认0
-                                    "order_status" => 2,//2表示'流程中'
-                                    "order_type" => 'PRO'//PRO表示'项目'
-                                ];
-                                ProcessOrder::AddProcess($this->post['token'], $process);
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $value['projectNo'],//项目编码
+                                    "status" => 3,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                                ], "PRO", 3, $this->post);
+
+                                ProcessOrder::AddProcess($this->post['token'], [
+                                    "order_type" => 'PRO',
+                                    "order_code" => $value['projectNo'],
+                                    "order_id" => 0,
+                                    "order_status" => 3
+                                ]);
+
                             }
                         }
                     }else{
@@ -772,6 +850,15 @@ class Project extends Base
         try{
             $up = Db::name("project_plan")->where(["planNo"=>$planNos,'is_del'=>0,"status"=>0])->save(["status"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
             if($up) {
+
+                //修改状态，添加待办，只记录动作
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $planNos,//编码
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "PRO", 1, $selec);
+
                 $project = array_column($selec, "projectNo");
                 if (empty($project)) {
                     Db::rollback();
@@ -780,14 +867,20 @@ class Project extends Base
                 $pro = Db::name("project")->where(["projectNo" => $project, "status" => 4])->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
                 if ($pro) {
 
-                    //把待办事项改为结束
-                    $process = [
-                        "order_code" => $project,//把项目编码放到这儿
-                        //"order_id"=>0,//没有订单id，默认0
-                        "order_status" => 3,//3表示'完成'
-                        "order_type" => 'PRO'//PRO表示'项目流程'
-                    ];
-                    ProcessOrder::AddProcess($this->post['token'], $process);
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $project,//项目编码
+                        "status" => 4,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "PRO", 5, $this->post);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'PRO',
+                        "order_code" => $project,
+                        "order_id" => 0,
+                        "order_status" => 5
+                    ]);
 
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
@@ -821,13 +914,14 @@ class Project extends Base
         if($up){
 
             //修改状态，添加待办
-            $process = [
-                "order_code" => $projectNo,//把项目编码放到这儿
-                //"order_id"=>0,//没有订单id，默认0
-                "order_status" => 2,//2表示'流程中'
-                "order_type" => 'PRO'//PRO表示'项目'
-            ];
-            ProcessOrder::AddProcess($this->post['token'], $process);
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $projectNo,//项目编码
+                "status" => $info['status'],//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "edit"//新建create，编辑edit，更改状态status
+            ], "PRO", $info['status'], $info);
+
+            //这里并未修改状态，所以不需要调用ProcessOrder::AddProcess();
 
             return app_show(0,"利润率修改成功");
         }else{

app/admin/controller/Purch.php

@@ -379,7 +379,19 @@ class Purch extends Base
         $data['updatetime'] =date("Y-m-d H:i:s");
         $upd=Db::name("purchease_order")->save($data);
         if($upd){
-            ActionLog::logAdd($this->post['token'],$order,'cgd',$data['status'],$this->post);
+//            ActionLog::logAdd($this->post['token'],$order,'cgd',$data['status'],$this->post);
+
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], $order, "CGD", $data['status'], $this->post);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'CGD',
+                "order_code" => $order['status'],//销售单code
+                "order_id" => $data['id'],
+                "order_status" => $data['status']
+            ]);
+
+
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,'更新失败');
@@ -412,7 +424,7 @@ class Purch extends Base
         if($upd){
             $process=["order_code"=>$cgdNo,"order_id"=>$data['id'],"order_status"=>$status,"order_type"=>'CGD'];
             ProcessOrder::AddProcess($this->post['token'],$process);
-            ActionLog::logAdd($this->post['token'],$order,'cgd',$status,$this->post);
+            ActionLog::logAdd($this->post['token'],$order,'CGD',$status,$this->post);
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,'更新失败');

app/admin/controller/Purchin.php

@@ -328,6 +328,23 @@ class Purchin extends BaseController
                                     if($up==false){
                                         Db::rollback();
                                         return error_show(1004,"出库单出库失败");
+                                    }else{
+                                        foreach ($out as $k => $v_outCode) {
+                                            //修改状态，添加待办
+                                            ActionLog::logAdd($this->post['token'], [
+                                                "order_code" => $v_outCode,//出库单号
+                                                "status" => 0,//这里的status是之前的值
+                                                "action_remark" => '',//备注
+                                                "action_type" => "status"//新建create，编辑edit，更改状态status
+                                            ], "CKD", 1, $this->post);
+
+                                            ProcessOrder::AddProcess($this->post['token'], [
+                                                "order_type" => 'CKD',
+                                                "order_code" => $v_outCode,//出库单号
+                                                "order_id" => 0,
+                                                "order_status" => 1
+                                            ]);
+                                        }
                                     }
                                     $good1 = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
                                     if($good1==false){
@@ -546,7 +563,7 @@ class Purchin extends BaseController
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
-                        ActionLog::logAdd($this->post['token'],$order,"cgd", $cgdinfo['status'],$cgdinfo);
+                        ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
                         $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
                         ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
@@ -570,7 +587,7 @@ class Purchin extends BaseController
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
-                        ActionLog::logAdd($this->post['token'],$order,"cgd", $cgdinfo['status'],$cgdinfo);
+                        ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
                         $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
                         ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();

app/admin/controller/Reorder.php

@@ -413,12 +413,28 @@ class Reorder extends \app\BaseController
                     $orderinfo['wsend_num']-=$info['num'];
                     $orderinfo['th_num']+=$info['num'];
                     $orderinfo['send_status'] = $orderinfo['send_num'] == 0 ? 1 : $orderinfo['wsend_num'] == 0 ? 3 : 2;
+                    $old_status = $orderinfo['status'];
                     $orderinfo['status'] = $orderinfo['send_num'] == 0 ? 3 : $orderinfo['wsend_num'] == 0 ? 5 : 4;
                     $orderinfo['updatetime']=date("Y-m-d H:i:s");
                     $return = Db::name("sale")->save($orderinfo);
                     if($return==false){
                         Db::rollback();
                         return error_show(1004,"更新失败");
+                    }else{
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $orderinfo['orderCode'],//销售单code
+                            "status" => $old_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "XSQRD", $orderinfo['status'], $orderinfo);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'XSQRD',
+                            "order_code" => $orderinfo['orderCode'],//销售单code
+                            "order_id" => $orderinfo['id'],
+                            "order_status" => $orderinfo['status']
+                        ]);
                     }
 
                     foreach ($good_stock as $value){

app/admin/controller/Resign.php

@@ -697,11 +697,27 @@ class Resign extends BaseController
             return error_show(1004,"未找到仓库数据");
         }
         $info['wsm_code']=$wsm;
+        $old_info_status = $info['status'];
         $info['status']=1;
         $info['updatetime']=date("y-m-d H;i:s");
         $up =Db::name("purchease")->save($info);
         if($up){
 
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $info['bk_code'],//销售单code
+                "status" => $old_info_status,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "edit"//新建create，编辑edit，更改状态status
+            ], "BHD", $info['status'], $info);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'BHD',
+                "order_code" => $info['bk_code'],//销售单code
+                "order_id" => $info['id'],
+                "order_status" => $info['status']
+            ]);
+
             return app_show(0,"备库单仓库选择成功");
         }else{
             return error_show(1004,"备库单仓库选择失败");
@@ -778,8 +794,24 @@ class Resign extends BaseController
         ];
         Db::startTrans();
         try{
-            $up =Db::name("purchease_order")->insert($cg);
-            if($up){
+            $up =Db::name("purchease_order")->insert($cg,true);
+            if($up>0){
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $cg['cgdNo'],//销售单code
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "CGD", $cg['status'], $cg);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'CGD',
+                    "order_code" => $cg['cgdNo'],//销售单code
+                    "order_id" => $up,
+                    "order_status" => $cg['status']
+                ]);
+
                 $data=[
                     "cgdNo"=>$cgdCode,
                     "spuCode"=>$info['spuCode'],
@@ -819,10 +851,27 @@ class Resign extends BaseController
 //                        $process = ["order_code" => $cgdCode, "order_id" => Db::name("purchease_order")->getLastInsID(), "order_status" => $cg['status'], "order_type" => 'CGD'];
 //                        ProcessOrder::AddProcess($this->post['token'], $process);
                         $info['wsm_code'] = $wsm_code;
+                        $old_info_status = $info['status'];
                         $info['status'] = 2;
                         $info['updatetime'] = date("Y-m-d H:i:s");
                         $bas = Db::name("purchease")->save($info);
                         if ($bas) {
+
+                            //修改状态，添加待办
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code" => $info['bk_code'],//销售单code
+                                "status" => $old_info_status,//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "edit"//新建create，编辑edit，更改状态status
+                            ], "BHD", $info['status'], $info);
+
+                            ProcessOrder::AddProcess($this->post['token'], [
+                                "order_type" => 'BHD',
+                                "order_code" => $info['bk_code'],//销售单code
+                                "order_id" => $info['id'],
+                                "order_status" => $info['status']
+                            ]);
+
                             Db::commit();
                             return app_show(0, "采购单新建成功", ["cgdNo" => $cgdCode]);
                         }

app/admin/controller/Sale.php

@@ -331,6 +331,21 @@ class Sale extends Base
                                     if ($ou == false) {
                                         Db::rollback();
                                         return error_show(1002, "发货地址添加创建失败");
+                                    }else{
+                                        //修改状态，添加待办
+                                        ActionLog::logAdd($this->post['token'], [
+                                            "order_code" => $outCode,//出库单号
+                                            "status" => 0,//这里的status是之前的值
+                                            "action_remark" => '',//备注
+                                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                                        ], "CKD", 0, $out);
+
+                                        ProcessOrder::AddProcess($this->post['token'], [
+                                            "order_type" => 'CKD',
+                                            "order_code" => $outCode,//出库单号
+                                            "order_id" => 0,
+                                            "order_status" => 0
+                                        ]);
                                     }
                                 }
                             }
@@ -422,8 +437,24 @@ class Sale extends Base
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
         ];
-        $up =Db::name("purchease_order")->insert($cg);
+        $up =Db::name("purchease_order")->insert($cg,true);
         if($up){
+
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" => $cg['cgdNo'],//销售单code
+                "status" => 0,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "create"//新建create，编辑edit，更改状态status
+            ], "CGD", $cg['status'], $cg);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'CGD',
+                "order_code" => $cg['cgdNo'],//销售单code
+                "order_id" => $up,
+                "order_status" => $cg['status']
+            ]);
+
             $rela=[
                 "orderCode"=>$data['orderCode'],
                 "cgdNo"=>$cgdCode,
@@ -585,6 +616,21 @@ class Sale extends Base
                         if($ou==false){
                             Db::rollback();
                             return error_show(1002,"发货地址添加创建失败");
+                        }else{
+                            //修改状态，添加待办
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code" => $outCode,//出库单号
+                                "status" => 0,//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "create"//新建create，编辑edit，更改状态status
+                            ], "CKD", 0, $out);
+
+                            ProcessOrder::AddProcess($this->post['token'], [
+                                "order_type" => 'CKD',
+                                "order_code" => $outCode,//出库单号
+                                "order_id" => 0,
+                                "order_status" => 0
+                            ]);
                         }
 
                         //维护商品所在仓库的库存 --- start
@@ -761,12 +807,28 @@ class Sale extends Base
             ];
             $datainfo = Db::name('sale')->insert($data, true);
             if($datainfo>0){
+                    $old_zx_status = $zx['status'];
                     $zx['status']=5;
                     $zx['updatetime']=date("Y-m-d H:i:s");
                     $sa=Db::name("consult_info")->save($zx);
                     if($sa==false){
                         Db::rollback();
                         return error_show(1002,"咨询单修改失败");
+                    }else{
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $zx['infoNo'],//咨询单详情编号
+                            "status" => $old_zx_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "ZXD", 5, $zx);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'ZXD',
+                            "order_code" => $zx['infoNo'],//咨询单详情编号
+                            "order_id" => $zx['id'],
+                            "order_status" => 5
+                        ]);
                     }
                     $bol=$this->createCgd($cgd);
                     if($bol==false){
@@ -871,6 +933,21 @@ class Sale extends Base
                                 if($ou==false){
                                     Db::rollback();
                                     return error_show(1002,"发货地址添加创建失败");
+                                }else{
+                                    //修改状态，添加待办
+                                    ActionLog::logAdd($this->post['token'], [
+                                        "order_code" => $outCode,//出库单号
+                                        "status" => 0,//这里的status是之前的值
+                                        "action_remark" => '',//备注
+                                        "action_type" => "create"//新建create，编辑edit，更改状态status
+                                    ], "CKD", 0, $out);
+
+                                    ProcessOrder::AddProcess($this->post['token'], [
+                                        "order_type" => 'CKD',
+                                        "order_code" => $outCode,//出库单号
+                                        "order_id" => 0,
+                                        "order_status" => 0
+                                    ]);
                                 }
                                 $order['send_num']+=$value['receipt_quantity'];
                                 $order['wsend_num']-=$value['receipt_quantity'];
@@ -1003,30 +1080,46 @@ class Sale extends Base
                     return error_show(1002, "项目订单生成失败");
                 }
             }
+            $old_plan_status = $plan['status'];
             $plan['status']=2;
             $plan['updatetime']=date("Y-m-d H:i:s");
             $in =Db::name("project_plan")->save($plan);
             if($in==false){
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
+            }else{
+                //修改状态，添加待办，只记录动作
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $planNo,//编码
+                    "status" => $old_plan_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "PRO", 2, $plan);
             }
+            $old_project_status = $project["status"];
             $project["status"]=6;
             $project['updatetime']=date("Y-m-d H:i:s");
             $pr =Db::name("project")->save($project);
             if($pr==false){
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
+            }else{
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $project['projectNo'],//项目编码
+                    "status" => $old_project_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "PRO", 6, $project);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'PRO',
+                    "order_code" => $project['projectNo'],
+                    "order_id" => $project['id'],
+                    "order_status" => 6
+                ]);
             }
 
-            //修改状态，添加待办
-            $process = [
-                "order_code" => $project['projectNo'],//把项目编码放到这儿
-                //"order_id"=>0,//没有订单id，默认0
-                "order_status" => 2,//2表示'流程中'
-                "order_type" => 'PRO'//PRO表示'项目'
-            ];
-            ProcessOrder::AddProcess($this->post['token'], $process);
-
             Db::commit();
             return app_show(0, "咨询订单生成成功");
         }catch (\Exception $e){
@@ -1987,6 +2080,21 @@ class Sale extends Base
                                 ActionLog::logAdd($this->post['token'],$sti,"xsd",0,$sti);
                                 Db::rollback();
                                 return error_show(1003, "创建失败");
+                            }else{
+                                //修改状态，添加待办
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $outCode,//出库单号
+                                    "status" => 0,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                                ], "CKD", 0, $data);
+
+                                ProcessOrder::AddProcess($this->post['token'], [
+                                    "order_type" => 'CKD',
+                                    "order_code" => $outCode,//出库单号
+                                    "order_id" => 0,
+                                    "order_status" => 0
+                                ]);
                             }
                         }
                         $wsm_in_code = makeNo("CF");
@@ -2846,6 +2954,24 @@ class Sale extends Base
                     }
                     $datainfo = Db::name('order_out')->insertAll($data);
                     if($datainfo>0){
+
+                        foreach ($data as $k => $v_data) {
+                            //修改状态，添加待办
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code" => $v_data['outCode'],//出库单号
+                                "status" => $v_data['status'],//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "create"//新建create，编辑edit，更改状态status
+                            ], "CKD", $v_data['status'], $v_data);
+
+                            ProcessOrder::AddProcess($this->post['token'], [
+                                "order_type" => 'CKD',
+                                "order_code" => $v_data['outCode'],//出库单号
+                                "order_id" => 0,
+                                "order_status" => $v_data['status']
+                            ]);
+                        }
+
                         Db::commit();
                         return app_show(0,"出库单新建成功");
                     }
@@ -2889,6 +3015,7 @@ class Sale extends Base
         $outinfo['post_code'] = $post_code;
         $outinfo['post_fee'] = $post_fee;
         $outinfo['sendtime'] = date("Y-m-d H:i:s");
+        $old_outinfo_status = $outinfo['status'];
         $outinfo['status'] = 2;
         $outinfo['updatetime'] = date("Y-m-d H:i:s");
 
@@ -2896,6 +3023,22 @@ class Sale extends Base
         try{
             $up =Db::name("order_out")->save($outinfo);
             if($up){
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $outinfo['outCode'],//出库单号
+                    "status" => $old_outinfo_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "CKD", $outinfo['status'], $outinfo);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'CKD',
+                    "order_code" => $outinfo['outCode'],//出库单号
+                    "order_id" => $outinfo['id'],
+                    "order_status" => $outinfo['status']
+                ]);
+
                 $stokc =Db::name("good_stock")->where(['spuCode'=>$einfo['good_code'],"wsm_code"=>$outinfo['wsm_code'],"is_del"=>0])->find();
                 if($stokc==false){
                     Db::rollback();

app/admin/controller/Salezx.php

@@ -183,6 +183,23 @@ class Salezx extends \app\BaseController
                            if($ou==false){
                                Db::rollback();
                                return error_show(1002,"咨询订单创建失败");
+                           }else{
+
+                               //修改状态，添加待办
+                               ActionLog::logAdd($this->post['token'], [
+                                   "order_code" => $outCode,//出库单号
+                                   "status" => $out['status'],//这里的status是之前的值
+                                   "action_remark" => '',//备注
+                                   "action_type" => "create"//新建create，编辑edit，更改状态status
+                               ], "CKD", $out['status'], $out);
+
+                               ProcessOrder::AddProcess($this->post['token'], [
+                                   "order_type" => 'CKD',
+                                   "order_code" => $outCode,//出库单号
+                                   "order_id" => 0,
+                                   "order_status" => $out['status']
+                               ]);
+
                            }
                         }else{
                             Db::rollback();
@@ -190,6 +207,22 @@ class Salezx extends \app\BaseController
                         }
                     }
                 }
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $orderCode,//销售单code
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "XSQRD", 0, $data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'XSQRD',
+                    "order_code" => $orderCode,//销售单code
+                    "order_id" => $datainfo,
+                    "order_status" => 0
+                ]);
+
                     Db::commit();
                     return error_show(0,"咨询订单创建成功");
             }
@@ -268,8 +301,24 @@ class Salezx extends \app\BaseController
                     "addtime"=>date("Y-m-d H:i:s"),
                     "updatetime"=>date("Y-m-d H:i:s")
                 ];
-                    $up =Db::name("purchease_order")->insert($cg);
+                    $up =Db::name("purchease_order")->insert($cg,true);
                     if($up){
+
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $cg['cgdNo'],//销售单code
+                            "status" => 0,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "CGD", $cg['status'], $cg);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'CGD',
+                            "order_code" => $cg['cgdNo'],//销售单code
+                            "order_id" => $up,
+                            "order_status" => $cg['status']
+                        ]);
+
                         return true;
                     }else{
                         return false;
@@ -663,6 +712,21 @@ class Salezx extends \app\BaseController
                 if($si==false){
                     Db::rollback();
                     return error_show(1003,"创建失败");
+                }else{
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $der['orderCode'],//销售单code
+                        "status" => $item,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "XSQRD", $der['status'], $der);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'XSQRD',
+                        "order_code" => $der['orderCode'],//销售单code
+                        "order_id" => $der['id'],
+                        "order_status" => $der['status']
+                    ]);
                 }
             $sio = ["order_code"=>$orderCode,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$sio,"zxd",$der['status'],$der);

app/admin/controller/Version.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
@@ -299,10 +300,20 @@ class Version extends BaseController
             if($up){
 
                 foreach ($infolist as $value){
+                    $old_value_status = $value['status'];
                     $value['status']=3;
                     $value['updatetime']=date("Y-m-d H:i:s");
                     $up = Db::name("project_info")->save($value);
                     if($up){
+
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $value['projectNo'],//编码
+                            "status" => $old_value_status,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 3, $value);
+
                         $count = Db::name("project_info")->where(["projectNo"=>$value['projectNo'],"status"=>2])
                             ->count();
                         if($count==0){
@@ -312,14 +323,21 @@ class Version extends BaseController
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
                             }else{
+
                                 //修改状态，添加待办
-                                $process = [
-                                    "order_code" => $value['projectNo'],//把项目编码放到这儿
-                                    //"order_id"=>0,//没有订单id，默认0
-                                    "order_status" => 2,//2表示'流程中'
-                                    "order_type" => 'PRO'//PRO表示'项目'
-                                ];
-                                ProcessOrder::AddProcess($this->post['token'], $process);
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code"=>$value['projectNo'],//项目编码
+                                    "status"=>$old_value_status,//这里的status是之前的值
+                                    "action_remark"=>'',//备注
+                                    "action_type"=>"status"//新建create，编辑edit，更改状态status
+                                ],"PRO",$value['status'],$value);
+
+                                ProcessOrder::AddProcess($this->post['token'],[
+                                    "order_type"=>'PRO',
+                                    "order_code"=>$value['projectNo'],
+                                    "order_id"=>$value['id'],
+                                    "order_status"=>$value['status']
+                                ]);
                             }
                         }
                     }else{
@@ -336,6 +354,21 @@ class Version extends BaseController
                             if($staar==false){
                                 Db::rollback();
                                 return error_show(1002, "项目咨询单招标结束失败");
+                            }else{
+                                //修改状态，添加待办
+                                ActionLog::logAdd($this->post['token'], [
+                                    "order_code" => $consult['zxNo'],//项目编码
+                                    "status" => 1,//这里的status是之前的值
+                                    "action_remark" => '',//备注
+                                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                                ], "ZXD", 2, $this->post);
+
+                                ProcessOrder::AddProcess($this->post['token'], [
+                                    "order_type" => 'ZXD',
+                                    "order_code" => $consult['zxNo'],
+                                    "order_id" => 0,
+                                    "order_status" => 2
+                                ]);
                             }
                         }
                     }
@@ -379,17 +412,31 @@ class Version extends BaseController
                 if ($pro) {
 
                     //修改状态，添加待办
-                    $process = [
-                        "order_code" => $project,//把项目编码放到这儿
-                        //"order_id"=>0,//没有订单id，默认0
-                        "order_status" => 2,//2表示'流程中'
-                        "order_type" => 'PRO'//PRO表示'项目'
-                    ];
-                    ProcessOrder::AddProcess($this->post['token'], $process);
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code"=>$project,//项目编码
+                        "status"=>4,//这里的status是之前的值
+                        "action_remark"=>'',//备注
+                        "action_type"=>"status"//新建create，编辑edit，更改状态status
+                    ],"PRO",5,$this->post);
+
+                    ProcessOrder::AddProcess($this->post['token'],[
+                        "order_type"=>'PRO',
+                        "order_code"=>$project,
+                        "order_id"=>0,//这里更新是根据编码更新的，没有主键id
+                        "order_status"=>5
+                    ]);
 
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
                 }
+            }else{
+                //修改状态，添加待办，只记录动作
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $planNos,//编码
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "PRO", 1, $this->post);
             }
             Db::rollback();
             return error_show(1004,"方案选择失败");