panlumeng %!s(int64=3) %!d(string=hai) anos
pai
achega
7c7e793a2a

+ 2 - 1
app/admin/controller/Check.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
+use app\admin\model\ActionLog;
 
 class Check extends BaseController
 {
@@ -289,7 +290,7 @@ public function create(){
 //        }
         if($da){
             $orde = ["order_code"=>$check_code,"status"=>$da['status'],"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$orde,'qrd',$status,$orde);
+            ActionLog::logAdd($this->post['token'],$orde,'qrd',$da['status'],$orde);
            Db::commit();
             return error_show(0,"盘点创建成功");
         }else{

+ 9 - 1
app/admin/controller/Group.php

@@ -163,7 +163,7 @@ class Group extends BaseController
         ];
         $in =  Db::name("role_group")->save($data);
         $orde = ["order_code"=>$groupuser,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
-        ActionLog::logAdd($this->post['token'],$orde,'role_group',1,$orde);
+        ActionLog::logAdd($token,$orde,'role_group',1,$orde);
         return $in ? app_show(0,"新建成功"): error_show(1005,"新建失败");
     }
 
@@ -203,6 +203,8 @@ class Group extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $in = Db::name("role_group")->save($data);
+        $orde = ["order_code"=>$groupid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($token,$orde,'role_group',0,$orde);
         return $in ? app_show(0,"更新成功"): error_show(1005,"更新失败");
     }
 
@@ -212,6 +214,10 @@ class Group extends BaseController
      */
     public function GroupStatus(){
         $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
         $groupid = isset($post['id']) ? intval($post['id']):"";
         if($groupid==""){
             return error_show(1002,"用户组id不能为空");
@@ -230,6 +236,8 @@ class Group extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $in = Db::name("role_group")->save($data);
+        $orde = ["order_code"=>$groupid,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($token,$orde,'role_group',$status,$orde);
         return $in ? app_show(0,"更新成功"): error_show(1005,"更新失败");
     }
 }

+ 12 - 2
app/admin/controller/Menu.php

@@ -3,6 +3,7 @@ declare (strict_types = 1);
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -10,7 +11,7 @@ use think\Request;
 
 class Menu extends BaseController
 {
-
+    public $post="";
     private $uid = '';
     /**
      * 显示资源列表
@@ -24,7 +25,6 @@ class Menu extends BaseController
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
-
         }
         $effetc = VerifyTokens($token);
         if(!empty($effetc) && $effetc['code']!=0){
@@ -130,6 +130,8 @@ class Menu extends BaseController
             $data['id']=$id;
         }
         $result = Db::name("admin_menu")->save($data);
+        $orde = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$orde,"admin_menu",0,$orde);
         return $result ? app_show(0,"{$message}成功"): error_show(1003,"{$message}失败");
     }
 
@@ -151,9 +153,12 @@ class Menu extends BaseController
         if($statu===""){
             return error_show(1003,"菜单状态不能为空");
         }
+        $var= $menu['status'];
         $menu['status']=$statu;
         $menu['updatetime']=date("Y-m-d H:i:s");
         $result = Db::name("admin_menu")->save($menu);
+        $orde = ["order_code"=>$id,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$orde,"admin_menu", $menu['status'],$orde);
         return $result ? app_show(0,"状态更新成功"): error_show(1003,"状态更新失败");
     }
 
@@ -194,11 +199,14 @@ class Menu extends BaseController
         if($menu==false){
             return error_show(1003,"菜单不信息不存在");
         }
+        $var=$menu['status'];
         $menu['is_show']=0;
         $menu['status']=0;
         $menu['is_del']=1;
         $menu['updatetime']=date("Y-m-d H:i:s");
         $result =  Db::name("admin_menu")->save($menu);
+        $orde = ["order_code"=>$id,"status"=>$var,"action_remark"=>'',"action_type"=>"delete"];
+        ActionLog::logAdd($this->post['token'],$orde,"admin_menu", $menu['status'],$orde);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 
@@ -218,6 +226,8 @@ class Menu extends BaseController
         }
 
         $result =  Db::name("action")->delete($menu);
+        $orde = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+        ActionLog::logAdd($this->post['token'],$orde,"action",0,$orde);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 }

+ 14 - 1
app/admin/controller/Newfill.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
+use app\admin\model\ActionLog;
 
 class Newfill extends BaseController
 {
@@ -71,11 +72,14 @@ class Newfill extends BaseController
         if(empty($s)){
             return error_show(1005,"未找到部门");
         }
+       $var= $s['status'];
         $di = $s['status']==0? "1":"0";
         $s['status']=$di;
         $s['updatetime'] = date("Y-m-d H:i:s");
        // var_dump($s);
         $ti = Db::name('company_item')->save($s);
+        $orde = ["order_code"=>$id,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$orde,"company_item",$s['status'],$orde);
         return app_show(0,"更新成功");
     }
     /*职位*/
@@ -99,6 +103,8 @@ class Newfill extends BaseController
                 $f['position']=1;
                 $f['updatetime']= date("Y-m-d H:i:s");
                 $m= Db::name('depart_user')->save($f);
+                $orde = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$orde,"depart_user",0,$orde);
                  if($m==true){
                      Db::commit();
                  }else{
@@ -152,7 +158,6 @@ class Newfill extends BaseController
         $weight = isset($this->post['weight']) && $this->post['weight'] !==""? trim($this->post['weight']):"1";
         Db::startTrans();
         try{
-
             $data =[
                 "name"=>$item_name, "pid"=>$pid, "level"=>$level, "weight"=>$weight,
                 "is_del"=>0,
@@ -163,6 +168,8 @@ class Newfill extends BaseController
 
             $t= Db::name("company_item")->insert($data,true);
             if($t>0){
+                $orde = ["order_code"=>$pid,"status"=>0,"action_remark"=>'',"action_type"=>"creat"];
+                ActionLog::logAdd($token,$orde,"company_item",0,$orde);
                 $depart_link=$spid['depart_link']."{$t}-";
                 $level =explode('-',$depart_link);
                 $level = array_filter($level);
@@ -170,6 +177,8 @@ class Newfill extends BaseController
                 $i=['depart_link'=>$depart_link,'level'=>$level];
                 $o=Db::name('company_item')->where(['id'=>$t])->update($i);
                 if($o){
+                    $stn = ["order_code"=>$pid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($token,$stn,"company_item",0,$stn);
                    Db::commit();
                    return error_show(0,"添加成功");
                 }
@@ -230,6 +239,8 @@ class Newfill extends BaseController
             'level'=>$itemlevel
         ];
       $re = Db::name("company_item")->save($item);
+        $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($token,$stn,"company_item",0,$stn);
       return $re ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
     }
     /*查询*/
@@ -272,6 +283,8 @@ class Newfill extends BaseController
         $items['is_del']=1;
         $items['updatetime']=date("Y-m-d H:i:s");
         $result = Db::name("company_item")->save($items);
+        $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+        ActionLog::logAdd($token,$stn,"company_item",0,$stn);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 }

+ 12 - 0
app/admin/controller/Orderback.php

@@ -3,6 +3,7 @@
 
 namespace app\Admin\controller;
 
+use app\admin\model\ActionLog;
 use think\App;
 use think\facade\Db;
 
@@ -146,12 +147,15 @@ class Orderback extends \app\BaseController
       $info['received_num'] = $receive;
       $info['normal_num'] = $normal;
       $info['remark'] = $remark;
+     $str = $info['status'];
       $info['status'] = 2;
       $info['updatetime'] = date("Y-m-d H:i:s");
       Db::startTrans();
       try{
           $up=Db::name("order_back")->save($info);
           if($up){
+              $stn = ["order_code"=>$info['thNo'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
+              ActionLog::logAdd($this->post['token'],$stn,"BKD",2,$stn);
               if(empty($errorlist)){
                   Db::commit();
                   return app_show(0,'更新成功');
@@ -169,6 +173,8 @@ class Orderback extends \app\BaseController
                   $data['updatetime']=date("Y-m-d H:i:s");
                   $in = Db::name("order_backinfo")->save($data);
                   if(!$in){
+                      $stm = ["order_code"=>$info['thNo'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
+                      ActionLog::logAdd($this->post['token'],$stm,"BKD",2,$stm);
                       Db::rollback();
                       return error_show(1005,'更新失败');
                   }
@@ -200,10 +206,13 @@ class Orderback extends \app\BaseController
       }
       Db::startTrans();
       try{
+          $temp=$info['status'];
           $info['status'] =$status;
           $info['updatetime'] = date("Y-m-d H:i:s");
           $up=Db::name("order_back")->save($info);
           if($up){
+              $stn = ["order_code"=>$thNo,"status"=>$temp,"action_remark"=>'',"action_type"=>"edit"];
+              ActionLog::logAdd($this->post['token'],$stn,"BKD",$info['status'],$stn);
               if(empty($errorlist)){
                   Db::commit();
                   return app_show(0,'更新成功');
@@ -250,11 +259,14 @@ class Orderback extends \app\BaseController
         $remark= isset($this->post['remark']) && $this->post['remark']!="" ? trim($this->post['remark']):"";
         Db::startTrans();
         try{
+            $var = $info['status'];
             $info['status'] =$status;
             $info['remark'] =$remark;
             $info['updatetime'] = date("Y-m-d H:i:s");
             $up=Db::name("order_back")->save($info);
             if($up){
+                $stn = ["order_code"=>$thNo,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$stn,"BKD",$info['status'],$stn);
                 Db::commit();
                 return app_show(0,'更新成功');
             }

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

@@ -377,6 +377,8 @@ class Purch extends \app\BaseController
         try{
             $item = Db::name("purchease_diff")->insert($data);
             if($item){
+                $stm = ["order_code"=>$cgdNo,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$stm,"BKD",1,$stm);
                 if($cg['order_type']==2){
                     $order = Db::name("sale")->where(["orderCode"=>$cg['bkcode']])->find();
                     if(empty($order)){
@@ -397,6 +399,8 @@ class Purch extends \app\BaseController
                     ];
                     $cgd = Db::name('sale_diff')->insert($data);
                     if($cgd){
+                        $sto = ["order_code"=>$cg['bkcode'],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                        ActionLog::logAdd($this->post['token'],$sto,"BKD",1,$sto);
                         Db::commit();
                         return error_show(0,"新建成功");
                     }else{
@@ -489,11 +493,13 @@ class Purch extends \app\BaseController
         if($status===""){
             return error_show(1002,"参数status不能为空");
         }
-
+        $temp = $dio['status'];
             $dio['status']=$status;
             $dio['updatetime']=date("Y-m-d H:i:s");
             $item = Db::name("purchease_diff")->update($dio);
          if ($item){
+             $sto = ["order_code"=>$id,"status"=>$temp,"action_remark"=>'',"action_type"=>"create"];
+             ActionLog::logAdd($this->post['token'],$sto,"cgd",$dio['status'],$sto);
                 return error_show(0,"更新成功");
             }else{
                 return error_show(1002,"更新失败");

+ 8 - 0
app/admin/controller/Purchback.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -69,6 +70,8 @@ public function create(){
     //$data['can'] = $int;
     $pd = Db::name('purchease_back')->insert($data);
     if($pd){
+        $sto = ["order_code"=>$returnCode,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd($this->post['token'],$sto,"BKD",1,$sto);
         return error_show(0,"新建成功");
     }else{
         return error_show(1002,"新建失败");
@@ -131,10 +134,13 @@ public function status(){
     if($status===""){
         return error_show(1001,'status不能为空');
     }
+    $temp= $dio['status'];
     $dio['status']=$status;
     $dio['updatetime']=date("Y-m-d H:i:s");
     $str = Db::name("purchease_back")->update($dio);
     if($str){
+        $sto = ["order_code"=>$id,"status"=>$temp,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$sto,"BKD",$dio['status'],$sto);
         return error_show(0,"更新成功");
     }else{
         return error_show(1002,"更新失败");
@@ -174,6 +180,8 @@ public function backfe(){
         "updatetime"=>date("Y-m-d H:i:s")
     ];
     $datainfo=Db::name('purchease_back')->save($data);
+    $sto = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+    ActionLog::logAdd($this->post['token'],$sto,"BKD",0,$sto);
     return $datainfo ? error_show(0,"更新成功") : error_show(1002,"更新失败");
 }
 public function info(){

+ 9 - 0
app/admin/controller/Purchin.php

@@ -163,6 +163,8 @@ class Purchin extends BaseController
         Db::startTrans();
         try{
             $win = Db::name("purchease_in")->insert($orin);
+            $sto = ["order_code"=>$wsm_in_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$sto,"BKD",$status,$sto);
             if($win){
                 $order = ["order_code"=>$wsm_in_code,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
                 ActionLog::logAdd($this->post['token'],$order,"rkd",$status,$this->post);
@@ -492,6 +494,8 @@ class Purchin extends BaseController
             ];
             $res = Db::name("purchease_return")->insert($data);
             if($res){
+                $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$sto,"BKD",0,$sto);
                 Db::commit();
                 return app_show(0,"验货审核完成");
             }else{
@@ -539,10 +543,15 @@ class Purchin extends BaseController
         try{
             $up =Db::name("purchease_return")->where($return)->save($data);
             if($up){
+                $sto = ["order_code"=>$post_code,"status"=>1,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$sto,"BKD",1,$sto);
+                $ark=$info['status'];
                 $info['status']=5;
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $sa=Db::name("purchease_in")->save($info);
                 if($sa){
+                    $stn = ["order_code"=>$post_code,"status"=>$ark,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$stn,"BKD",5,$stn);
                     Db::commit();
                     return  app_show(0,"退货发货成功");
                 }else{

+ 12 - 0
app/admin/controller/Reorder.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 
 use think\facade\Db;
 use think\App;
+use app\admin\model\ActionLog;
 class Reorder extends \app\BaseController
 {
     public $post=[];
@@ -78,6 +79,8 @@ class Reorder extends \app\BaseController
             ];
             $create = Db::name("sale_return")->insert($in);
             if($create){
+                $stn = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$stn,"xsd",0,$stn);
                 $addrinfo=[];
                 foreach ($addr as $value){
                     $addrorder= Db::name("order_addr")->where(['orderCode'=>$ordeCode,"id"=>$value['addrid']])
@@ -104,6 +107,8 @@ class Reorder extends \app\BaseController
                 }
                 $return = Db::name("sale_returnaddr")->insertAll($addrinfo);
                 if($return<=0){
+                    $str = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$str,"xsd",0,$str);
                     Db::rollback();
                     return error_show(1002,"订单地址退货数据更新失败");
                 }
@@ -133,6 +138,8 @@ class Reorder extends \app\BaseController
                 }
                 $return = Db::name("sale_returninfo")->insertAll($info);
                 if($return){
+                    $stm = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$stm,"xsd",0,$stm);
                     Db::commit();
                     return app_show(0,"退货单新建成功");
                 }
@@ -289,6 +296,8 @@ class Reorder extends \app\BaseController
         $info["updatetime"]=date("Y-m-d H:i:s");
         $del = Db::name("sale_return")->save($info);
         if($del){
+            $ste = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$ste,"xsd",0,$ste);
             return app_show(0,"删除成功");
         }else{
             return error_show(1004,"删除失败");
@@ -317,11 +326,14 @@ class Reorder extends \app\BaseController
             return error_show(1004,"参数status不能为空");
         }
         $remark =  isset($this->post['remark']) && $this->post['remark'] !="" ? trim($this->post['remark']) :"";
+       $var = $info['status'];
         $info['status'] =$status;
         $info['remark'] =$remark;
         $info["updatetime"]=date("Y-m-d H:i:s");
         $up = Db::name("sale_return")->save($info);
         if($up){
+            $ste = ["order_code"=>$code,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$ste,"xsd",$info['status'],$ste);
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,"更新失败");

+ 0 - 1
app/admin/controller/Resign.php

@@ -9,7 +9,6 @@ use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\facade\Db;
 use think\App;
-
 class Resign extends BaseController
 {
     public $post="";

+ 10 - 1
app/admin/controller/Resigninfo.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
-
+use app\admin\model\ActionLog;
 class Resigninfo extends BaseController
 {
     public $post="";
@@ -118,6 +118,8 @@ class Resigninfo extends BaseController
             "updatetime"=>date("Y-m-d H:i:s"),
         ];
         $in = Db::name('resign_info')->insert($data);
+        $stn = ["order_code"=>$resign_id,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd($this->post['token'],$stn,"resign_info",$status,$stn);
         return $in ? error_show(0,"添加成功") : error_show(1002,"添加失败");
     }
     public function selec(){
@@ -175,6 +177,8 @@ class Resigninfo extends BaseController
       ];
       $it = Db::name('resign_info')->where(['is_del'=>0,'id'=>$id])->save($str);
       if($it){
+          $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+          ActionLog::logAdd($this->post['token'],$stn,"resign_info",0,$stn);
           return error_show(0,"编辑成功");
       }else{
           return error_show(1002,"编辑失败");
@@ -188,6 +192,8 @@ class Resigninfo extends BaseController
         }
         $num = Db::name('resign_info')->update(['is_del'=>1,'id'=>$id,"updatetime"=>date("Y-m-d H:i:s")]);
         if($num){
+            $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$stn,"resign_info",0,$stn);
             return error_show(0,"删除成功");
         }else{
             return error_show(1002,"删除失败");
@@ -207,11 +213,14 @@ class Resigninfo extends BaseController
         if(empty($st)){
             return error_show(1002,"离职人员信息未找到");
         }
+        $tn =$st['status'];
         $st['remark']=$remark;
         $st['status']=$stauts;
         $st['updatetime']= date('Y-m-d H:i:s');
         $sv = Db::name('resign_info')->save($st);
         if($sv){
+            $stn = ["order_code"=>$id,"status"=>$tn,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$stn,"resign_info",$stauts,$stn);
             return error_show(0,"状态更新成功");
         }else{
             return error_show(1002,"状态更新失败");

+ 10 - 1
app/admin/controller/Result.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
-
+use app\admin\model\ActionLog;
 class Result extends BaseController
 {
     public $post = "";
@@ -67,6 +67,8 @@ class Result extends BaseController
             "addtime" => date("Y-m-d H:i:s")
         ];
         $cr = Db::name('result_info')->insert($data);
+        $stn = ["order_code"=>$result,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd($this->post['token'],$stn,"resign_info",$status,$stn);
         return $cr ? error_show(0, "添加成功") : error_show(1002, "添加失败");
     }
 
@@ -107,6 +109,8 @@ class Result extends BaseController
             "updatetime" => date("Y-m-d H:i:s"),
         ];
         $stn = Db::name('result_info')->where(['is_del' => 0, 'id' => $id])->save($li);
+        $st = ["order_code"=>$id,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$st,"resign_info",$status,$st);
         return $stn ? error_show(0, "编辑成功") : error_show(1002, "编辑失败");
     }
 
@@ -119,6 +123,8 @@ class Result extends BaseController
         }
         $back = Db::name('result_info')->update(['id' => $id, 'is_del' => 1, 'updatetime' => date('Y-m-d H:i:s')]);
         if ($back) {
+            $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$st,"resign_info",0,$st);
             return error_show(0, '删除成功');
         } else {
             return error_show(1002, '删除失败');
@@ -135,11 +141,14 @@ class Result extends BaseController
         if (empty($pd)) {
             return error_show(1002, "未找到原因编码");
         }
+        $de =  $pd['status'];
         $dp = $pd['status'] == 0 ? "1" : "0";
         $pd['status'] = $dp;
         $pd ['updatetime'] = date('Y-m-d H:i:s');
         $tn = Db::name('result_info')->save($pd);
         if ($tn) {
+            $st = ["order_code"=>$id,"status"=>$de,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$st,"resign_info",$pd['status'],$st);
             return error_show(0, "状态更新成功");
         } else {
             return error_show(1002, "状态更新失败");

+ 12 - 2
app/admin/controller/Role.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
-
+use app\admin\model\ActionLog;
 class Role extends BaseController
 {
 
@@ -127,7 +127,8 @@ class Role extends BaseController
                 "item"=>"",
             ];
             $role= Db::name("role")->insert($list,true);
-
+            $st = ["order_code"=>$role_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+            ActionLog::logAdd($this->post['token'],$st,"role",1,$st);
             if($role>0){
                 $role_action = [
                     "role_id"=>$role,
@@ -140,6 +141,8 @@ class Role extends BaseController
                 ];
                 $roleaction= Db::name("role_action")->insert($role_action,true);
                 if($roleaction){
+                    $sty = ["order_code"=>$role,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$sty,"role_action",1,$sty);
                     Db::commit();
                     return app_show(0,"新建成功");
                 }else{
@@ -252,6 +255,8 @@ class Role extends BaseController
                 'id'=>$roleid
             ];
             $role= Db::name("role")->save($list);
+            $stm = ["order_code"=>$roleid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$stm,"resign_info",0,$stm);
             if($role){
                 $role_action = [
                     "role_id"=>$roleid,
@@ -262,6 +267,8 @@ class Role extends BaseController
                 ];
                 $roleaction= Db::name("role_action")->where("role_id","=",$roleid)->update($role_action);
                 if($roleaction){
+                    $stl = ["order_code"=>$roleid,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$stl,"role_action",0,$stl);
                     Db::commit();
                     return app_show(0,"更新成功");
                 }else{
@@ -310,6 +317,9 @@ class Role extends BaseController
                 ];
                 $action =  Db::name("role_action")->where("role_id","=",$roleid)->update($dat2);
                 if($action){
+
+                    $sti = ["order_code"=>$roleid,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$sti,"role_action",0,$sti);
                     Db::commit();
                     return app_show(0,"状态更新成功");
                 }

+ 46 - 3
app/admin/controller/Sale.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
-
+use app\admin\model\ActionLog;
 class Sale extends BaseController
 {
     public $post = "";
@@ -100,8 +100,11 @@ class Sale extends BaseController
             $vat = [];
             $inn = [];
             if ($datainfo > 0) {
+                $st = ["order_code"=>$orderCode,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$st,"xsd",1,$st);
                 foreach ($vi as $ion) {
                     $iten = [];
+                    $sto = $iten['status'];
                     $iten['orderCode'] = $orderCode;
                     $iten['wsm_code'] = $ion['wsm_code'];
                     $iten['stock_id'] = "";
@@ -118,6 +121,8 @@ class Sale extends BaseController
 //            }
                 $vp = Db::name('sale_info')->insertAll($inn);
                 if ($vp == "") {
+                    $stn = ["order_code"=>$orderCode,"status"=>$sto,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$stn,"xsd",0,$stn);
                     Db::rollback();
                     return error_show(1002, "添加失败");
                 }
@@ -148,6 +153,8 @@ class Sale extends BaseController
                 }
                 $vmp = Db::name('order_addr')->insertAll($vat);
                 if ($vmp) {
+                    $stp = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$stp,"xsd",0,$stp);
                     Db::commit();
                     return error_show(0, "销售订单创建成功");
                 }
@@ -297,9 +304,11 @@ class Sale extends BaseController
             ];
             $datninfo = Db::name('sale')->where(['id' => $id, 'is_del' => 0])->save($datn);
             if ($datninfo > 0) {
-
+                $stn = ["order_code"=>$good_code,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$stn,"xsd",$status,$stn);
                 foreach ($vi as $ion) {
                     $iten = [];
+                    $sto = $iten['status'];
                     isset($ion['id']) && $ion['id'] !== "" ? $iten['id'] = $ion['id'] : '';
                     $iten['orderCode'] = $etid['orderCode'];
                     $iten['wsm_code'] = $ion['wsm_code'];
@@ -311,7 +320,10 @@ class Sale extends BaseController
                     $iten['updatetime'] = date("Y-m-d H:i:s");
                     //$inn[]=$iten;
                     $vp = Db::name('sale_info')->save($iten);
-                    if ($vp == false) {
+                    if ($vp == false)
+                    {
+                        $stc = ["order_code"=>$good_code,"status"=>$sto,"action_remark"=>'',"action_type"=>"edit"];
+                        ActionLog::logAdd($this->post['token'],$stc,"xsd",1,$stc);
                         Db::rollback();
                         return error_show(1002, "更新失败");
                     }
@@ -335,6 +347,8 @@ class Sale extends BaseController
                     $temp['arrive_time'] = date("Y-m-d H:i:s");
                     $dat = Db::name('order_addr')->save($temp);
                     if ($dat == false) {
+                        $stu = ["order_code"=>$good_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                        ActionLog::logAdd($this->post['token'],$stu,"xsd",0,$stu);
                         Db::rollback();
                         return error_show(1002, "更新失败");
                     }
@@ -476,6 +490,8 @@ class Sale extends BaseController
         }
         $str = Db::name('sale')->update(['id' => $id, 'is_del' => 1, 'updatetime' => date("Y-m-d H:i:s")]);
         if ($str) {
+            $stc = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$stc,"xsd",0,$stc);
             return error_show(0, "删除成功");
         } else {
             return error_show(1002, "删除失败");
@@ -529,10 +545,13 @@ class Sale extends BaseController
 
         Db::startTrans();
         try {
+            $vmp =$dio['status'];
             $dio['status'] = $status;
             $dio['updatetime'] = date("Y-m-d H:i:s");
             $st = Db::name('sale')->save($dio);
             if ($st) {
+                $stc = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$stc,"xsd",$dio['status'],$stc);
                 if ($status == 3) {
                     $dn = Db::name('sale_info')->where(['orderCode' => $st['orderCode']])->select();
                     foreach ($dn as $value) {
@@ -597,6 +616,8 @@ class Sale extends BaseController
                     $cgin = Db::name("purchease_order")->insert($clll);
                     //  var_dump(Db::name("purchease_order")->getLastSql(),$clll);
                     if ($cgin == false) {
+                        $stb = ["order_code"=>$cgd,"status"=> $dio['send_type'],"action_remark"=>'',"action_type"=>"create"];
+                        ActionLog::logAdd($this->post['token'],$stb,"xsd", $dio['send_type'],$stb);
                         Db::rollback();
                         return error_show(1002, "咨询采购单创建商品失败");
                     }
@@ -625,6 +646,8 @@ class Sale extends BaseController
                             ];
                             $datainfo = Db::name('order_out')->insert($data);
                             if (!$datainfo) {
+                                $sti = ["order_code"=>$dio['orderCode'],"status"=> 0,"action_remark"=>'',"action_type"=>"create"];
+                                ActionLog::logAdd($this->post['token'],$sti,"xsd",0,$sti);
                                 Db::rollback();
                                 return error_show(1003, "创建失败");
                             }
@@ -649,6 +672,8 @@ class Sale extends BaseController
                         ];
                         $win = Db::name("purchease_in")->insert($orin);
                         if (!$win){
+                            $stv = ["order_code"=>$wsm_in_code,"status"=>4,"action_remark"=>'',"action_type"=>"create"];
+                            ActionLog::logAdd($this->post['token'],$stv,"xsd",4,$stv);
                             Db::rollback();
                             return error_show(1003, "创建失败");
                         }
@@ -669,6 +694,8 @@ class Sale extends BaseController
                         $good['updatetime'] = date("Y-m-d H:i:s");
                         $upd = Db::name("good_stock")->save($good);
                         if (!$upd) {
+                            $ste = ["order_code"=> $zxinfo['cpNo'],"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                            ActionLog::logAdd($this->post['token'],$ste,"xsd",0,$ste);
                             Db::rollback();
                             return error_show(1003, "创建失败");
                         }
@@ -707,6 +734,8 @@ class Sale extends BaseController
             ];
             $datainfo = Db::name('sale')->where(['id' => $id, 'is_del' => 0])->save($data);
             if ($datainfo) {
+                $stx = ["order_code"=> $id,"status"=>2,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$stx,"xsd",2,$stx);
                 foreach ($vr as $value) {
                     $tm = [];
                     $tm['id'] = $value['id'];
@@ -715,6 +744,8 @@ class Sale extends BaseController
                     $tm['updatetime'] = date("Y-m-d H:i:s");
                     $dn = Db::name('order_addr')->save($tm);
                     if ($dn == false) {
+                        $stx = ["order_code"=>$value['id'],"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                        ActionLog::logAdd($this->post['token'],$stx,"xsd",0,$stx);
                         Db::rollback();
                         return error_show(1002, "更新失败");
                     }
@@ -812,6 +843,8 @@ class Sale extends BaseController
             ];
             $datainfo = Db::name('order_out')->insert($data);
             if ($datainfo) {
+                $stx = ["order_code"=>$orderCode,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$stx,"xsd",$status,$stx);
                 if ($status == 1) {
 
                     $var = Db::name('sale_info')->where(['orderCode' => $orderCode, 'wsm_code' => $wsm_code])->find();
@@ -821,6 +854,7 @@ class Sale extends BaseController
                     }
                   //  $send = Db::name("order_out")->where(["wsm_code" => $wsm_code, 'orderCode' => $orderCode])->sum
                     //("send_num");
+                   // $item =$der['status'];
                     $der['send_num'] += $send_num;
                     $der['wsend_num'] -= $send_num;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
                     $der['send_status'] = $der['send_num'] == 0 ? 1 : $der['wsend_num'] == 0 ? 3 : 2;
@@ -886,6 +920,7 @@ class Sale extends BaseController
         }
         Db::startTrans();
         try {
+            $time = $codeinfo['status'];
             $codeinfo['status'] = $status;
             $codeinfo['updatetime'] = date("Y-m-d H:i:s");
             $cust = Db::name('order_out')->save($codeinfo);
@@ -907,6 +942,8 @@ class Sale extends BaseController
                     $var['intra_stock'] -= $codeinfo['send_num'];
                     $var['updatetime'] = date("Y-m-d H:i:s");
                     $stre = Db::name('good_stock')->save($var);
+                    $stx = ["order_code"=>$outCode,"status"=>$time,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$stx,"xsd", $codeinfo['status'],$stx);
                     if ($stre == false) {
                         Db::rollback();
                         return error_show(1002, "状态更新失败");
@@ -1021,6 +1058,7 @@ class Sale extends BaseController
         }
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "2";
         $remark = isset($this->post['remark']) && $this->post['remark'] !== "" ? trim($this->post['remark']) : "";
+        $item = $info['status'];
         $info['is_act'] = $is_act;
         $info['customer_remark'] = $customer_remark;
         $info['status'] = $status;
@@ -1028,6 +1066,8 @@ class Sale extends BaseController
         $info['updatetime'] = date("Y-m-d H:i:s");
         $up = Db::name("sale_diff")->save($info);
         if ($up) {
+            $stx = ["order_code"=>$id,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$stx,"sxd", $info['status'],$stx);
             return app_show(0, "更新成功");
         } else {
             return error_show(1003, "更新失败");
@@ -1052,11 +1092,14 @@ class Sale extends BaseController
         }
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "3";
         $remark = isset($this->post['remark']) && $this->post['remark'] !== "" ? trim($this->post['remark']) : "";
+        $ite=$info['status'];
         $info['status'] = $status;
         $info['remark'] = $remark;
         $info['updatetime'] = date("Y-m-d H:i:s");
         $up = Db::name("sale_diff")->save($info);
         if ($up) {
+            $stx = ["order_code"=>$id,"status"=>$ite,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$stx,"sxd", $info['status'],$stx);
             return app_show(0, "更新成功");
         } else {
             return error_show(1003, "更新失败");

+ 19 - 0
app/admin/controller/Salezx.php

@@ -4,6 +4,7 @@
 namespace app\admin\controller;
 use think\App;
 use think\facade\Db;
+use app\admin\model\ActionLog;
 class Salezx extends \app\BaseController
 {
     public $post="";
@@ -101,6 +102,8 @@ class Salezx extends \app\BaseController
             $datainfo = Db::name('sale')->insert($data,true);
             $vat=[];
             if($datainfo>0){
+                $st = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$st,"zxd",0,$st);
                 $addgood=$this->addGood($zxinfo);
                 if($addgood==false){
                     Db::rollback();
@@ -198,6 +201,8 @@ class Salezx extends \app\BaseController
         ];
         $insert = Db::name("good")->insert($good);
         if($insert){
+            $st = ["order_code"=>$data["cpNo"],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+            ActionLog::logAdd($this->post['token'],$st,"resign_info",1,$st);
             $type=[
                 "type_code"=>$data['cpNo'],
                 "good_code"=>"GD-".$data["cpNo"],
@@ -221,6 +226,8 @@ class Salezx extends \app\BaseController
             ];
             $ert = Db::name("good_type")->insert($type);
             if($ert){
+                $sti = ["order_code"=>$data["cpNo"],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$sti,"resign_info",1,$sti);
                 return true;
             }
         }
@@ -304,6 +311,8 @@ class Salezx extends \app\BaseController
             ];
             $datainfo = Db::name('sale')->where(["id"=>$zxNo])->save($data);
             if($datainfo!=false){
+                $st = ["order_code"=>$customer_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$st,"resign_info",0,$st);
                 $saleinfos=[
                     "wsm_code"=>$wsm['wsm_code'],
                     "num"=>$good_num,
@@ -407,6 +416,7 @@ class Salezx extends \app\BaseController
        // $status = isset($this->post['status']) && $this->post['status'] !=="" ? $this->post['status'] :"1";
         Db::startTrans();
         try {
+            $var = $der['status'];
             $der['post_name'] = $post_name;
             $der['post_code'] = $post_code;
             $der['post_fee'] = $post_fee;
@@ -414,6 +424,8 @@ class Salezx extends \app\BaseController
             $der['status'] = 1;
             $der['updatetime'] = date("Y-m-d H:i:s");
             $datainfo = Db::name('order_out')->save($der);
+            $st = ["order_code"=>$outCode,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$st,"resign_info",$der['status'] ,$st);
             if($datainfo) {
 //                    $send =Db::name("order_out")->where(["wsm_code"=>$der['wsm_code'],'orderCode'=>$der['orderCode']])->sum("send_num");
 //                    $order['send_num']+= $der['send_num'];
@@ -547,6 +559,8 @@ class Salezx extends \app\BaseController
                 ];
                 $addrid = Db::name('order_addr')->insert($addr,true);
                 if($addrid<=0){
+                    $st = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$st,"zxd",0,$st);
                     Db::rollback();
                     return error_show(1003,"创建失败");
                 }
@@ -573,9 +587,12 @@ class Salezx extends \app\BaseController
                 ];
                 $datainfo = Db::name('order_out')->insert($data);
                 if(!$datainfo){
+                    $sio = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$sio,"zxd",0,$sio);
                     Db::rollback();
                     return error_show(1003,"创建失败");
                 }
+                $item = $der['status'];
                 $der['send_num']+= $receipt_quantity;
                 $der['wsend_num']-=$receipt_quantity;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
                 $der['send_status']=$der['send_num']==0 ? 1 :($der['wsend_num']==0?3:2);
@@ -583,6 +600,8 @@ class Salezx extends \app\BaseController
                 $der['updatetime'] = date("Y-m-d H:i:s");
                 $si = Db::name('sale')->save($der);
                 if($si==false){
+                    $sio = ["order_code"=>$orderCode,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$sio,"zxd",$der['status'],$sio);
                     Db::rollback();
                     return error_show(1003,"创建失败");
                 }

+ 11 - 0
app/admin/controller/Share.php

@@ -6,6 +6,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\Request;
 use think\facade\Db;
+use app\admin\model\ActionLog;
 class Share extends BaseController
 {
     /**
@@ -115,6 +116,8 @@ class Share extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $result= Db::name("role_share")->save($data);
+        $st = ["order_code"=>$collect,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd($token,$st,"role_share",1,$st);
         return $result ? app_show(0,"新建成功"):error_show(1006,"新建失败");
     }
 
@@ -169,6 +172,8 @@ class Share extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $result= Db::name("role_share")->where("id","=",$id)->update($data);
+        $st = ["order_code"=>$collect,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($token,$st,"role_share",0,$st);
         return $result ? app_show(0,"更新成功"):error_show(1006,"更新失败");
     }
 
@@ -257,10 +262,13 @@ class Share extends BaseController
         if(!in_array($status,[0,1])){
             return error_show(1002,"参数status 无效");
         }
+        $item=$info['status'];
         $info['status']=$status;
         $info['updatetime']=date("Y-m-d H:i:s");
         $msg = $status==1?"启用":"禁用";
         $update = Db::name("role_share")->save($info);
+        $st = ["order_code"=>$id,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($token,$st,"role_share",$info['status'],$st);
         return  $update? app_show(0,"{$msg}成功"):error_show(1004,"{$msg}失败");
     }
 
@@ -301,10 +309,13 @@ class Share extends BaseController
         if(!$info){
             return error_show(1002,"未找到对应数据");
         }
+        $teme = $info['status'];
         $info["status"]=0;
         $info["is_del"]=1;
         $info["updatetime"]=date("Y-m-d H:i:s");
         $update = Db::name("role_share")->save($info);
+        $st = ["order_code"=>$id,"status"=> $teme,"action_remark"=>'',"action_type"=>"delete"];
+        ActionLog::logAdd($token,$st,"role_share",$info['status'],$st);
         return  $update? app_show(0,"删除成功"):error_show(1004,"删除失败");
     }
 }

+ 5 - 1
app/admin/controller/Supplier.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
-
+use app\admin\model\ActionLog;
 class Supplier extends BaseController
 {
 public $post = "";
@@ -122,6 +122,8 @@ public function create(){
         "is_platform"=>$is_platform
     ];
     $join = Db::name('supplier')->insert($data);
+    $st = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+    ActionLog::logAdd($this->post['token'],$st,"role_share",0,$st);
     return $join? error_show(0,"添加成功") :error_show(1002,"添加失败");
 }
 /*编辑*/
@@ -178,6 +180,8 @@ public function edit(){
         "updatetime"=>date("Y-m-d H:i:s")
     ];
     $ed = Db::name('supplier')->where(['is_del'=>0,'id'=>$id])->save($vmp);
+    $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+    ActionLog::logAdd($this->post['token'],$st,"role_share",0,$st);
     return $ed ? error_show(0,"编辑成功") : error_show(1002,"编辑失败");
 }
 /*查询*/

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

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 
 use app\BaseController;
 use think\facade\Db;
-
+use app\admin\model\ActionLog;
 class User extends BaseController
 {
     /**
@@ -245,7 +245,8 @@ class User extends BaseController
             'updatetime'=>date('Y-m-d H:i:s'),
         ];
         $insert = Db::name('user_role')->insert($data);
-
+        $st = ["order_code"=>$uid,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd($token,$st,"resign_info",1,$st);
         return $insert? app_show(0,'数据新建成功'):error_show(1004,'数据新建失败');
     }
 

+ 9 - 1
app/admin/controller/WareHouse.php

@@ -4,7 +4,7 @@ namespace app\admin\controller;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
-
+use app\admin\model\ActionLog;
 class WareHouse extends BaseController
 {
     public function __construct(App $app)
@@ -89,6 +89,8 @@ class WareHouse extends BaseController
             ];
             $add = Db::name('warehouse_info')->insert($data,true);
             if($add>0){
+                $st = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$st,"resign_info",1,$st);
                 $addrinfo = [
                     "wsm_code"=>$wsm_code,
                     "wsm_type"=> $wsm_type,
@@ -102,6 +104,9 @@ class WareHouse extends BaseController
                 ];
                 $addri = DB::name("warehouse_addr")->insert($addrinfo);
                 if($addri){
+
+                    $sf = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$sf,"resign_info",1,$sf);
                     Db::commit();
                     return app_show(0,'仓库创建成功');
                 }
@@ -316,9 +321,12 @@ class WareHouse extends BaseController
         if($status===""){
             return error_show(1005,"参数status 不能为空");
         }
+        $vmp=$warse['status'];
         $warse['status'] = $status;
         $warse['updatetime'] = date("Y-m-d H:i:s");
         $Del= Db::name("warehouse_info")->save($warse);
+        $st = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd($this->post['token'],$st,"warehouse_info",$warse['status'],$st);
         return $Del? app_show(0,'仓库状态修改成功'): error_show(1005,'仓库状态修改失败');
     }