dkjf

app/admin/controller/After.php

@@ -2,6 +2,7 @@
 
 
 namespace app\admin\controller;
+use app\admin\model\ActionLog;
 use think\App;
 use think\facade\Db;
 
@@ -84,6 +85,8 @@ class After extends \app\BaseController
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
             $create = Db::name("order_return")->insert($in);
+            $orde = ["order_code"=>$returnCode,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
+            ActionLog::logAdd($this->post['token'],$orde,'zxd',0,$orde);
             if($create){
                     Db::commit();
                     return app_show(0,"售后申请单新建成功");
@@ -211,10 +214,13 @@ class After extends \app\BaseController
         if($remark!=''){
             $info['remark'] =$remark;
         }
+        $var=$info['status'];
         $info['status']=$status;
         $info['updatetime']=date("Y-m-d H:i:s");
         $up =Db::name("order_return")->save($info);
         if($up){
+            $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$order,"zxd", $info['status'],$this->post);
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,"更新失败");
@@ -265,6 +271,7 @@ class After extends \app\BaseController
         }
         Db::startTrans();
         try{
+            $var=$info['status'];
             $info['status']=$info['order_type']==1?3:4;
             $info['updatetime']=date("Y-m-d H:i:s");
             $up =Db::name("order_return")->save($info);
@@ -289,6 +296,8 @@ class After extends \app\BaseController
                 }
                 $in=Db::name("order_returninfo")->save($returninfo);
                 if($in){
+                    $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$order,$info['status'],$order);
                     Db::commit();
                     return app_show(0,"更新成功");
                 }
@@ -353,12 +362,14 @@ class After extends \app\BaseController
         }
         $return_info['post_fee'] = $fee;
         Db::startTrans();
-
         try{
+            $str=$info['status'];
             $info['status']=$info['order_type']==1?4:5;
             $info['updatetime']=date("Y-m-d H:i:s");
             $up =Db::name("order_return")->save($info);
             if($up){
+                $order = ["order_code"=>$info['orderCode'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$order,"zxd",$info['status'],$order);
                 $in=Db::name("order_returninfo")->save($return_info);
                 if($in){
                     $data=[
@@ -386,6 +397,8 @@ class After extends \app\BaseController
                     ];
                     $back =Db::name("order_back")->insert($data);
                     if($back){
+                        $order = ["order_code"=>$info['orderCode'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
+                        ActionLog::logAdd($this->post['token'],$order,"zxd", $info['status'],$order);
                         Db::commit();
                         return app_show(0,"更新成功");
                     }
@@ -437,6 +450,7 @@ class After extends \app\BaseController
         }
         Db::startTrans();
         try{
+            $stat=$info['status'];
             $info['status']=3;
             $info['is_th']=$isth;
             $info['updatetime']=date("Y-m-d H:i:s");
@@ -464,6 +478,8 @@ class After extends \app\BaseController
                 }
                 $in=Db::name("order_returninfo")->save($returninfo);
                 if($in){
+                    $order = ["order_code"=>$info['orderCode'],"status"=>$stat,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$order,"zxd",3,$order);
                     Db::commit();
                     return app_show(0,"更新成功");
                 }

app/admin/controller/Allot.php

@@ -395,12 +395,13 @@ class Allot extends BaseController
         }
         Db::startTrans();
         try{
+            $sr= $st['status'];
             $st['remark']=$remark;
             $st['status']=$status;
             $st['updatetime']= date('Y-m-d H:i:s');
             $sv = Db::name('allot_stock')->save($st);
             if($sv){
-                $order = ["order_code"=>$st['allot_code'],"status"=>$st['status'],"action_remark"=>'',"action_type"=>"del"];
+                $order = ["order_code"=>$st['allot_code'],"status"=>$sr,"action_remark"=>'',"action_type"=>"del"];
                 ActionLog::logAdd($this->post['token'],$order,"DBD",$status,$this->post);
                 if($status==2 || $status==1){
                     $vmp = Db::name('allot_info')->where(['allot_code'=>$st['allot_code'],"is_del"=>0])->select();

app/admin/controller/Check.php

@@ -288,7 +288,8 @@ public function create(){
 //            $in= Db::name('check_item')->insertAll($dio);
 //        }
         if($da){
-
+            $orde = ["order_code"=>$check_code,"status"=>$da['status'],"action_remark"=>'',"action_type"=>"create"];
+            ActionLog::logAdd($this->post['token'],$orde,'qrd',$status,$orde);
            Db::commit();
             return error_show(0,"盘点创建成功");
         }else{
@@ -397,6 +398,8 @@ public function edit()
 //               $io = db::name('check_item')->insertAll($up);
                // var_dump(Db::name('check_item')->getLastSql());
                 if ($up) {
+                    $orde = ["order_code"=>$eid['check_code'],"status"=>$eid['status'],"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$orde,'qrd',$eid['status'],$orde);
                     Db::commit();
                     return error_show(0, "盘点更新成功");
                 }
@@ -462,6 +465,8 @@ public function edit()
             $st['updatetime']= date('Y-m-d H:i:s');
             $sv = Db::name('good_check')->save($st);
             if($sv){
+                $orde = ["order_code"=>$st['check_code'],$temp,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$orde,'zxd',$st['status'],$orde);
                 if($stauts==1&&$temp==2){
                     $up = Db::name('check_item')->where(['check_code'=>$st['check_code'],"is_del"=>0])->save(['is_del'=>1,
                         "updatetime"=>date("Y-m-d H:i:s")]);

app/admin/controller/Departuser.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -68,6 +69,7 @@ class Departuser extends BaseController
         if($status==""){
             return error_show(0,"状态不能为空");
         }
+        Db::startTrans();
         try{
             $data = [
                 'uid'=>$uid,'nickname'=>$nickname,'itemid'=>$itemid,
@@ -75,8 +77,16 @@ class Departuser extends BaseController
                 'addtime'=>date("Y-m-d H:i:s"),
                 'updatetime'=>date("Y-m-d H:i:s")
             ];
-            Db::name('depart_user')->insert($data);
-      return error_show(0,"添加成功");
+            $str=Db::name('depart_user')->insert($data);
+            if($str){
+                $orde = ["order_code"=>$uid,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$orde,'depart_user',$status,$orde);
+                Db::commit();
+                return error_show(0,"添加成功");
+            }else{
+                Db::rollback();
+                return error_show(1002,"添加失败");
+            }
         }catch (\Exception $e){
             return error_show(1003,$e->getMessage());
         }
@@ -118,6 +128,8 @@ class Departuser extends BaseController
             ];
             $r = Db::name("depart_user")->where(["is_del"=>0,"id"=>$id])->save($d);
            // var_dump( Db::name("depart_user")->getLastSql());
+            $orde = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$orde,'depart_user',0,$orde);
             return  $r ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
         }catch (\Exception $e){
             return error_show(1003,$e->getMessage());

app/admin/controller/Express.php

@@ -2,6 +2,7 @@
 
 
 namespace app\admin\controller;
+use app\admin\model\ActionLog;
 use think\App;
 use think\facade\Db;
 
@@ -40,6 +41,8 @@ class Express extends \app\BaseController
         }
         $express['canOrder'] = $express['canOrder']==0 ?1:0;
         $up = Db::name("express")->save($express);
+        $orde = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$orde,'express',0,$orde);
         return $up?app_show(0,"更新成功"):error_show(1005,"更新失败");
     }
 

app/admin/controller/Gold.php

@@ -4,6 +4,7 @@
 namespace app\admin\controller;
 
 
+use app\admin\model\ActionLog;
 use think\App;
 use think\facade\Db;
 
@@ -69,6 +70,8 @@ class Gold extends \app\BaseController
         ];
         $int = Db::name("gold_price")->insert($gold);
         if($int){
+            $orde = ["order_code"=>$type,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+            ActionLog::logAdd($this->post['token'],$orde,'gold_price',0,$orde);
             return app_show(0,"新建成功");
         }else{
             return error_show(1004,"新建失败");

app/admin/controller/Group.php

@@ -1,6 +1,7 @@
 <?php
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\BaseController;
 use think\facade\Db;
 use think\App;
@@ -161,6 +162,8 @@ class Group extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $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);
         return $in ? app_show(0,"新建成功"): error_show(1005,"新建失败");
     }
 

app/admin/controller/Sale.php

@@ -1048,12 +1048,9 @@ class Sale extends BaseController
         if($end !=""){
             $where[]= ["a.addtime",'<=',$end];
         }
-        $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
-        if($supplierNo!=""){
-            $supplier = Db::name("supplier")->where([['code',"like","%$supplierNo%"]])->column('code');
-            $wsmcode = Db::name("sale")->where([
-                "is_del"=>0,"supplierNo"=>$supplier])->column("orderCode");
-            $where[]=['b.orderCode',"in",$wsmcode];
+        $companyNo =isset($this->post['companyNo']) &&$this->post['companyNo'] !=="" ? trim($this->post['companyNo']):"";
+        if($companyNo!=""){
+            $where[]=['b.customer_code',"like","%$companyNo%"];
         }
         $count = Db::name('order_out')->alias('a')
             ->join("sale b","b.orderCode=a.orderCode","left")