Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/After.php

@@ -95,9 +95,9 @@ class After extends Base
             ];
             $create = Db::name("order_return")->insert($in,true);
             $orde = ["order_code"=>$returnCode,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$orde,$orderout['order_type']==1?'SHD':"ZXSHD",0,$orde);
+            ActionLog::logAdd($this->post['token'],$orde,'SHD',1,$orde);
             if($create>0){
-                    $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'SHD'];
+                    $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>$in['status'],"order_type"=>'SHD'];
                     ProcessOrder::AddProcess($token,$process);
                     Db::commit();
                     return app_show(0,"售后申请单新建成功",["returnCode"=>$returnCode]);
@@ -315,8 +315,8 @@ class After extends Base
             $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,$info['order_type']==1?'SHD':"ZXSHD", $info['status'],$this->post);
-                $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type']==1?'SHD':"ZXSHD"];
+                ActionLog::logAdd($this->post['token'],$order,"SHD", $info['status'],$this->post);
+                $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>"SHD"];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return app_show(0,"更新成功");
@@ -509,21 +509,6 @@ class After extends Base
             $up =Db::name("order_return")->save($info);
             if($up){
 
-                //修改状态，添加待办
-                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)){
@@ -550,8 +535,8 @@ class After extends Base
                 $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['order_type']==1?'SHD':"ZXSHD",$info['status'],$order);
-                    $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>$info['order_type']==1?'SHD':"ZXSHD"];
+                    ActionLog::logAdd($this->post['token'],$order,"SHD",$info['status'],$this->post);
+                    $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>"SHD"];
                     ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"更新成功");
@@ -624,8 +609,8 @@ class After extends Base
             $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,$info['order_type']==1?'SHD':"ZXSHD",$info['status'],$order);
-                $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>$info['order_type']==1?'SHD':"ZXSHD"];
+                ActionLog::logAdd($this->post['token'],$order,"SHD",$info['status'],$this->post);
+                $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>"SHD"];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 $in=Db::name("order_returninfo")->save($return_info);
                 if($in){
@@ -655,8 +640,8 @@ class After extends Base
                     $back =Db::name("order_back")->insert($data,true);
                     if($back>0){
                         $order = ["order_code"=>$data['thNo'],"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                        ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'SHD':"ZXSHD", 0,$data);
-                        $process=["order_code"=>$data['thNo'],"order_id"=>$back,"order_status"=>0,"order_type"=>$info['order_type']==1?'CKTHD':"ZXCKTHD"];
+                        ActionLog::logAdd($this->post['token'],$order,"CKTHD", 0,$data);
+                        $process=["order_code"=>$data['thNo'],"order_id"=>$back,"order_status"=>0,"order_type"=>"CKTHD"];
                         ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return app_show(0,"更新成功");
@@ -749,25 +734,9 @@ class After extends Base
                 }
                 $in=Db::name("order_returninfo")->save($returninfo);
                 if($in){
-                    if( $info['order_status']==1&&$info['order_type']==2){
-                        $orderout= Db::name("order_out")->where($orde)->save(['status'=>3,"updatetime"=>date("Y-m-d H:i:s")]);
-                        $order = ["order_code"=>$orde['outCode'],"status"=>$orde['status'],"action_remark"=>'',"action_type"=>"edit"];
-                        ActionLog::logAdd($this->post['token'],$order,$orde['order_type']==1?'CKD':"ZXCKD", 3,
-                            ['status'=>3,"updatetime"=>date("Y-m-d H:i:s")]);
-                        $process=["order_code"=>$orde['outCode'],"order_id"=>$orde['id'],"order_status"=>3,
-                            "order_type"=>$orde['order_type']==1?'CKD':"ZXCKD"];
-                        ProcessOrder::AddProcess($this->post['token'],$process);
-                        if($orderout){
-                            Db::commit();
-                            return app_show(0,"更新成功");
-                        }else{
-                            Db::rollback();
-                            return error_show(1004,"更新失败");
-                        }
-                    }
                     $order = ["order_code"=>$info['returnCode'],"status"=>$stat,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'CKTHD':"ZXCKTHD",3,$order);
-                    $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>$info['order_type']==1?'CKTHD':"ZXCKTHD"];
+                    ActionLog::logAdd($this->post['token'],$order,"SHD", $info['status'],$this->post);
+                    $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"SHD"];
                     ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"更新成功");
@@ -787,7 +756,7 @@ class After extends Base
             return error_show(1005,"参数returnCode 不能为空");
         }
         $info = Db::name("order_return")->where(['returnCode'=>$bkcode])->find();
-        if(empty($info)){
+        if($info==false){
             return error_show(1005,"未找到售后数据");
         }
         $list=[];
@@ -864,6 +833,9 @@ class After extends Base
             return error_show(1005,"售后单流程状态有误");
         }
         $out=Db::name("order_out")->where(["outCode"=>$info["outCode"]])->find();
+        if($out==false){
+            return error_show(1005,"未找到发货单数据");
+        }
         $is_th = isset($this->post['is_th'])&&$this->post['is_th']!=="" ? intval($this->post['is_th']):"";
         if($is_th===""){
             return error_show(1005,"参数is_th不能为空");
@@ -918,7 +890,7 @@ class After extends Base
                         "status" => $old_info_status,//这里的status是之前的值
                         "action_remark" => '',//备注
                         "action_type" => "status"//新建create，编辑edit，更改状态status
-                    ], "SHD", $info['status'], $info);
+                    ], "SHD", $info['status'], $this->post);
 
                     ProcessOrder::AddProcess($this->post['token'], [
                         "order_type" => 'SHD',

app/admin/controller/Allot.php

@@ -11,13 +11,11 @@ use think\facade\Db;
 
 //调拨  allot_info(从表)和allot_stock(主表)
 //调拨之后，修改库存，采购单的仓库编号是否也需要修改
-class Allot extends BaseController
+class Allot extends Base
 {
-    public $post= "";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post=$this->request->post();
     }
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']) :"1";
@@ -159,10 +157,6 @@ class Allot extends BaseController
 //        return error_show(1002,"商品属性不能为空");
 //    }
     $allot_code=makeNo("XK");
-//    $allot_code = isset($this->post['allot_code']) && $this->post['allot_code'] !=="" ? trim($this->post['allot_code']) :"";
-//        if($allot_code==""){
-//            return error_show(1002,"调拨编号不能为空");
-//        }
     $apply_id =GetUserInfo($token);
         if(empty($apply_id)||$apply_id['code']!=0){
             return error_show(1002,"申请人数据不存在");
@@ -203,8 +197,6 @@ class Allot extends BaseController
             $pd=Db::name('allot_stock')->insert($data,true);
             $dm=[];
             if($pd>0) {
-                $order = ["order_code"=>$allot_code,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$order,"DBD",$status,$this->post);
                 foreach ($dain as $value) {
                     $st = Db::name("good_stock")->alias("a")->leftJoin("good b" ,"a.spuCode=b.spuCode")
                         ->where(['wsm_code' => $wsm_out, 'a.spuCode' => $value['spuCode'], 'a.is_del' => 0])
@@ -234,6 +226,8 @@ class Allot extends BaseController
                     }
                 $io = Db::name('allot_info')->insertAll($dm);
                 if ($io) {
+                    $order = ["order_code"=>$allot_code,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$order,"DBD",$status,$this->post);
                     $process=["order_code"=>$allot_code,"order_id"=>$pd,"order_status"=>$status,"order_type"=>'DBD'];
                     ProcessOrder::AddProcess($token,$process);
                     Db::commit();
@@ -356,9 +350,7 @@ class Allot extends BaseController
                 "updatetime"=>date('Y-m-d H:i:s'),
             ];
             $da = Db::name('allot_stock')->where(["id"=>$id,"is_del"=>0])->save($data);
-            if($da>0) {
-                $order = ["order_code"=>$etid['allot_code'],"status"=>$etid['status'],"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$order,"DBD",$etid['status'],$this->post);
+            if($da!=false) {
                 foreach ($dain as $value) {
                     $st = Db::name("good_stock")->alias("a")->leftJoin("good b" ,"a.spuCode=b.spuCode")
                         ->where(['wsm_code' => $wsm_out, 'a.spuCode' => $value['spuCode'], 'a.is_del' => 0])
@@ -400,6 +392,8 @@ class Allot extends BaseController
                         return error_show(1003, "调拨更新失败");
                     }
                 }
+                $order = ["order_code"=>$etid['allot_code'],"status"=>$etid['status'],"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$order,"DBD",$etid['status'],$this->post);
                 $process=["order_code"=>$etid['allot_code'],"order_id"=>$etid['id'],"order_status"=>$etid['status'],"order_type"=>'DBD'];
                 ProcessOrder::AddProcess($token,$process);
                 Db::commit();
@@ -454,13 +448,11 @@ class Allot extends BaseController
             $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"=>$sr,"action_remark"=>'',"action_type"=>"del"];
-                ActionLog::logAdd($this->post['token'],$order,"DBD",$status,$this->post);
                 if($status==2 || $status==1){
+                    $good_data=[];
                     $vmp = Db::name('allot_info')->where(['allot_code'=>$st['allot_code'],"is_del"=>0])->select();
                     foreach ($vmp as $value){
                         $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_type_code'],"wsm_code"=>$st['wsm_out'],"is_del"=>0])->find();
-                        //var_dump($value['allot_num'],$stock['usable_stock']);
                         if($value['allot_num']>$stock['usable_stock']){
                             Db::rollback();
                             return error_show(2000,"超出库存数量");
@@ -476,9 +468,15 @@ class Allot extends BaseController
                                 Db::rollback();
                                 return error_show(1002,"状态更新失败");
                             }
+                           //商品变动日志表，good_log_code字段存储调拨单号
+                        $good_data[] = ['good_log_code' => $st['allot_code'], "stock_id" => $stock['id'], "type" => 1, 'stock' =>$value['allot_num'], "stock_name" => "wait_out_stock"];
+                        $good_data[] = ['good_log_code' => $st['allot_code'], "stock_id" => $stock['id'], "type" => 2, 'stock' => $value['allot_num'], "stock_name" => "usable_stock"];
                         }
                     }
+                    GoodLog::LogAdd($this->post['token'],$good_data,'DBD');
                 }
+                $order = ["order_code"=>$st['allot_code'],"status"=>$sr,"action_remark"=>'',"action_type"=>"status"];
+                ActionLog::logAdd($this->post['token'],$order,"DBD",$status,$this->post);
                 $process=["order_code"=>$st['allot_code'],"order_id"=>$st['id'],"order_status"=>$st['status'],"order_type"=>'DBD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
@@ -526,17 +524,15 @@ class Allot extends BaseController
             ];
             $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code])->update($data);
             if($datainfo){
-                $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"del"];
-                ActionLog::logAdd($this->post['token'],$order,"DBD",3,$this->post);
-                    $vnp = Db::name('allot_info')->where(['allot_code'=>$al['allot_code'],'is_del'=>0])->select();
-                   // var_dump(Db::name('allot_info')->getLastSql());
+                $vnp = Db::name('allot_info')->where(['allot_code'=>$al['allot_code'],'is_del'=>0])->select();
                 $good_data=[];
+                if(!empty($vnp)){
                     foreach ($vnp as $value){
                         $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_type_code'],"wsm_code"=>$al['wsm_out'],"is_del"=>0])->find();
-                       if($stock['wait_out_stock']<$value['allot_num']){
-                           Db::rollback();
-                           return error_show(2000,"超出库存数量");
-                       }
+                        if($stock['wait_out_stock']<$value['allot_num']){
+                            Db::rollback();
+                            return error_show(2000,"超出库存数量");
+                        }
                         $stock['wait_out_stock']-=$value['allot_num'];
                         $stock['intra_stock']+=$value['allot_num'];
                         $stock['total_stock']=$stock['wait_out_stock']+$stock['usable_stock'];
@@ -550,7 +546,10 @@ class Allot extends BaseController
                         $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 1, 'stock' => $value['allot_num'], "stock_name" => "intra_stock"];
                         $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 2, 'stock' => $value['allot_num'], "stock_name" => "wait_out_stock"];
                     }
-                GoodLog::LogAdd($this->post['token'],$good_data,'allotsend');
+                    GoodLog::LogAdd($this->post['token'],$good_data,'DBD');
+                }
+                $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$order,"DBD",3,$this->post);
                 $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>3,"order_type"=>'DBD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
@@ -587,21 +586,19 @@ class Allot extends BaseController
         ];
         $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code,"is_del"=>0])->save($data);
         if($datainfo>0) {
-            $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"del"];
-            ActionLog::logAdd($this->post['token'],$order,"DBD",4,$this->post);
             $good_data=[];
             foreach ($dain as $value) {
                 $st = Db::name("good_stock")->alias("a")->leftJoin("good b" ,"a.spuCode=b.spuCode")
                     ->where(['wsm_code' => $al['wsm_out'], 'a.spuCode' => $value['good_code'], 'a.is_del' => 0])
                     ->field("a.spuCode,wsm_code,usable_stock,wait_out_stock,wait_in_stock,b.good_name")->find();
-                if (empty($st)) {
+                if ($st==false) {
                     Db::rollback();
                     return error_show(1003, "未找到商品");
                 }
                 $n = Db::name('allot_info')->where(['id'=>$value['id'],'allot_code'=>$al['allot_code'],'is_del'=>0])->find();
-                if(empty($n)){
+                if($n==false){
                     Db::rollback();
-                    return error_show(10032, "未找到数据");
+                    return error_show(10032, "未找到盘点信息数据");
                 }
 //                if($value['allot_num']>$st['usable_stock']){
 //                    return error_show(2000,"库存数量不足");
@@ -620,7 +617,7 @@ class Allot extends BaseController
                     return error_show(1001,"数据更新失败");
                 }
 
-                $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_out'],"is_del"=>0])->find();
+                $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_out'],"is_del"=>0])->lock(true)->find();
                 if($stock['intra_stock']<$n['allot_num']){
                     Db::rollback();
                     return error_show(2000,"超出库存数量");
@@ -652,15 +649,16 @@ class Allot extends BaseController
                 $instock['wait_in_stock']+=$n['allot_num']-$value['error_num'];
                 $instock['updatetime']= date('Y-m-d H:i:s');
                 $sk = Db::name('good_stock')->save($instock);
-//               $stock['total_stock']=$stock['wait_out_stock']+$stock['usable_stock'];
                 if ($sk==false) {
                     Db::rollback();
                     return error_show(1003, "入库验货更新失败");
                 }
                 //商品变动日志表，good_log_code字段存储调拨单号
-                $good_data[]=['good_log_code'=>$allot_code,"stock_id"=>isset($instock['id'])?$instock['id']: Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$n['allot_num'],"stock_name"=>"wait_in_stock"];
+                $good_data[]=['good_log_code'=>$allot_code,"stock_id"=>isset($instock['id'])?$instock['id']: Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$n['allot_num']-$value['error_num'],"stock_name"=>"wait_in_stock"];
             }
-            GoodLog::LogAdd($this->post['token'],$good_data,'allotin');
+            GoodLog::LogAdd($this->post['token'],$good_data,'DBD');
+            $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$order,"DBD",4,$this->post);
             $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>4,"order_type"=>'DBD'];
             ProcessOrder::AddProcess($this->post['token'],$process);
             Db::commit();
@@ -697,20 +695,20 @@ public function vesio(){
         ];
         $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code,"is_del"=>0])->save($data);
         if($datainfo>0) {
-            $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"del"];
+            $order = ["order_code"=>$al['allot_code'],"status"=>$al['status'],"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$order,"DBD",5,$this->post);
             foreach ($dain as $value) {
                 $st = Db::name("good_stock")->alias("a")->leftJoin("good b" ,"a.spuCode=b.spuCode")
                     ->where(['wsm_code' => $al['wsm_out'], 'a.spuCode' => $value['good_code'], 'a.is_del' => 0])
                     ->field("a.spuCode,wsm_code,usable_stock,wait_out_stock,wait_in_stock,b.good_name")->find();
-                if (empty($st)) {
+                if ($st==false) {
                     Db::rollback();
                     return error_show(1003, "商品不能为空");
                 }
                 $p = Db::name('allot_info')->where(['id'=>$value['id'],'allot_code'=>$al['allot_code'],"is_del"=>0])->find();
                 if($p==false){
                     Db::rollback();
-                    return error_show(1002,"未找到数据");
+                    return error_show(1002,"未找到盘点数据");
                 }
                 $temp = [];
                 $temp['good_num']=$st['usable_stock'];
@@ -725,7 +723,7 @@ public function vesio(){
                     return error_show(1001,"数据更新失败");
                 }
 
-                $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
+                $stock = Db::name("good_stock")->where(["spuCode"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->lock(true)->find();
                 if($stock['wait_in_stock']<$p['stock_num']){
                     Db::rollback();
                    return error_show(2000,"超出待入库存数量");
@@ -743,7 +741,7 @@ public function vesio(){
                 $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 2, 'stock' => $p['stock_num'], "stock_name" => "wait_in_stock"];
                 $good_data[] = ['good_log_code' => $allot_code, "stock_id" => $stock['id'], "type" => 1, 'stock' => $p['stock_num'], "stock_name" => "usable_stock"];
             }
-            GoodLog::LogAdd($this->post['token'],$good_data,'allotincheck');
+            GoodLog::LogAdd($this->post['token'],$good_data,'DBD');
             $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>5,"order_type"=>'DBD'];
             ProcessOrder::AddProcess($this->post['token'],$process);
             Db::commit();

app/admin/controller/Brand.php

@@ -8,13 +8,12 @@ use think\App;
 use think\facade\Db;
 
 //品牌
-class Brand extends BaseController
+class Brand extends Base
 {
-    public $post="";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post=$this->request->post();
+//        $this->post=$this->request->post();
     }
     public function create(){
         $brand_name=isset( $this->post['brand_name']) && $this->post['brand_name'] !=="" ? trim($this->post['brand_name']):"";
@@ -128,8 +127,6 @@ class Brand extends BaseController
             "id"=>$id,
             "brand_name"=>$brand_name,
             "logo_url"=>$logo_url,
-//            "createrid"=>$createrid,
-//            "creater"=>$creater,
             "status"=>$status,
             "is_del"=>0,
             "updatetime"=>date("Y-m-d H:i:s")

app/admin/controller/Business.php

@@ -7,13 +7,13 @@ use think\App;
 use think\facade\Db;
 
 //业务企业
-class Business extends BaseController
+class Business extends Base
 {
-    public $post = "";
+//    public $post = "";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
+//        $this->post = $this->request->post();
     }
     public function create(){
         $companyNo = makeNo("GS");

app/admin/controller/Cat.php

@@ -9,13 +9,13 @@ use think\App;
 use think\facade\Db;
 
 //分类
-class Cat extends BaseController
+class Cat extends Base
 {
-public $post="";
+
 public function __construct(App $app)
 {
     parent::__construct($app);
-    $this->post=$this->request->post();
+//    $this->post=$this->request->post();
 }
 public function list(){
     $where=[["is_del","=",0]];

app/admin/controller/Catdesc.php

@@ -7,13 +7,13 @@ use think\App;
 use think\facade\Db;
 
 //分类描述信息
-class Catdesc extends BaseController
+class Catdesc extends Base
 {
-    public $post="";
+    //public $post="";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post=$this->request->post();
+       // $this->post=$this->request->post();
     }
     public function create(){
         $cat_id = isset($this->post['cat_id']) && $this->post['cat_id'] !==""? intval($this->post['cat_id']):"";

app/admin/controller/Check.php

@@ -9,21 +9,13 @@ use think\facade\Db;
 use app\admin\model\ActionLog;
 
 //盘点 wsm_good_check(主表，记录了哪个仓库，那个人，什么时间)和wsm_check_item(盘点的商品明细)
-class Check extends BaseController
+class Check extends Base
 {
-public $post = "";
+
 public function __construct(App $app)
 {
     parent::__construct($app);
-    $this->post=$this->request->post();
-    $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-    if($token==""){
-        return error_show(101,'token不能为空');
-    }
-    $effetc = VerifyTokens($token);
-    if(!empty($effetc) && $effetc['code']!=0){
-        return error_show($effetc['code'],$effetc['message']);
-    }
+
 }
 public function flist(){
     $page = isset($this->post['page']) &&$this->post['page'] !=="" ? intval($this->post['page']):1;
@@ -114,7 +106,6 @@ public function flist(){
 
     $data=[];
     if($list) {
-
         //品牌信息
         $brands = Db::name('brand')->whereIn('id', array_column($list, 'brand_id'))->where('is_del', 0)->column('brand_name', 'id');
         $units = Db::name('unit')->whereIn('id', array_column($list, 'good_unit'))->where('is_del', 0)->column('unit', 'id');
@@ -321,7 +312,7 @@ public function create(){
 //        }
         if($da){
             $orde = ["order_code"=>$check_code,"status"=>$data['status'],"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$orde,'qrd',$data['status'],$orde);
+            ActionLog::logAdd($this->post['token'],$orde,'PDD',$data['status'],$orde);
             $process=["order_code"=>$check_code,"order_id"=>$da,"order_status"=>$data['status'],"order_type"=>'PDD'];
             ProcessOrder::AddProcess($this->post['token'],$process);
            Db::commit();
@@ -464,7 +455,8 @@ public function edit()
         $sv = Db::name('good_check')->update(['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
         if($sv){
             $orde = ["order_code"=>$deln['check_code'],"status"=>$deln['status'],"action_remark"=>'',"action_type"=>"delete"];
-            ActionLog::logAdd($this->post['token'],$orde,'qrd',$deln['status'],['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
+            ActionLog::logAdd($this->post['token'],$orde,'PDD',$deln['status'],['id'=>$id,'is_del'=>1,
+                'updatetime'=>date("Y-m-d H:i:s")]);
             $process=["order_code"=>$deln['check_code'],"order_status"=>$deln['status'],"order_type"=>'PDD'];
             ProcessOrder::workdel($process);
             return error_show(0,"删除成功");

app/admin/controller/Consult.php

@@ -240,18 +240,14 @@ class Consult extends Base
                             "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
-                        ]);
+//                        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"];
-                ActionLog::logAdd($this->post['token'],$stn,"ZXD",2,$info);
-                $process=["order_code"=>$zxNo,"order_id"=>Db::name("consult_order")->getLastInsID(),"order_status"=>1,"order_type"=>'ZXD'];
-                ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return  app_show(0,"新建成功",["zxNo"=>$zxNo]);
             }else{
@@ -498,20 +494,20 @@ 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);
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "ZXD", 1, $this->post);
 
-                ProcessOrder::AddProcess($this->post['token'], [
-                    "order_type" => 'ZXD',
-                    "order_code" => $innew,//咨询单详情编号
-                    "order_id" => 0,
-                    "order_status" => 1
-                ]);
+//                ProcessOrder::AddProcess($this->post['token'], [
+//                    "order_type" => 'ZXD',
+//                    "order_code" => $innew,//咨询单详情编号
+//                    "order_id" => 0,
+//                    "order_status" => 1
+//                ]);
 
                 if (!empty($bidlist)){
                     foreach ($bidlist as $value){
@@ -526,6 +522,12 @@ class Consult extends Base
                             Db::rollback();
                             return error_show(1004,"反馈商品新建失败");
                         }
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $innew,//咨询单详情编号
+                            "status" => 1,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "edit"//新建create，编辑edit，更改状态status
+                        ], "FKD", 1, $this->post);
                     }
                 }
                 $zxinfo["bargain_status"] =1;
@@ -543,19 +545,15 @@ class Consult extends Base
                         "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记录
-                Db::name('consult_order')->where('zxNo',$zxinfo['zxNo'])->update(['endtime'=>$endtime,'updatetime'=>date('Y-m-d H:i:s')]);
-
+             $op = Db::name('consult_order')->where('zxNo',$zxinfo['zxNo'])->update(['endtime'=>$endtime,
+                    'updatetime'=>date('Y-m-d H:i:s')]);
+                if($op==false){
+                    Db::rollback();
+                    return error_show(1004,'咨询单结束时间更新失败');
+                }
                 Db::commit();
                 return app_show(0,"咨询新建成功",["infoNo"=>$innew]);
             }
@@ -579,9 +577,9 @@ class Consult extends Base
         if($status===""){
             return error_show(1004,"参数status不能为空");
         }
-        if($status==1&&$zxinfo['status']>1){
-            $zxinfo['bargain_num']=+1;
-        }
+//        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");
@@ -595,15 +593,7 @@ class Consult extends Base
                 "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,"状态更新成功");
+                        return app_show(0,"状态更新成功");
         }else{
             return error_show(1003,"状态更新失败");
         }
@@ -806,30 +796,6 @@ class Consult extends Base
         try{
             $insert= Db::name("consult_bids")->insert($data);
             if($insert){
-//                $data=[
-//                    "spuCode"=>$spucode,
-//                    "good_name"=>$pname,
-//                    "brand_id"=>$brandid,
-//                    "good_unit"=>$unit_id,
-//                    "good_type"=>0,
-//                    "moq"=>1,
-//                    "customized"=>$work_day,
-//                    "tax"=>$tax,
-//                    "supplierNo"=>$supplierNo,
-//                    "is_auth"=>0,
-//                    "craft_desc"=>$cost_desc,
-//                    "good_remark"=>$remark,
-//                    "good_img"=>is_array($good_img)?implode(',',$good_img):$good_img,
-//                    "good_thumb_img"=>"",
-//                    "good_info_img"=>"",
-//                    "status"=>1,
-//                    "is_del"=>0,
-//                    "createrid"=>$createrid,
-//                    "creater"=>$creater,
-//                    "addtime"=>date("Y-m-d H:i:s"),
-//                    "updatetime"=>date("Y-m-d H:i:s")
-//                ];
-//                $good = Db::name("good_zixun")->insert($data);
                     if($zx['is_project']==1 && $zx['projectNo']!="" && $zxinfo['pgNo']!=""){
                         $projectinfo =Db::name("project_info")->where(["pgNo"=>$zxinfo["pgNo"],"projectNo"=>$zx['projectNo'],"is_del"=>0])->find();
                         if($projectinfo==false){
@@ -865,14 +831,13 @@ class Consult extends Base
                             $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);
+                                ], "PRI", 2, $projectinfo);
 
                                 $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])
                                     ->count();
@@ -900,7 +865,6 @@ class Consult extends Base
                                                 "order_status" => 2
                                             ]);
                                         }
-
                                     }
                                 }
                             }
@@ -1181,7 +1145,7 @@ class Consult extends Base
                             "status" => $old_projectinfo_status,//这里的status是之前的值
                             "action_remark" => '',//备注
                             "action_type" => "status"//新建create，编辑edit，更改状态status
-                        ], "PRO", 2, $projectinfo);
+                        ], "PRI", 2, $projectinfo);
 
                         $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->count();
 
@@ -1315,10 +1279,32 @@ class Consult extends Base
             ];
             $int = Db::name("bargain_order")->insert($data);
             if($int){
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $bargainNo,//咨询单详情编号
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "YJD", $data['status'], $data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'YJD',
+                    "order_code" => $bargainNo,
+                    "order_id" =>Db::name("bargain_order")->getLastInsID(),
+                    "order_status" =>0
+                ]);
+                $odlstatus=$info['status'];
                 $info['status']=3;
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $up =Db::name("consult_bids")->save($info);
                if($up){
+                   //修改状态，添加待办
+                   ActionLog::logAdd($this->post['token'], [
+                       "order_code" => $bidNo,//咨询单详情编号
+                       "status" => $odlstatus,//这里的status是之前的值
+                       "action_remark" => '',//备注
+                       "action_type" => "status"//新建create，编辑edit，更改状态status
+                   ], "FKD", $info['status'], $info);
                    $old_infos_status = $infos['status'];
                    $infos['status']=3;
                    $infos['updatetime']=date("Y-m-d H:i:s");
@@ -1332,14 +1318,6 @@ class Consult extends Base
                            "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]);
                    }
@@ -1372,10 +1350,18 @@ class Consult extends Base
         }
         Db::startTrans();
         try {
+                $oldstattus=$info['status'];
                 $info['status']=6;
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $bids = Db::name("consult_bids")->save($info);
                 if($bids){
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" =>$bidNo,//咨询单详情编号
+                        "status" => $oldstattus,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "FKD", $info['status'], $info);
                     $old_infos_status = $infos['status'];
                     $infos['status']=4;
                     $infos['updatetime']=date("Y-m-d H:i:s");
@@ -1389,14 +1375,6 @@ class Consult extends Base
                             "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,"商品确定成功");
                     }
@@ -1527,7 +1505,17 @@ class Consult extends Base
             $info['updatetime'] =date("Y-m-d H:i:s");
             $up =Db::name("bargain_order")->save($info);
             if($up){
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>  $bargainNo,//咨询单详情编号
+                    "status" =>$ra_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "status"//新建create，编辑edit，更改状态status
+                ], "YJD", $info['status'], $info);
+                $process=["order_code"=>$bargainNo,"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'YJD'];
+                ProcessOrder::AddProcess($token,$process);
                 if($info['status']==1||$info['status']==3||$info['status']==8||$info['status']==6||$info['status']==9||$info['status']==10||$info['status']==11){
+                    $bidstatus=$bids['status'];
                     $bids['status']=5;
                        if($info['status']==1||$info['status']==6||$info['status']==9||$info['status']==10){
                            $bids['sale_price']=$info['after_price'];
@@ -1546,6 +1534,12 @@ class Consult extends Base
                         Db::rollback();
                         return error_show(1004,"数据更新失败");
                     }
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $info["bidsNo"],//咨询单详情编号
+                        "status" => $bidstatus,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "FKD",  $bids['status'], $bids);
                 }
                 Db::commit();
                 return app_show(0,"更新成功");

app/admin/controller/Customer.php

@@ -8,21 +8,11 @@ use think\App;
 use think\facade\Db;
 
 //客户的组织架构
-class Customer extends BaseController
+class Customer extends Base
 {
-    public $post = "";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
-        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
     }
     /*列表*/
     public function list(){

app/admin/controller/Departuser.php

@@ -8,21 +8,11 @@ use think\App;
 use think\facade\Db;
 
 //部门
-class Departuser extends BaseController
+class Departuser extends Base
 {
-    public $post = "";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
-        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
     }
     /*列表*/
     public function list(){

app/admin/controller/Good.php

@@ -13,31 +13,14 @@ use think\facade\Validate;
 class Good extends Base
 {
 
-    private $acton=[
-        "allotsend"=>'调拨发货',
-        "allotin"=>'调拨入库',
-        "allotincheck"=>'调拨验货',
-        'CGD'=>'采购单',
-        'BHD'=>'备库单',
-        'FKD'=>'备库反馈单',
-        'RKD'=>'入库单',
-        'ZXQRD'=>'咨询单',
-        'XSQRD'=>'销售单',
-        'PDD'=>'盘点单',
-        'DBD'=>'调拨单',
-        'CKD'=>'出库单',
-        'CGTHD'=>'采购退货单',
-        'QRTHD'=>'销售退货单',
-        'XSTHD'=>'销售退货单',
-        'CGGCD'=>'采购工差单',
-        'ZXGCD'=>'咨询工差单',
-        'RKTHD'=>'入库退货单',
-    ];
+    private $acton=[];
     public $noble=[];
     public function __construct(App $app)
     {
         parent::__construct($app);
         $this->noble=\think\facade\Config::get("noble");
+        $order=\think\facade\Config::get("order");
+        $this->acton=$order['order_type'];
     }
 
     public function list(){

app/admin/controller/Goodup.php

@@ -482,6 +482,21 @@ class Goodup extends Base
                         return app_show(1004,"商品规格值创建失败");
                     }
                 }
+
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$spucode,//咨询单详情编号
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "SPCB", 0,$data);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'SPCB',
+                            "order_code" => $spucode,//咨询单详情编号
+                            "order_id" => Db::name("good_basic")->getLastInsID(),
+                            "order_status" =>0
+                        ]);
                     Db::commit();
                     return app_show(0,"创建成功",["spuCode"=>$spucode]);
 
@@ -720,6 +735,20 @@ class Goodup extends Base
                         }
                     }
                 }
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$supcode,//咨询单详情编号
+                    "status" =>  $data['status'],//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "SPCB",$temp['status'] ,$data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPCB',
+                    "order_code" => $supcode,//咨询单详情编号
+                    "order_id" => $data['id'],
+                    "order_status" =>$temp['status']
+                ]);
                 Db::commit();
                 return app_show(0,"更新成功");
             }else{
@@ -795,6 +824,20 @@ class Goodup extends Base
             $jsp = json_encode($datas,JSON_UNESCAPED_UNICODE);
             if($up){
                 ChangeLog::logAdd(3,$datas['spuCode'],$jsp,$json,$this->post['token'],$this->post);
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$supcode,//咨询单详情编号
+                    "status" =>  $datas['status'],//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "SPCB",$data['status'] ,$data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPCB',
+                    "order_code" => $supcode,//咨询单详情编号
+                    "order_id" => $datas['id'],
+                    "order_status" =>$data['status']
+                ]);
                 $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
                 if($online){
                     $onup = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save
@@ -803,6 +846,20 @@ class Goodup extends Base
                         Db::rollback();
                         return app_show(1004,"商品规成本修改失败");
                     }
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" =>$online['skuCode'],//咨询单详情编号
+                        "status" =>  $online['exam_status'],//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "edit"//新建create，编辑edit，更改状态status
+                    ], "SPSX",2,["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'SPSX',
+                        "order_code" => $online['skuCode'],//咨询单详情编号
+                        "order_id" => $online['id'],
+                        "order_status" =>2
+                    ]);
                 }
                 if($good_ladder!=="" && !empty($good_ladder)){
 
@@ -889,10 +946,27 @@ class Goodup extends Base
         Db::startTrans();
         try {
             if($data['status']==3 && $status==1){
-                $online = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->save(["exam_status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-                if($online!=false){
-                    Db::rollback();
-                    return error_show(1004,"审核失败");
+                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
+                if($online) {
+                    $onl= Db::name("good_platform")->where(["spuCode" => $supcode, "is_del" => 0])->save(["exam_status" => 2, "updatetime" => date("Y-m-d H:i:s")]);
+                    if ($onl != false) {
+                        Db::rollback();
+                        return error_show(1004, "审核失败");
+                    }
+
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" =>$online['skuCode'],//咨询单详情编号
+                        "status" => $online['exam_status'],//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "edit"//新建create，编辑edit，更改状态status
+                    ], "SPSX", 2, ["exam_status" => 2, "updatetime" => date("Y-m-d H:i:s")]);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'SPSX',
+                        "order_code" =>$online['skuCode'],//咨询单详情编号
+                        "order_id" => $online['id'],
+                        "order_status" => 2
+                    ]);
                 }
             }
 
@@ -907,6 +981,20 @@ class Goodup extends Base
             $data['updatetime']=date("Y-m-d H:i:s");
             $up= Db::name("good_basic")->save($data);
             if($up){
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$supcode,//咨询单详情编号
+                    "status" =>  $status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "SPCB",$data['status'] ,$data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPCB',
+                    "order_code" => $supcode,//咨询单详情编号
+                    "order_id" => $data['id'],
+                    "order_status" =>$data['status']
+                ]);
                 $data=[
                     "code"=>$supcode,
                     "exam_status"=>$status,
@@ -1012,6 +1100,7 @@ class Goodup extends Base
         }
         $up= Db::name("good_basic")->where(["spuCode"=>$supcode,"is_del"=>0])->save(["is_del"=>1]);
         if($up){
+            ProcessOrder::workdel(["order_type"=>"CGD","order_code"=>$supcode]);
             return app_show(0,"更新成功");
         }else{
             return error_show(1005,"更新失败");
@@ -1053,111 +1142,156 @@ class Goodup extends Base
         $data=[];
         $isonline=[];
         $i=0;
-        foreach ($spuCode as $value){
-            $count = Db::name("good_nake")->where(["spuCode"=>$value,"is_del"=>0])->count();
-            $ist =Db::name("good_platform")->where(["spuCode"=>$value,"platform_code"=>$platform,"is_del"=>0])->find();
-            if($ist){
-                $god=Db::name("good_basic")->where(["spuCode"=>$value,"is_del"=>0])->find();
-                if($god){
-                    $tp=[];
-                    $tp['spuCode']=$value;
-                    $tp['good_name']=$god['good_name'];
-                    $tp['good_img']=$god['good_thumb_img'];
-                    $tp['exam_status']=$ist['exam_status'];
-                    $spec = Db::name("good_spec")->where(["spuCode"=>$value,"is_del"=>0])->select()->toArray();
-                    $speclist=[];
-                    if(!empty($spec)){
-                        foreach ($spec as $val){
-                            $temp=[];
-                            $temp['id']=$val['id'];
-                            $temp['spuCode']=$val['spuCode'];
-                            $temp['spec_id']=$val['spec_id'];
-                            $temp['spec_value_id']=$val['spec_value_id'];
-                            $temp['is_del']=$val['is_del'];
-                            $sp = Db::name("specs")->where(["id"=>$val['spec_id']])->find();
-                            $temp['spec_name']=isset($sp["spec_name"]) ? $sp["spec_name"]:"";
-                            $spv = Db::name("spec_value")->where(["id"=>$val['spec_value_id']])->find();
-                            $temp['spec_value']=isset($spv["spec_value"]) ? $spv["spec_value"]:"";
-                            $speclist[]=$temp;
+        Db::startTrans();
+        try{
+            foreach ($datas as $value){
+                $count = Db::name("good_nake")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->count();
+                $ist =Db::name("good_platform")->where(["spuCode"=>$value['spuCode'],"platform_code"=>$platform,"is_del"=>0])->find();
+                if($ist){
+                    $god=Db::name("good_basic")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
+                    if($god){
+                        $tp=[];
+                        $tp['spuCode']=$value['spuCode'];
+                        $tp['good_name']=$god['good_name'];
+                        $tp['good_img']=$god['good_thumb_img'];
+                        $tp['exam_status']=$ist['exam_status'];
+                        $spec = Db::name("good_spec")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->select()->toArray();
+                        $speclist=[];
+                        if(!empty($spec)){
+                            foreach ($spec as $val){
+                                $temp=[];
+                                $temp['id']=$val['id'];
+                                $temp['spuCode']=$val['spuCode'];
+                                $temp['spec_id']=$val['spec_id'];
+                                $temp['spec_value_id']=$val['spec_value_id'];
+                                $temp['is_del']=$val['is_del'];
+                                $sp = Db::name("specs")->where(["id"=>$val['spec_id']])->find();
+                                $temp['spec_name']=isset($sp["spec_name"]) ? $sp["spec_name"]:"";
+                                $spv = Db::name("spec_value")->where(["id"=>$val['spec_value_id']])->find();
+                                $temp['spec_value']=isset($spv["spec_value"]) ? $spv["spec_value"]:"";
+                                $speclist[]=$temp;
+                            }
                         }
+                        $tp["speclist"]=empty($speclist)?[]:$speclist;
+                        $isonline[]=$tp;
                     }
-                    $tp["speclist"]=empty($speclist)?[]:$speclist;
-                    $isonline[]=$tp;
-                }
 
-            }
+                }
+                if(!empty($isonline)){
+                    return app_show(1009,"存在已上线产品",$isonline);
+                }
+                //改变编码规则，将原来的skuCode后两位换成序列号
+                //str_pad字符串填充
+                $skuCode = makeNo("SN");
+                $skuCode = substr($skuCode, 0, -2) . str_pad($i, 2, '0', STR_PAD_LEFT);
+                $tmp=[
+                    "spuCode"=>$value['spuCode'],
+                    "skuCode"=>$skuCode,
+                    "platform_code"=>$platform,
+                    "online_reason"=>$online_reason,
+                    "online_remark"=>$online_remark,
+                    "exam_status"=>$count>0 ?2:1,
+                    "is_online"=>0,
+                    "status"=>1,
+                    "is_del"=>0,
+                    "creater"=>$creater,
+                    "createrid"=>$createrid,
+                    "addtime"=>date("Y-m-d H:i:s"),
+                    "updatetime"=>date("Y-m-d H:i:s")
+                ];
+                $i++;
+                //修改状态，添加待办
+                $create =Db::name("good_platform")->insert($tmp,true);
+                if($create>0){
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" =>$skuCode,//咨询单详情编号
+                        "status" =>  $tmp['exam_status'],//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "create"//新建create，编辑edit，更改状态status
+                    ], "SPSX",$tmp['exam_status'],$tmp);
 
-            //改变编码规则，将原来的skuCode后两位换成序列号
-            //str_pad字符串填充
-            $skuCode = makeNo("SN");
-            $skuCode = substr($skuCode, 0, -2) . str_pad($i, 2, '0', STR_PAD_LEFT);
-            $data[]=[
-                "spuCode"=>$value,
-                "skuCode"=>$skuCode,
-                "platform_code"=>$platform,
-                "online_reason"=>$online_reason,
-                "online_remark"=>$online_remark,
-                "exam_status"=>$count>0 ?2:1,
-                "is_online"=>0,
-                "status"=>1,
-                "is_del"=>0,
-                "creater"=>$creater,
-                "createrid"=>$createrid,
-                "addtime"=>date("Y-m-d H:i:s"),
-                "updatetime"=>date("Y-m-d H:i:s")
-            ];
-            $i++;
-        }
-        if(!empty($isonline)){
-            return app_show(1009,"存在已上线产品",$isonline);
-        }
-        Db::startTrans();
-        $create =Db::name("good_platform")->insertAll($data);
-        if($create){
-            foreach ($datas as $value){
-                $iso = Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
-                if($iso==false){
-                    unset($value['id']);
-                    $value['creater']=$creater;
-                    $value['createrid']=$createrid;
-                    $value['addtime']=date("Y-m-d H:i:s");
-                    $value['updatetime']=date("Y-m-d H:i:s");
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'SPSX',
+                        "order_code" =>$skuCode,//咨询单详情编号
+                        "order_id" => $create,
+                        "order_status" =>$tmp['exam_status']
+                    ]);
+                    $iso = Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
+                    if($iso==false){
+                        unset($value['id']);
+                        $value['creater']=$creater;
+                        $value['createrid']=$createrid;
+                        $value['addtime']=date("Y-m-d H:i:s");
+                        $value['updatetime']=date("Y-m-d H:i:s");
+                    }else{
+                        $value['id']=$iso['id'];
+                        $value['creater']=$creater;
+                        $value['createrid']=$createrid;
+                        $value['updatetime']=date("Y-m-d H:i:s");
+                    }
+                    $up =Db::name("good")->save($value);
+                    if(!$up){
+                        Db::rollback();
+                        return error_show(1004,"提交失败");
+                    }
                 }else{
-                    $value['id']=$iso['id'];
-                    $value['creater']=$creater;
-                    $value['createrid']=$createrid;
-                    $value['updatetime']=date("Y-m-d H:i:s");
-                }
-                $up =Db::name("good")->save($value);
-                if(!$up){
                     Db::rollback();
                     return error_show(1004,"提交失败");
                 }
-
-                //添加审核记录
-                //修改状态，添加待办
-                $skuCodes = array_column($data, 'skuCode', 'spuCode');
-
-                ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
-                    "order_code" => $skuCodes[$value['spuCode']],//编号
-                    "status" => 2,//待产品审核
-                    "action_remark" => '',//备注
-                    "action_type" => "create"//新建create，编辑edit，更改状态status
-                ], "SPSX", $value['status'], $value);
-
-                ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
-                    "order_type" => 'SPSX',
-                    "order_code" => $skuCodes[$value['spuCode']],//咨询单详情编号
-                    "order_id" => isset($value['id']) ? $value['id'] : 0,
-                    "order_status" => 2,//待产品审核
-                ]);
             }
+
+//            if($create){
+//                foreach ($datas as $value){
+//                    $iso = Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
+//                    if($iso==false){
+//                        unset($value['id']);
+//                        $value['creater']=$creater;
+//                        $value['createrid']=$createrid;
+//                        $value['addtime']=date("Y-m-d H:i:s");
+//                        $value['updatetime']=date("Y-m-d H:i:s");
+//                    }else{
+//                        $value['id']=$iso['id'];
+//                        $value['creater']=$creater;
+//                        $value['createrid']=$createrid;
+//                        $value['updatetime']=date("Y-m-d H:i:s");
+//                    }
+//                    $up =Db::name("good")->save($value);
+//                    if(!$up){
+//                        Db::rollback();
+//                        return error_show(1004,"提交失败");
+//                    }
+//
+//                    //添加审核记录
+//                    //修改状态，添加待办
+//                    $skuCodes = array_column($data, 'skuCode', 'spuCode');
+//
+//                    ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
+//                        "order_code" => $skuCodes[$value['spuCode']],//编号
+//                        "status" => 2,//待产品审核
+//                        "action_remark" => '',//备注
+//                        "action_type" => "create"//新建create，编辑edit，更改状态status
+//                    ], "SPSX", $value['status'], $value);
+//
+//                    ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
+//                        "order_type" => 'SPSX',
+//                        "order_code" => $skuCodes[$value['spuCode']],//咨询单详情编号
+//                        "order_id" => isset($value['id']) ? $value['id'] : 0,
+//                        "order_status" => 2,//待产品审核
+//                    ]);
+//                }
+//                Db::commit();
+//                return app_show(0,"提交成功");
+//            }else{
+//                Db::rollback();
+//                return error_show(1004,"提交失败");
+//            }
             Db::commit();
             return app_show(0,"提交成功");
-        }else{
+        }catch (\Exception $e){
             Db::rollback();
-            return error_show(1004,"提交失败");
+            return error_show(1004,$e->getMessage()."|".$e->getLine());
         }
+
     }
 
     //审核
@@ -1195,6 +1329,7 @@ class Goodup extends Base
 
         }
         $exam_remark = isset($this->post['exam_remark'])&&$this->post['exam_remark']!==""?trim($this->post['exam_remark']):"";
+        $bifore=$platform['exam_status'];
         $platform['exam_status']=$exam_status;
         $platform['updatetime']=date("Y-m-d H:i:s");
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
@@ -1225,7 +1360,7 @@ class Goodup extends Base
 
                     ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
                         "order_code" => $skuCode,//编号
-                        "status" => $exam_status,
+                        "status" => $bifore,
                         "action_remark" => '',//备注
                         "action_type" => "status"//新建create，编辑edit，更改状态status
                     ], "SPSX", $exam_status, $platform);
@@ -1286,6 +1421,7 @@ class Goodup extends Base
         }
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+        $bifore=$platform['exam_status'];
         $platform['exam_status']=4;
         $platform['updatetime']=date("Y-m-d H:i:s");
         Db::startTrans();
@@ -1312,6 +1448,19 @@ class Goodup extends Base
             }
             $up = Db::name("good_platform")->save($platform);
             if($up){
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$platform['skuCode'],//咨询单详情编号
+                    "status" =>$bifore,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "SPSX", $platform['exam_status'],$platform);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPSX',
+                    "order_code" =>$platform['skuCode'],//咨询单详情编号
+                    "order_id" => $platform['id'],
+                    "order_status" => $platform['exam_status']
+                ]);
                 $proof=[
                     'spuCode'=>$platform['spuCode'],
                     'proof_type'=>$proof_type,
@@ -1338,22 +1487,6 @@ class Goodup extends Base
                 ];
                 $inr=Db::name("good_exam")->insert($data);
                 if($inr){
-
-                    //修改状态，添加待办
-                    ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
-                        "order_code" => $skuCode,
-                        "status" => 4,//待财务审核定价
-                        "action_remark" => '',//备注
-                        "action_type" => "status"//新建create，编辑edit，更改状态status
-                    ], "SPSX", 4, $value);
-
-                    ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
-                        "order_type" => 'SPSX',
-                        "order_code" => $skuCode,
-                        "order_id" => $platform['id'],
-                        "order_status" => 4,//待财务审核定价
-                    ]);
-
                     Db::commit();
                     return app_show(0,"审核成功");
                 }else{
@@ -1402,6 +1535,7 @@ class Goodup extends Base
             return error_show(1004,"商品状态有误");
         }
         $nake =Db::name("good_nake")->where(["spuCode"=>$platform['spuCode'],"is_del"=>0])->select()->toArray();
+        $bifore=$platform['exam_status'];
         $platform['exam_status'] = empty($nake)?1:2;
         $platform['updatetime'] = date("Y-m-d H:i:s");
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
@@ -1418,6 +1552,18 @@ class Goodup extends Base
         try {
             $save =Db::name("good_platform")->save($platform);
             if($save){
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$platform['skuCode'],//咨询单详情编号
+                    "status" =>$bifore,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "SPSX", $platform['exam_status'],$platform);
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPSX',
+                    "order_code" =>$platform['skuCode'],//咨询单详情编号
+                    "order_id" => $platform['id'],
+                    "order_status" => $platform['exam_status']
+                ]);
                 $data=[
                     "code"=>$platform['skuCode'],
                     "type"=>2,
@@ -1509,6 +1655,20 @@ class Goodup extends Base
             $data['updatetime']=date("Y-m-d H:i:s");
             $cre = Db::name("good_basic")->insert($data);
             if($cre){
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$newCode,//咨询单详情编号
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "SPCB", 7,$data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPCB',
+                    "order_code" =>$newCode,//咨询单详情编号
+                    "order_id" => Db::name("good_basic")->getLastInsID(),
+                    "order_status" =>7
+                ]);
                 if(!empty($ladd)){
                     $na = Db::name("good_nake")->insertAll($ladd);
                     if($na==0){
@@ -1783,6 +1943,20 @@ class Goodup extends Base
             $dat = json_encode($data,JSON_UNESCAPED_UNICODE);
             if($up){
                 ChangeLog::logAdd(3,$data['spuCode'],$dat,$json,$this->post['token'],$this->post);
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$supcode,//咨询单详情编号
+                    "status" => $data['status'],//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "SPCB", 0,$temp);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'SPCB',
+                    "order_code" =>$supcode,//咨询单详情编号
+                    "order_id" => $data['id'],
+                    "order_status" =>0
+                ]);
                 if($speclist!=="" && !empty($speclist)){
                     foreach ($speclist as $value){
                         $lemp=[];
@@ -2192,24 +2366,36 @@ class Goodup extends Base
             if (!empty($good_spec_insert_data)) Db::name('good_spec')->insertAll($good_spec_insert_data);
 
             if ($create) {
-                foreach ($good_zixun_list as $value) {
+                foreach ($good_basic_insert_data as $value) {
 
-                    //添加审核记录
-                    //修改状态，添加待办
-                    $skuCodes = array_column($data, 'skuCode', 'spuCode');
+                    ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
+                        "order_code" =>$value['spuCode'],//
+                        "status" => 8,//待产品审核
+                        "action_remark" => '',//备注
+                        "action_type" => "create"//新建create，编辑edit，更改状态status
+                    ], "SPCB", $value['status'], $value);
+
+                    ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
+                        "order_type" => 'SPCB',
+                        "order_code" =>$value['spuCode'],//
+                        "order_id" => isset($value['id']) ? $value['id'] : 0,
+                        "order_status" => 8,//待产品审核
+                    ]);
+                }
+                foreach ($data as $value) {
 
                     ActionLog::logAdd(['id' => $createrid, 'nickname' => $creater], [
-                        "order_code" => $skuCodes[$value['spuCode']],//
-                        "status" => 2,//待产品审核
+                        "order_code" =>$value['skuCode'],//
+                        "status" => 0,//待产品审核
                         "action_remark" => '',//备注
                         "action_type" => "create"//新建create，编辑edit，更改状态status
-                    ], "SPSX", $value['status'], $value);
+                    ], "SPSX", $value['exam_status'], $value);
 
                     ProcessOrder::AddProcess(['id' => $createrid, 'nickname' => $creater], [
                         "order_type" => 'SPSX',
-                        "order_code" => $skuCodes[$value['spuCode']],//
+                        "order_code" =>$value['skuCode'],//
                         "order_id" => isset($value['id']) ? $value['id'] : 0,
-                        "order_status" => 2,//待产品审核
+                        "order_status" =>$value['exam_status'],//待产品审核
                     ]);
                 }
                 Db::commit();

app/admin/controller/Group.php

@@ -7,22 +7,11 @@ use think\facade\Db;
 use think\App;
 
 //管理员权限分组
-class Group extends BaseController
+class Group extends Base
 {
     public  function __construct(App $app)
     {
         parent::__construct($app);
-        $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
-        $this->uid = isset($effetc['data']['user']['id']) ? $effetc['data']['user']['id'] :"";
     }
 
     /**
@@ -34,7 +23,7 @@ class Group extends BaseController
      */
     public function GroupList(){
 
-        $post  =$this->request->post();
+        $post  =$this->post;
         $token = isset($post['token']) ? trim($post['token']) : "";
 
         $page = isset($post['page']) ? intval($post['page']): 1;
@@ -70,7 +59,7 @@ class Group extends BaseController
      * @throws \think\exception\DbException
      */
     public function GroupAll(){
-        $post  =$this->request->post();
+        $post  =$this->post;
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
@@ -103,7 +92,7 @@ class Group extends BaseController
      * @throws \think\exception\DbException
      */
     public function GroupInfo(){
-        $post  =$this->request->post();
+        $post  =$this->post;
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
@@ -135,7 +124,7 @@ class Group extends BaseController
      * @throws \think\exception\DbException
      */
     public function GroupAdd(){
-        $post  =$this->request->post();
+        $post  =$this->post;
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
@@ -163,8 +152,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($token,$orde,'role_group',1,$orde);
+//        $orde = ["order_code"=>$groupuser,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
+//        ActionLog::logAdd($token,$orde,'role_group',1,$orde);
         return $in ? app_show(0,"新建成功"): error_show(1005,"新建失败");
     }
 
@@ -173,7 +162,7 @@ class Group extends BaseController
      * @throws \think\exception\DbException
      */
     public function GroupSave(){
-        $post  =$this->request->post();
+        $post  =$this->post;
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
@@ -204,8 +193,8 @@ class Group extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $in = Db::name("role_group")->save($data);
-        $orde = ["order_code"=>$groupname,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-        ActionLog::logAdd($token,$orde,'role_group',0,$orde);
+//        $orde = ["order_code"=>$groupname,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+//        ActionLog::logAdd($token,$orde,'role_group',0,$orde);
         return $in ? app_show(0,"更新成功"): error_show(1005,"更新失败");
     }
 
@@ -214,7 +203,7 @@ class Group extends BaseController
      * @throws \think\exception\DbException
      */
     public function GroupStatus(){
-        $post  =$this->request->post();
+        $post  =$this->post;
         $token = isset($post['token']) ? trim($post['token']) : "";
         if($token==""){
             return error_show(101,'token不能为空');
@@ -237,8 +226,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);
+//        $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,"更新失败");
     }
 }

app/admin/controller/Listcustomer.php

@@ -8,21 +8,12 @@ use think\App;
 use think\facade\Db;
 
 //客户信息
-class Listcustomer extends BaseController
+class Listcustomer extends Base
 {
-    public $post = "";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
-        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-        if($token ==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+
     }
     public function list(){
         $page = isset($this->post['page'])&& $this->post['page']  !=="" ? intval($this->post['page']) :"1";

app/admin/controller/Log.php

@@ -9,22 +9,13 @@ use think\App;
 use think\facade\Db;
 
 //日志
-class Log extends BaseController
+class Log extends Base
 {
-    public $post = "";
+
 
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
-        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
     }
     /**
      * 显示资源列表

app/admin/controller/Menu.php

@@ -9,7 +9,7 @@ use think\facade\Db;
 //菜单
 class Menu extends Base
 {
-    public $post="";
+
     /**
      * 显示资源列表
      * @return \think\Response
@@ -17,7 +17,7 @@ class Menu extends Base
     public  function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post  =$this->request->post();
+//        $this->post  =$this->request->post();
     }
 
     public function list()
@@ -93,8 +93,7 @@ class Menu extends Base
         $weight = isset($post['weight']) ?floatval($post['weight']) :1;
         $status = isset($post['is_show']) ? intval($post['is_show']) : 0;
         $is_display = isset($post['is_display']) ? intval($post['is_display']) : 0;
-        $private = isset($post['private']) ?intval($post['private']) :(isset($menu['is_private']) ?
-            $menu['is_private'] : 0);
+        $private = isset($post['private']) ?intval($post['private']) :(isset($menu['is_private']) ?$menu['is_private'] : 0);
         if($pid!=0 && $route==""){
             return error_show(1002,"子级菜单路由不能为空");
         }

app/admin/controller/Newfill.php

@@ -9,16 +9,11 @@ use app\admin\model\ActionLog;
 
 
 //系统的组织架构
-class Newfill extends BaseController
+class Newfill extends Base
 {
-     public $post = "";
-
-
-
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
     }
     public function list()
     {
@@ -164,7 +159,6 @@ class Newfill extends BaseController
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
-
             ];
 
             $t= Db::name("company_item")->insert($data,true);

app/admin/controller/Ocrlicense.php

@@ -22,7 +22,6 @@ class Ocrlicense extends \app\BaseController
         }
         $ocr=new Ocr();
         $data =  $ocr->query("",$img);
-       // var_dump($data);
         if($data['code']==0 && isset($data['data']['result'])){
             return app_show(0,"识别成功",$data['data']['result']);
         }else{

app/admin/controller/Orderback.php

@@ -220,8 +220,8 @@ class Orderback extends Base
           $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,$info['order_type'] == 2?"ZXCKTHD":"CKTHD",2,$info);
-              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>2,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
+              ActionLog::logAdd($this->post['token'],$stn,"CKTHD",$info['status'],$info);
+              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$info['status'],"CKTHD"];
               ProcessOrder::AddProcess($this->post['token'],$process);
               if(empty($errorlist)){
                   Db::commit();
@@ -273,8 +273,8 @@ class Orderback extends Base
           $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,$info['order_type'] == 2?"ZXCKTHD":"CKTHD",$info['status'],$stn);
-              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>3,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
+              ActionLog::logAdd($this->post['token'],$stn,"CKTHD",$info['status'],$stn);
+              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>3,"order_type"=>"CKTHD"];
               ProcessOrder::AddProcess($this->post['token'],$process);
               if(empty($errorlist)){
                   $up =Db::name("order_backinfo")->where(["thNo"=>$thNo,"is_del"=>0])->save(["status"=>1,
@@ -366,8 +366,8 @@ class Orderback extends Base
             $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,$info['order_type'] == 2?"ZXCKTHD":"CKTHD",$info['status'],$stn);
-                $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
+                ActionLog::logAdd($this->post['token'],$stn,"CKTHD",$info['status'],$this->post);
+                $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>"CKTHD"];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return app_show(0,'更新成功');
@@ -617,9 +617,9 @@ class Orderback extends Base
                 ->update($update_data);
 
             if ($res) {
-                $stn = ["order_code" => $param['thNo'], "status" => $param['status'], "action_remark" => '', "action_type" => "edit"];
-                ActionLog::logAdd($this->post['token'], $stn, $info['order_type'] == 2 ? "ZXCKTHD" : "CKTHD", $info['status'], $stn);
-                $process = ["order_code" => $param['thNo'], "order_id" => $info['id'], "order_status" => $param['status'], "order_type" => $info['order_type'] == 2 ? "ZXCKTHD" : "CKTHD"];
+                $stn = ["order_code" => $param['thNo'], "status" => $info['status'], "action_remark" => '', "action_type" => "edit"];
+                ActionLog::logAdd($this->post['token'], $stn, "CKTHD",  $param['status'], $stn);
+                $process = ["order_code" => $param['thNo'], "order_id" => $info['id'], "order_status" => $param['status'], "order_type" =>"CKTHD"];
                 ProcessOrder::AddProcess($this->post['token'], $process);
 
                 Db::commit();

app/admin/controller/Project.php

@@ -108,22 +108,41 @@ class Project extends Base
                         $temp['is_del']=0;
                         $temp['addtime']=date("Y-m-d H:i:s");
                         $temp['updatetime']=date("Y-m-d H:i:s");
-                        $la[]=$temp;
-                    }
-                    $in = Db::name("project_info")->insertAll($la);
-                    if($in>0){
 
+                        $in = Db::name("project_info")->insert($temp,true);
+                        if($in>0){
+                            ActionLog::logAdd($this->post['token'], [
+                                "order_code" => $pgNo,//编码,这里是project的编码
+                                "status" => 1,//这里的status是之前的值
+                                "action_remark" => '',//备注
+                                "action_type" => "status"//新建create，编辑edit，更改状态status
+                            ], "PRI", 1, $temp);
+                        }else{
+                            Db::rollback();
+                            return error_show(1004,"项目新建失败");
+                        }
+
+                    }
                         //修改状态，添加待办，只记录动作
                         ActionLog::logAdd($this->post['token'], [
                             "order_code" => $projectNo,//编码,这里是project的编码
                             "status" => 1,//这里的status是之前的值
                             "action_remark" => '',//备注
                             "action_type" => "create"//新建create，编辑edit，更改状态status
-                        ], "PRO", 1, $la);
-
+                        ], "PRO", 1, $this->post);
+                        $process = ["order_code" => $projectNo, "order_id" => Db::name("project")->getLastInsID(), "order_status" =>1, "order_type" =>"PRO"];
+                        ProcessOrder::AddProcess($this->post['token'], $process);
+                        //修改状态，添加待办，只记录动作
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" => $projectNo,//编码,这里是project的编码
+                            "status" => 0,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "create"//新建create，编辑edit，更改状态status
+                        ], "PRT", 0, $this->post);
+                        $process = ["order_code" => $projectNo, "order_id" => Db::name("project")->getLastInsID(), "order_status" =>0, "order_type" =>"PRT"];
+                        ProcessOrder::AddProcess($this->post['token'], $process);
                         Db::commit();
                         return app_show(0,"项目新建成功",['projectNo'=>$projectNo]);
-                    }
                 }
             }
             Db::rollback();
@@ -143,6 +162,10 @@ class Project extends Base
         if($projectinfo==false){
             return error_show(1004,"未找到项目阶梯信息");
         }
+        $project = Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'],"is_del"=>0])->find();
+        if($project==false){
+            return error_show(1004,"未找到项目阶梯信息");
+        }
         $spuCode =isset($this->post['spuCode'])&&!empty($this->post['spuCode']) ?$this->post['spuCode']:"";
         if($spuCode==""){
             return error_show(1004,"参数spuCode不能为空");
@@ -224,7 +247,7 @@ class Project extends Base
                         "status" => $old_projectinfo_status,//这里的status是之前的值
                         "action_remark" => '',//备注
                         "action_type" => "status"//新建create，编辑edit，更改状态status
-                    ], "PRO", 2, $projectinfo);
+                    ], "PRI", 2, $projectinfo);
 
 
                     $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])
@@ -233,19 +256,18 @@ class Project extends Base
                         $proc =Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->save
                         (["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
                         if($proc){
-
                             //修改状态，添加待办
                             ActionLog::logAdd($this->post['token'], [
                                 "order_code"=>$projectinfo['projectNo'],//项目编码
                                 "status"=>1,//这里的status是之前的值
                                 "action_remark"=>'',//备注
                                 "action_type"=>"status"//新建create，编辑edit，更改状态status
-                            ],"PRO",2,$this->post);
+                            ],"PRO",2,["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
 
                             ProcessOrder::AddProcess($this->post['token'],[
                                 "order_type"=>'PRO',
                                 "order_code"=>$projectinfo['projectNo'],
-                                "order_id"=>0,//这里更新是根据编码更新的，没有主键id
+                                "order_id"=>$project['id'],//这里更新是根据编码更新的，没有主键id
                                 "order_status"=>2
                             ]);
 
@@ -565,13 +587,6 @@ class Project extends Base
                                "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'];
@@ -613,15 +628,6 @@ 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");
@@ -642,7 +648,6 @@ class Project extends Base
                             "order_id" => $info['id'],
                             "order_status" => 4
                         ]);
-
                         Db::commit();
                         return app_show(0,"方案制作成功",["planNo"=>$planNo]);
                     }
@@ -769,7 +774,7 @@ class Project extends Base
             return error_show(1004,"反馈数据信息未找到");
         }
         $pgnos =array_column($selec,"pgNo");
-        $infolist =   Db::name("project_info")->where(['pgNo'=>$pgnos])->select()->toArray();
+        $infolist = Db::name("project_info")->where(['pgNo'=>$pgnos])->select()->toArray();
         if(empty($infolist)){
             return error_show(1004,"项目商品数据未找到");
         }
@@ -779,6 +784,11 @@ class Project extends Base
             if($up){
 
                 foreach ($infolist as $value){
+                    $poject=Db::name("project")->where(["projectNo"=>$value['projectNo']])->find();
+                    if($poject==false){
+                        Db::rollback();
+                        return error_show(1004,"项目单未找到");
+                    }
                     $old_projectinfo_status = $value['status'];
                     $value['status']=3;
                     $value['updatetime']=date("Y-m-d H:i:s");
@@ -791,7 +801,7 @@ class Project extends Base
                             "status" => $old_projectinfo_status,//这里的status是之前的值
                             "action_remark" => '',//备注
                             "action_type" => "status"//新建create，编辑edit，更改状态status
-                        ], "PRO", 3, $value);
+                        ], "PRI", 3, $value);
 
                         $count = Db::name("project_info")->where(["projectNo"=>$value['projectNo'],"status"=>2])
                             ->count();
@@ -802,22 +812,20 @@ class Project extends Base
                                 Db::rollback();
                                 return error_show(1004,"反馈数据选择失败");
                             }else{
-
                                 //修改状态，添加待办
                                 ActionLog::logAdd($this->post['token'], [
-                                    "order_code" => $value['projectNo'],//项目编码
-                                    "status" => 3,//这里的status是之前的值
+                                    "order_code" =>$value['projectNo'],//项目编码
+                                    "status" => $poject['status'],//这里的status是之前的值
                                     "action_remark" => '',//备注
                                     "action_type" => "status"//新建create，编辑edit，更改状态status
-                                ], "PRO", 3, $this->post);
+                                ], "PRO", 3, ["status"=>3,"updatetime"=>date("Y-m-d H:i:s")]);
 
                                 ProcessOrder::AddProcess($this->post['token'], [
                                     "order_type" => 'PRO',
-                                    "order_code" => $value['projectNo'],
-                                    "order_id" => 0,
+                                    "order_code" =>$value['projectNo'],
+                                    "order_id" => $poject['id'],
                                     "order_status" => 3
                                 ]);
-
                             }
                         }
                     }else{
@@ -850,6 +858,7 @@ class Project extends Base
         if(empty($selec)){
             return error_show(1004,"项目方案数据信息未找到");
         }
+
         Db::startTrans();
         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")]);
@@ -870,21 +879,28 @@ 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) {
+                    foreach ($project as $value){
+                        $poject=Db::name("project")->where(["projectNo"=>$value])->find();
+                        if($poject==false){
+                            Db::rollback();
+                            return error_show(1004,"项目单未找到");
+                        }
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" =>$value,//项目编码
+                            "status" => 4,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "PRO", 5, ["status"=>5,"updatetime"=>date("Y-m-d H:i:s")]);
 
-                    //修改状态，添加待办
-                    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" =>$value,
+                            "order_id" => $poject['id'],
+                            "order_status" => 5
+                        ]);
+                    }
 
-                    ProcessOrder::AddProcess($this->post['token'], [
-                        "order_type" => 'PRO',
-                        "order_code" => $project,
-                        "order_id" => 0,
-                        "order_status" => 5
-                    ]);
 
                     Db::commit();
                     return app_show(0, "方案数据修改成功");
@@ -920,12 +936,12 @@ class Project extends Base
             //修改状态，添加待办
             ActionLog::logAdd($this->post['token'], [
                 "order_code" => $projectNo,//项目编码
-                "status" => $info['status'],//这里的status是之前的值
+                "status" =>0,//这里的status是之前的值
                 "action_remark" => '',//备注
-                "action_type" => "edit"//新建create，编辑edit，更改状态status
-            ], "PRO", $info['status'], $info);
+                "action_type" => "edit"//新建create，编辑edit更改状态status
+            ], "PRT", 1, $info);
 
-            $process = ["order_code" => $projectNo, "order_id" => $info['id'], "order_status" => 7, "order_type" => 'PRO'];//order_status==7修改毛利率
+            $process = ["order_code" => $projectNo, "order_id" => $info['id'], "order_status" =>1, "order_type" => 'PRT'];//order_status==7修改毛利率
             ProcessOrder::AddProcess($this->post['token'], $process);
 
             return app_show(0,"利润率修改成功");

app/admin/controller/Purch.php

@@ -505,6 +505,10 @@ class Purch extends Base
         try{
             $item = Db::name("purchease_diff")->insert($data,true);
             if($item>0){
+                            $sto = ["order_code"=>$cgdNo,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                            ActionLog::logAdd($this->post['token'],$sto,"CGGCD",1,$data);
+                            $process=["order_code"=>$cgdNo,"order_id"=>$item,"order_status"=>1,"order_type"=>'CGGCD'];
+                            ProcessOrder::AddProcess($this->post['token'],$process);
                 $orderCode = Db::name("order_num")->where([["cgdNo","=",$cg['cgdNo']],["status","=",1]])->find();
                 if($orderCode!=false){
                     $order = Db::name("sale")->where("orderCode", '=', $orderCode['orderCode'])->find();
@@ -538,7 +542,10 @@ class Purch extends Base
                             return error_show(1002,"新建失败");
 
                     }
-
+                    $sto = ["order_code"=>$orderCode['orderCode'],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                    ActionLog::logAdd($this->post['token'],$sto,"XSGCD",1,$data);
+                    $process=["order_code"=>$orderCode['orderCode'],"order_id"=>$cgd,"order_status"=>1,"order_type"=>'XSGCD'];
+                    ProcessOrder::AddProcess($this->post['token'],$process);
                 }
                 Db::commit();
                 return error_show(0,"新建成功");
@@ -693,6 +700,10 @@ class Purch extends Base
                         }
                     }
                 }
+                $sto = ["order_code"=>$dio['cgdNo'],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$sto,"CGGCD",$status,$this->post);
+                $process=["order_code"=>$dio['cgdNo'],"order_id"=>$dio['id'],"order_status"=>$status,"order_type"=>'CGGCD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return error_show(0,"更新成功");
             }else{

app/admin/controller/Purchback.php

@@ -9,13 +9,13 @@ use think\App;
 use think\facade\Db;
 
 //采购单退货
-class Purchback extends BaseController
+class Purchback extends Base
 {
-public $post="";
+//public $post="";
 public function __construct(App $app)
 {
     parent::__construct($app);
-    $this->post=$this->request->post();
+   // $this->post=$this->request->post();
 }
 public function create(){
     $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";

app/admin/controller/Purchin.php

@@ -228,16 +228,13 @@ class Purchin extends Base
         Db::startTrans();
         try{
             $win = Db::name("purchease_in")->insert($orin,true);
-            $sto = ["order_code"=>$wsm_in_code,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$sto,"RKD",$status,$sto);
-            $process=["order_code"=>$wsm_in_code,"order_id"=>$win,"order_status"=>$status,"order_type"=>'RKD'];
-            ProcessOrder::AddProcess($this->post['token'],$process);
             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);
+                $sto = ["order_code"=>$wsm_in_code,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$sto,"RKD",$status,$this->post);
+                $process=["order_code"=>$wsm_in_code,"order_id"=>$win,"order_status"=>$status,"order_type"=>'RKD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
+                $order = ["order_code"=>$cgdNo,"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
                 if($status==1){
-                    $order = ["order_code"=>$cgdNo,"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
                     $cgdinfo['wsend_num']-=$send_num;
                     $cgdinfo['send_num']+=$send_num;
                     $cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
@@ -269,12 +266,12 @@ class Purchin extends Base
                                 Db::rollback();
                                 return error_show(1004,"新建失败");
                             }
-                            $good_data[]=['good_log_code'=>$cgdNo,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"wait_in_stock"];
+                            $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"wait_in_stock"];
                             GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
-                            ActionLog::logAdd($this->post['token'],$order,"RKD", 1,$good  );
                         }
 
 
+                            ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
                             $process=["order_code"=>$cgdNo,"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
                             ProcessOrder::AddProcess($this->post['token'],$process);
                             Db::commit();
@@ -295,10 +292,6 @@ class Purchin extends Base
                         Db::rollback();
                         return error_show(1004,"新建失败");
                     }
-                    $order = ["order_code"=>$cgdNo,"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
-                    $process=["order_code"=>$cgdNo,"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
-                    ProcessOrder::AddProcess($this->post['token'],$process);
                     $good = Db::name("good_stock")->where(["wsm_code"=>$cgdinfo['wsm_code'],"spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
                     if(empty($good)) {
                         $good=[
@@ -321,11 +314,10 @@ class Purchin extends Base
                     $good['updatetime'] = date("Y-m-d H:i:s");
                     $upd=  Db::name("good_stock")->save($good);
                     //商品变动日志表，good_log_code字段存储采购单单号
-                    $good_data[]=['good_log_code'=>$cgdNo,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
-                    $good_data[]=['good_log_code'=>$cgdNo,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>2,'stock'=>$send_num,"stock_name"=>"wait_in_stock"];
+                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
+                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>2,'stock'=>$send_num,"stock_name"=>"wait_in_stock"];
                     if($upd){
                         GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
-                        ActionLog::logAdd($this->post['token'],$order,"RKD", 1,$good  );
                         if($cgdinfo['order_type']==1){
                             $bk =Db::name("order_bk")->where(['cgdNo'=>$cgdinfo['cgdNo']])->lock(true)->find();
                             if($bk==false){
@@ -399,6 +391,9 @@ class Purchin extends Base
                                         Db::rollback();
                                         return error_show(1004,"库存数量更新失败");
                                     }
+                                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>isset($good['id'])?$good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"wait_out_stock"];
+                                    $good_data[]=['good_log_code'=>$wsm_in_code,"stock_id"=>isset($good['id'])?$good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$send_num,"stock_name"=>"usable_stock"];
+                                    GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
                                     $sendp=Db::name("order_send")->where(["cgdNo"=>$cgdNo,"outCode"=>$send,"status"=>1])->save (["status"=>2]);
                                     if($sendp==false){
                                         Db::rollback();
@@ -407,6 +402,9 @@ class Purchin extends Base
                                 }
                             }
                         }
+                        ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
+                        $process=["order_code"=>$cgdNo,"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
+                        ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return app_show(0,'商品入库成功',["wsm_in_code"=>$wsm_in_code]);
                     }else{
@@ -676,9 +674,10 @@ class Purchin extends Base
                     $upd=  Db::name("good_stock")->save($good);
                     //商品变动日志表，good_log_code字段存储入库单编号
                     $good_data[] = ['good_log_code' => $incode, "stock_id" => isset($good['id']) ? $good['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $info['wsm_num'], "stock_name" => "usable_stock"];
+                    $good_data[] = ['good_log_code' => $incode, "stock_id" => isset($good['id']) ? $good['id'] :
+                        Db::name("good_stock")->getLastInsID(), "type" => 2, 'stock' => $info['wsm_num'], "stock_name" => "wait_in_stock"];
                     if($upd){
                         GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
-                        ActionLog::logAdd($this->post['token'],$order,"RKD", 1,$good);
                         Db::commit();
                         return app_show(0,'商品入库成功');
                     }else{
@@ -744,7 +743,7 @@ class Purchin extends Base
         $userinfo = $result['data'];
         Db::startTrans();
        try{
-
+           $sto = ["order_code"=>$incode,"status"=>$info['status'],"action_remark"=>'',"action_type"=>"edit"];
 //        $info['status'] =$info['wsm_num']==$wsm_num ? 4 :5;
        $info['status'] = $info['send_num'] == $wsm_num ? 4 : 5;//艳蓉说，这里不能用入库数量比较，应该是用入库数量，即总数来比较
         $info['is_th'] =$return_num>0 ?1:0;
@@ -784,7 +783,8 @@ class Purchin extends Base
                     Db::rollback();
                     return error_show(1002,"库存更新失败");
                 }
-                $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1, 'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
+                $good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1, 'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
+                $good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>2, 'stock'=>$info['wsm_num'],"stock_name"=>"wait_in_stock"];
                 GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
 
                 $bk =Db::name("order_bk")->where(['cgdNo'=>$cgdinfo['cgdNo']])->lock(true)->find();
@@ -813,7 +813,7 @@ class Purchin extends Base
 
 
             }
-
+            ActionLog::logAdd($this->post['token'],$sto,"RKD", $info['status'],$this->post);
             $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'RKD'];
             ProcessOrder::AddProcess($this->post['token'],$process);
 
@@ -844,9 +844,8 @@ class Purchin extends Base
                 }
 
                 $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$sto);
-                $process = ["order_code" => $info['wsm_in_code'], "order_id" => $res, "order_status" => 0, "order_type" => 'RKTHD'];
-                ProcessOrder::AddProcess($this->post['token'],$process);
+                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$data);
+
 //            }
 
             Db::commit();
@@ -897,18 +896,16 @@ class Purchin extends Base
         try{
             $up =Db::name("purchease_return")->where($return)->save($data);
             if($up){
-                $sto = ["order_code"=>$info['wsm_in_code'],"status"=>1,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",1,$sto);
-                $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$return['id'],"order_status"=>1,"order_type"=>'RKTHD'];
-                ProcessOrder::AddProcess($this->post['token'],$process);
+                $sto = ["order_code"=>$info['wsm_in_code'],"status"=>$return['status'],"action_remark"=>'', "action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",1,$this->post);
                 $ark=$info['status'];
                 $info['status']=6;
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $sa=Db::name("purchease_in")->save($info);
                 if($sa){
                     $stn = ["order_code"=>$info['wsm_in_code'],"status"=>$ark,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$stn,"RKD",5,$stn);
-                    $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>5,"order_type"=>'RKD'];
+                    ActionLog::logAdd($this->post['token'],$stn,"RKD",6,$info);
+                    $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>6,"order_type"=>'RKD'];
                     ProcessOrder::AddProcess($this->post['token'],$process);
                     if($info['status']==6){
                         $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'], "spuCode"=>$cgdinfo['spuCode'],"is_del"=>0])->find();
@@ -938,9 +935,11 @@ class Purchin extends Base
                             Db::rollback();
                             return error_show(1002,"库存更新失败");
                         }
-                        $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1, 'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
+                        $good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1, 'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
+                        $good_data[]=['good_log_code' => $incode,"stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>2, 'stock'=>$good['wait_in_stock'],"stock_name"=>"wait_in_stock"];
                         GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
                     }
+                    $order = ["order_code"=>$cgdinfo['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
                     $cgdinfo['wsend_num']+=$return['reissue_num'];
                     $cgdinfo['send_num']-=$return['return_num'];
                     $cgdinfo['good_num']-=$return['return_num']-$return['reissue_num'];
@@ -953,6 +952,7 @@ class Purchin extends Base
                         Db::rollback();
                         return error_show(1004,"采购单数量更新失败");
                     }
+
                     $bk =Db::name("order_bk")->where(['cgdNo'=>$cgdinfo['cgdNo']])->lock(true)->find();
                     if($bk==false){
                         $bk=[
@@ -976,7 +976,6 @@ class Purchin extends Base
                         Db::rollback();
                         return error_show(1004,"采购单数量更新失败");
                     }
-                    $order = ["order_code"=>$cgdinfo['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
                     ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
                     $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
                     ProcessOrder::AddProcess($this->post['token'],$process);

app/admin/controller/Reorder.php

@@ -78,8 +78,8 @@ class Reorder extends Base
             $create = Db::name("sale_return")->insert($in,true);
             if($create>0){
                 $stn = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$stn,"QRTHD",0,$stn);
-                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'QRTHD'];
+                ActionLog::logAdd($this->post['token'],$stn,"XSTHD",$in['status'],$in);
+                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>$in['status'],"order_type"=>'XSTHD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 if($returnadr!=""){
                     $inf=[];
@@ -91,7 +91,7 @@ class Reorder extends Base
                             return error_show(1005,"地址信息未找到");
                         }
                         $send =Db::name('order_out')->where([["addrid","=",$val['id']],["status",">=",2]])->find();
-                        if($send!=false && $send['send_num']<$val['return_num']){
+                        if($send!=false){
                             Db::rollback();
                             return error_show(1005,"地址已发货");
                         }
@@ -113,7 +113,7 @@ class Reorder extends Base
                                     Db::rollback();
                                     return error_show(1004, "地址发货单数据未找到");
                                 }
-                                if ($send!=false) {
+//                                if ($send!=false) {
                                     if ($out['status'] >= 2) {
                                         Db::rollback();
                                         return error_show(1004, "地址发货单已发货");
@@ -123,7 +123,6 @@ class Reorder extends Base
                                         return error_show(1004, "地址发货单发货数量不足");
                                     }
                                     $out['send_num'] -= $val['return_num'];
-                                    $out['is_del'] = $out['send_num'] <= 0 ? 1 : 0;
                                     $out['updatetime'] = date("Y-m-d H:i:s");
                                     $outup = Db::name("order_out")->save($out);
                                     if ($outup == false) {
@@ -144,7 +143,7 @@ class Reorder extends Base
                                         return error_show(1004, "发货单更新失败");
                                     }
 
-                                }
+//                                }
                         }
                         $temp['returnCode']=$returnCode;
                         $temp['orderCode']=$ordeCode;
@@ -165,19 +164,16 @@ class Reorder extends Base
                 }
 
                 if($order['is_stock']==1){
-                    if ($is_addr == 0) {
+
                         if ($order['wsend_num'] < $order['num']) {
                             Db::rollback();
                             return error_show(1004, "销售单未发货数量不足退货");
                         }
-                        $order['wsend_num'] -= $thnum;
-                        $order['send_num'] += $thnum;
-                    } else {
-                        if ($order['send_num'] < $thnum) {
-                            Db::rollback();
-                            return error_show(1004, "销售单已发货数量不足退货");
-                        }
-                    }
+                        $lor=$order['status'] ;
+                    $order['wsend_num'] -= $thnum;
+                    $order['send_num'] += $thnum;
+                    $order['status'] = $order['wsend_num']==0?2:($order['send_num']==0?0:1);
+                    $order['send_status'] =$order['wsend_num']==0?3:($order['send_num']==0?1:2);
                     $order['th_num'] += $thnum;
                     $order['th_fee'] += round($thnum * $order['sale_price'], 2);
                     $order['updatetime'] = date("Y-m-d H:i:s");
@@ -186,6 +182,20 @@ class Reorder extends Base
                         Db::rollback();
                         return error_show(1005, '销售单订单更新失败');
                     }
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $order["orderCode"],//出库单号
+                        "status" => $lor,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "status"//新建create，编辑edit，更改状态status
+                    ], "XSQRD", $order['status'], $order);
+
+                    ProcessOrder::AddProcess($this->post['token'], [
+                        "order_type" => 'XSQRD',
+                        "order_code" =>$order["orderCode"],//出库单号
+                        "order_id" => $order["id"],
+                        "order_status" =>$order['status']
+                    ]);
+
                     $ordernum = Db::name("order_num")->where(['orderCode' => $ordeCode])->find();
                     if ($ordernum == false) {
                         Db::rollback();
@@ -249,12 +259,14 @@ class Reorder extends Base
                         ];
                     }
                     $stock['usable_stock'] += $thnum;
+                    $stock['wait_out_stock'] -= $thnum;
                     $stock['updatetime'] = date("Y-m-d H:i:s");
                     $st_up = Db::name("good_stock")->save($stock);
                     if ($st_up == false) {
                         return error_show(1005, '可售商品入库失败');
                     }
-                    $good_data = ['good_log_code' => $returnCode, "stock_id" => isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $thnum, "stock_name" => "usable_stock"];
+                    $good_data[]= ['good_log_code' => $returnCode, "stock_id" => isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $thnum, "stock_name" => "usable_stock"];
+                    $good_data[]= ['good_log_code' => $returnCode, "stock_id" => isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID(), "type" => 2, 'stock' => $thnum, "stock_name" => "wait_out_stock"];
                     GoodLog::LogAdd($this->post['token'], $good_data, 'XSTHD');
                 }
 
@@ -475,8 +487,8 @@ class Reorder extends Base
         $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,$info['order_type'] == 2?"ZXTHD":"QRTHD",0,$ste);
-            $process=["order_code"=>$code,"order_id"=>$info['id'],"order_status"=>0,"order_type"=>$info['order_type'] == 2?"ZXTHD":"QRTHD"];
+            ActionLog::logAdd($this->post['token'],$ste,"XSTHD",0,$ste);
+            $process=["order_code"=>$code,"order_id"=>$info['id'],"order_status"=>0,"order_type"=>"XSTHD"];
             ProcessOrder::workdel($process);
             return app_show(0,"删除成功");
         }else{
@@ -559,10 +571,10 @@ class Reorder extends Base
             $info["updatetime"]=date("Y-m-d H:i:s");
             $up = Db::name("sale_return")->save($info);
             if($up) {
-                $process = ["order_code" => $code, "order_id" => $info['id'], "order_status" => $status, "order_type" => $info['order_type'] == 2 ? "ZXTHD" : "QRTHD"];
+                $process = ["order_code" => $code, "order_id" => $info['id'], "order_status" => $status,  "XSTHD"];
                 ProcessOrder::AddProcess($this->post['token'], $process);
                 $ste = ["order_code" => $code, "status" => $temp, "action_remark" => '', "action_type" => "status"];
-                ActionLog::logAdd($this->post['token'], $ste, $info['order_type'] == 2 ? "ZXTHD" : "QRTHD", $status, $info);
+                ActionLog::logAdd($this->post['token'], $ste,  "XSTHD", $status, $info);
                 if ($status == 4) {
                     if ($info['is_addr'] == 1) {
                         if (isset($addr) && !empty($addr)) {
@@ -625,19 +637,16 @@ class Reorder extends Base
                             }
                         }
                     }
-                    if ($info['is_addr'] == 0) {
+
                         if ($orderinfo['wsend_num'] < $info['num']) {
                             Db::rollback();
                             return error_show(1004, "销售单未发货数量不足退货");
                         }
+                        $lor=$orderinfo['status'];
                         $orderinfo['wsend_num'] -= $info['num'];
                         $orderinfo['send_num'] += $info['num'];
-                    } else {
-                        if ($orderinfo['send_num'] < $info['num']) {
-                            Db::rollback();
-                            return error_show(1004, "销售单已发货数量不足退货");
-                        }
-                    }
+                        $orderinfo['status'] = $orderinfo['wsend_num']==0?2:($orderinfo['send_num']==0?0:1);
+                        $orderinfo['send_status'] =$orderinfo['wsend_num']==0?3:($orderinfo['send_num']==0?1:2);
                     if ($orderinfo['is_stock'] == 1) {
                         $orderinfo['th_num'] += $info['num'];
                         $orderinfo['th_fee'] += round($info['num'] * $orderinfo['sale_price'], 2);
@@ -754,12 +763,27 @@ class Reorder extends Base
                             }
                         }
                     }
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $orderinfo["orderCode"],//出库单号
+                        "status" => $lor,//这里的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"],//出库单号
+                        "order_id" => $orderinfo["id"],
+                        "order_status" =>$orderinfo['status']
+                    ]);
 
                     $wsmcode = $orderinfo['is_stock'] == 1 ? $cgd['wsm_code'] : $info['return_wsm'];
                     if ($wsmcode == "") {
                         Db::rollback();
                         return error_show(1005, '未找到退货仓库');
                     }
+                    //::todo 非库存品订单退货 采购单退货 虚拟仓如何减库存
+
                     $stock = Db::name("good_stock")->where(["spuCode" => $info['good_code'], 'wsm_code' => $wsmcode])->find();
                     if (empty($stock)) {
                         $stock = [
@@ -779,9 +803,7 @@ class Reorder extends Base
                     if ($st_up == false) {
                         return error_show(1005, '可售商品入库失败');
                     }
-                    $good_data = ['good_log_code' => $info['returnCode'], "stock_id" => isset($stock['id']) ?
-                        $stock['id'] : Db::name
-                        ("good_stock")->getLastInsID(), "type" => 1, 'stock' => $info['num'], "stock_name" => "usable_stock"];
+                    $good_data = ['good_log_code' => $info['returnCode'], "stock_id" => isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $info['num'], "stock_name" => "usable_stock"];
                     GoodLog::LogAdd($this->post['token'], $good_data, 'QRTHD');
                 }
             }
@@ -851,11 +873,11 @@ class Reorder extends Base
             ];
             $create = Db::name("sale_return")->insert($in,true);
             if($create>0) {
-                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'ZXTHD'];
+                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'XSTHD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 $ste = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',
                     "action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$ste,"ZXTHD",3,$in);
+                ActionLog::logAdd($this->post['token'],$ste,"XSTHD",3,$in);
                 if ($order['send_type'] == 1) {
                     $wsend = Db::name("order_out")->where(['orderCode' => $ordeCode, "status" => 1, "order_type"
                     =>2])->select();

app/admin/controller/Resign.php

@@ -180,10 +180,10 @@ class Resign extends Base
         ];
         $in = Db::name("purchease")->insert($info,true);
         if($in>0){
-            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>0];
+            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>1];
             ProcessOrder::AddProcess($token,$order);
             $ste = ["order_code"=>$bk_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($token,$ste,"BHD",0,$info);
+            ActionLog::logAdd($token,$ste,"BHD",1,$info);
           return app_show(0,"新建成功",['bk_code'=>$bk_code]);
         }else{
           return error_show(1005,"新建失败");
@@ -226,10 +226,10 @@ class Resign extends Base
         unset($info['id']);
         $in = Db::name("purchease")->insert($info,true);
         if($in>0){
-            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>0];
+            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>1];
             ProcessOrder::AddProcess($this->post['token'],$order);
             $ste = ["order_code"=>$bk_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$ste,"BHD",0,$info);
+            ActionLog::logAdd($this->post['token'],$ste,"BHD",1,$info);
             return app_show(0,"新建成功",['bk_code'=>$bk_code]);
         }else{
             return error_show(1005,"新建失败");
@@ -341,7 +341,7 @@ class Resign extends Base
             $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'],"order_status"=>$info['status']];
             ProcessOrder::AddProcess($this->post['token'],$order);
             $ste = ["order_code"=>$info['bk_code'],"status"=>$info['status'],"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$ste,"BHD",0,$up);
+            ActionLog::logAdd($this->post['token'],$ste,"BHD",$info['status'],$up);
             return app_show(0,"更新成功",['bk_code'=>$info['bk_code']]);
         }else{
             return error_show(1005,"更新失败");
@@ -364,7 +364,7 @@ class Resign extends Base
             $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'],"order_status"=>$info['status']];
             ProcessOrder::workdel($order);
             $ste = ["order_code"=>$info['bk_code'],"status"=>$info['status'],"action_remark"=>'',"action_type"=>"delete"];
-            ActionLog::logAdd($this->post['token'],$ste,"BHD",0,$info);
+            ActionLog::logAdd($this->post['token'],$ste,"BHD",$info['status'],$info);
         }
         return $up ? app_show(0,"删除成功"):error_show(1005,"删除失败");
     }
@@ -812,21 +812,6 @@ class Resign extends Base
         try{
             $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']
-                ]);
                     $good = Db::name("good_stock")->where(["wsm_code" =>$wsm_code, "spuCode" => $info['spuCode'], "is_del" => 0])->find();
                     if ($good == false) {
                         $good = [
@@ -851,7 +836,7 @@ class Resign extends Base
                     if ($upd) {
                    // 商品变动日志表，good_log_code字段存储采购单号
                         GoodLog::LogAdd($this->post['token'], $good_data, 'CGD');
-                        ActionLog::logAdd($this->post['token'], $order, "CGD", 1, $good);
+                        ActionLog::logAdd($this->post['token'], $order, "CGD", 0, $good);
                         $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;

app/admin/controller/Resigninfo.php

@@ -8,21 +8,12 @@ use think\facade\Db;
 use app\admin\model\ActionLog;
 
 //交接
-class Resigninfo extends BaseController
+class Resigninfo extends Base
 {
-    public $post="";
+
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
-        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0) {
-            return error_show($effetc['code'], $effetc['message']);
-        }
     }
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";
@@ -118,8 +109,8 @@ class Resigninfo extends BaseController
             "updatetime"=>date("Y-m-d H:i:s"),
         ];
         $in = Db::name('resign_info')->insert($data);
-        $stn = ["order_code"=>"BH","status"=>$status,"action_remark"=>'',"action_type"=>"create"];
-        ActionLog::logAdd($this->post['token'],$stn,"离职交接",$status,$stn);
+        $stn = ["order_code"=>Db::name('resign_info')->getLastInsID(),"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd($this->post['token'],$stn,"LZJJ",$status,$stn);
         return $in ? error_show(0,"添加成功") : error_show(1002,"添加失败");
     }
     public function selec(){
@@ -177,8 +168,8 @@ class Resigninfo extends BaseController
       ];
       $it = Db::name('resign_info')->where(['is_del'=>0,'id'=>$id])->save($str);
       if($it){
-          $stn = ["order_code"=>"BH","status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-          ActionLog::logAdd($this->post['token'],$stn,"resign_info",0,$stn);
+          $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+          ActionLog::logAdd($this->post['token'],$stn,"LZJJ",0,$stn);
           return error_show(0,"编辑成功");
       }else{
           return error_show(1002,"编辑失败");
@@ -193,7 +184,7 @@ 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"=>"BH","status"=>0,"action_remark"=>'',"action_type"=>"delete"];
-            ActionLog::logAdd($this->post['token'],$stn,"resign_info",0,$stn);
+            ActionLog::logAdd($this->post['token'],$stn,"LZJJ",0,$stn);
             return error_show(0,"删除成功");
         }else{
             return error_show(1002,"删除失败");
@@ -220,7 +211,7 @@ class Resigninfo extends BaseController
         $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,$st);
+            ActionLog::logAdd($this->post['token'],$stn,"LZJJ",$stauts,$st);
             return error_show(0,"状态更新成功");
         }else{
             return error_show(1002,"状态更新失败");

app/admin/controller/Sale.php

@@ -226,6 +226,21 @@ class Sale extends Base
            $paytime==""?"": $data['paytime'] = $paytime;
             $datainfo = Db::name('sale')->insert($data,true);
             if($datainfo>0){
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $orderCode,//销售单code
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "XSQRD", 0, $this->post);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'XSQRD',
+                    "order_code" => $orderCode,//销售单code
+                    "order_id" => $datainfo,
+                    "order_status" =>0
+                ]);
+
                 if($is_activity==1){
                     $actup =[
                         "activity_stock"=> $act['activity_stock'] - $good_num,
@@ -262,8 +277,8 @@ class Sale extends Base
                             return error_show(1002,"库存商品更新库存失败");
                         }
                         //商品变动日志表，good_log_code字段存储采购单号
-                        $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $datainfo, "type" => 2,'stock'=>$good_num, "stock_name" => "usable_stock"];
-                        $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $datainfo, "type" => 1,'stock'=>$good_num, "stock_name" => "wait_out_stock"];
+                        $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $stock['id'], "type" => 2,'stock'=>$good_num, "stock_name" => "usable_stock"];
+                        $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $stock['id'], "type" => 1,'stock'=>$good_num, "stock_name" => "wait_out_stock"];
                         GoodLog::LogAdd($this->post['token'],$good_data,"XSQRD");
                     }
 
@@ -354,16 +369,16 @@ class Sale extends Base
                                         //修改状态，添加待办
                                         ActionLog::logAdd($this->post['token'], [
                                             "order_code" => $outCode,//出库单号
-                                            "status" => 0,//这里的status是之前的值
+                                            "status" =>$out['status'],//这里的status是之前的值
                                             "action_remark" => '',//备注
                                             "action_type" => "create"//新建create，编辑edit，更改状态status
-                                        ], "CKD", 0, $out);
+                                        ], "CKD", $out['status'], $out);
 
                                         ProcessOrder::AddProcess($this->post['token'], [
                                             "order_type" => 'CKD',
                                             "order_code" => $outCode,//出库单号
-                                            "order_id" => 0,
-                                            "order_status" => 0
+                                            "order_id" => Db::name("order_out")->getLastInsID(),
+                                            "order_status" => $out['status']
                                         ]);
                                     }
                              //   }
@@ -493,8 +508,7 @@ class Sale extends Base
             if($re==false){
                 return false;
             }else{
-                $stokc =Db::name("good_stock")->where(['spuCode'=>$data['spuCode'],"wsm_code"=>$wsm_code,
-                    "is_del"=>0])->find();
+                $stokc =Db::name("good_stock")->where(['spuCode'=>$data['spuCode'],"wsm_code"=>$wsm_code, "is_del"=>0])->find();
                 if($stokc==false){
                     $stokc=[
                         "spuCode"=>$data['spuCode'],
@@ -508,12 +522,17 @@ class Sale extends Base
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
-                    $stoc= Db::name("good_stock")->save($stokc);
-                    if($stoc==false){
-                        return false;
-                    }
+                }else{
+                    $stokc['wait_in_stock']+=$data['good_num'];
+                    $stokc['updatetime']=date("Y-m-d H:i:s");
                 }
-
+                $stoc= Db::name("good_stock")->save($stokc);
+                if($stoc==false){
+                    return false;
+                }
+                $good_data[] = ['good_log_code' =>$cgdCode, "stock_id" => isset($stoc['id'])?$stoc['id']:Db::name("good_stock")->getLastInsID(), "type" => 1,
+                'stock'=>$data['good_num'], "stock_name" => "wait_in_stock"];
+                GoodLog::LogAdd($this->post['token'],$good_data,"CGD");
                 return true;
             }
         }else{
@@ -849,6 +868,20 @@ class Sale extends Base
             ];
             $datainfo = Db::name('sale')->insert($data, true);
             if($datainfo>0){
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" =>$orderCode,//销售单code
+                    "status" => 0,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "create"//新建create，编辑edit，更改状态status
+                ], "XSQRD", $data['status'], $data);
+
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'XSQRD',
+                    "order_code" => $orderCode,//销售单code
+                    "order_id" => $datainfo,
+                    "order_status" => $data['status']
+                ]);
                     $old_zx_status = $zx['status'];
                     $zx['status']=5;
                     $zx['updatetime']=date("Y-m-d H:i:s");
@@ -865,12 +898,6 @@ class Sale extends Base
                             "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){
@@ -988,7 +1015,7 @@ class Sale extends Base
                                     ProcessOrder::AddProcess($this->post['token'], [
                                         "order_type" => 'CKD',
                                         "order_code" => $outCode,//出库单号
-                                        "order_id" => 0,
+                                        "order_id" => Db::name("order_out")->getLastInsID(),
                                         "order_status" => 0
                                     ]);
                                 }
@@ -1140,7 +1167,7 @@ class Sale extends Base
                         return error_show(1002, "咨询订单生成失败");
                     }
                 }
-
+                $old_fk_status= $feedback['status'];
                 $feedback['status']=2;
                 $feedback['updatetime']=date("Y-m-d H:i:s");
                 $fed =Db::name("project_feedback")->save($feedback);
@@ -1148,6 +1175,12 @@ class Sale extends Base
                     Db::rollback();
                     return error_show(1002, "项目订单生成失败");
                 }
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $feedback['id'],//编码
+                    "status" => $old_fk_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "FKD", 2, $feedback);
             }
             $old_plan_status = $plan['status'];
             $plan['status']=2;
@@ -1163,7 +1196,7 @@ class Sale extends Base
                     "status" => $old_plan_status,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "edit"//新建create，编辑edit，更改状态status
-                ], "PRO", 2, $plan);
+                ], "PRP", 2, $plan);
             }
             $old_project_status = $project["status"];
             $project["status"]=6;
@@ -1278,16 +1311,39 @@ class Sale extends Base
         ];
         $datainfo = Db::name('sale')->insert($datas, true);
         if($datainfo>0){
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" =>$orderCode,//项目编码
+                "status" => 0,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "status"//新建create，编辑edit，更改状态status
+            ], "XSQRD", 0, $datas);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'XSQRD',
+                "order_code" => $orderCode,
+                "order_id" => $datainfo,
+                "order_status" => 0
+            ]);
             $bol = $this->createCgd($cgd);
             if ($bol == false) {
                 return false;
             }
+            $bidstatus=$goodinfo['status'];
             $goodinfo['status']=6;
             $goodinfo['updatetime']=date("Y-m-d H:i:s");
             $sa=Db::name("consult_bids")->save($goodinfo);
             if($sa==false){
               return false;
             }
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" =>$goodinfo['bidNo'],//项目编码
+                "status" => $bidstatus,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "status"//新建create，编辑edit，更改状态status
+            ], "FKD", 6, $datas);
+
             $zxorder =Db::name("consult_order")->where(["zxNo"=>$goodinfo["zxNo"],"is_del"=>0])->find();
             if($zxorder==false){
                 return false;
@@ -1389,6 +1445,20 @@ class Sale extends Base
                         if ($ou == false) {
                             return false;
                         }
+                        //修改状态，添加待办
+                        ActionLog::logAdd($this->post['token'], [
+                            "order_code" =>$outCode,//项目编码
+                            "status" => 0,//这里的status是之前的值
+                            "action_remark" => '',//备注
+                            "action_type" => "status"//新建create，编辑edit，更改状态status
+                        ], "CKD", 0, $out);
+
+                        ProcessOrder::AddProcess($this->post['token'], [
+                            "order_type" => 'CKD',
+                            "order_code" => $outCode,
+                            "order_id" => Db::name("order_out")->getLastInsID(),
+                            "order_status" => 0
+                        ]);
                         $order['send_num'] += $value['receipt_quantity'];
                         $order['wsend_num'] -= $value['receipt_quantity'];
                         if ($order['wsend_num'] < 0) {
@@ -1489,6 +1559,20 @@ class Sale extends Base
         ];
         $datainfo = Db::name('sale')->insert($datas, true);
         if($datainfo>0) {
+            //修改状态，添加待办
+            ActionLog::logAdd($this->post['token'], [
+                "order_code" =>$orderCode,//项目编码
+                "status" => 0,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "status"//新建create，编辑edit，更改状态status
+            ], "XSQRD", 0, $datas);
+
+            ProcessOrder::AddProcess($this->post['token'], [
+                "order_type" => 'XSQRD',
+                "order_code" => $orderCode,
+                "order_id" => $datainfo,
+                "order_status" => 0
+            ]);
             $cgd=[
                 "supplierNo"=>$good['supplierNo'],
                 "companyNo"=>$data['companyNo'],
@@ -1541,8 +1625,8 @@ class Sale extends Base
                         return 2; //库存更新失败
                     }
                     //商品变动日志表，good_log_code字段存储采购单号
-                    $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $datainfo, "type" => 2,'stock'=>$data['good_num'], "stock_name" => "usable_stock"];
-                    $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $datainfo, "type" => 1,'stock'=>$data['good_num'], "stock_name" => "wait_out_stock"];
+                    $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $stock['id'], "type" => 2,'stock'=>$data['good_num'], "stock_name" => "usable_stock"];
+                    $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $stock['id'], "type" => 1,'stock'=>$data['good_num'], "stock_name" => "wait_out_stock"];
                     GoodLog::LogAdd($this->post['token'],$good_data,"XSQRD");
                 }
 
@@ -1640,7 +1724,7 @@ class Sale extends Base
                                     ProcessOrder::AddProcess($this->post['token'], [
                                         "order_type" => 'CKD',
                                         "order_code" => $outCode,//出库单号
-                                        "order_id" => 0,
+                                        "order_id" =>Db::name("order_out")->getLastInsID(),
                                         "order_status" => 0
                                     ]);
                                 }
@@ -2056,7 +2140,7 @@ class Sale extends Base
             return error_show(1002, "删除失败");
         }
     }
-
+    //废弃接口
     public function status()
     {
         $token = isset($this->post['token']) && $this->post['token'] !== "" ? trim($this->post['token']) : "";
@@ -2310,10 +2394,9 @@ class Sale extends Base
             ];
             $datainfo = Db::name('sale')->where(['id' => $id, 'is_del' => 0])->save($data);
             if ($datainfo) {
-                $stx = ["order_code"=> $etid['orderCode'],"status"=>$etid['status'],"action_remark"=>'',
-                    "action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$stx,$etid['order_type'] == 2?"ZXQRD":"XSQRD",2,$data);
-                $order=["order_type"=>$etid['order_type'] == 2?"ZXQRD":"XSQRD","order_code"=>$etid['orderCode'],"order_id"=>$id,"order_status"=>$data['status']];
+                $stx = ["order_code"=> $etid['orderCode'],"status"=>$etid['status'],"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$stx,"XSQRD",2,$data);
+                $order=["order_type"=>"XSQRD","order_code"=>$etid['orderCode'],"order_id"=>$id,"order_status"=>$data['status']];
                 ProcessOrder::AddProcess($this->post['token'],$order);
                 foreach ($vr as $value) {
                     $tm = [];
@@ -2337,7 +2420,7 @@ class Sale extends Base
             return error_show(1005, $e->getMessage());
         }
     }
-
+    // 废弃
     public function out()
     {
         $token = isset($this->post['token']) && $this->post['token'] !== "" ? trim($this->post['token']) : "";
@@ -2438,8 +2521,8 @@ class Sale extends Base
                     }
                     $stx = ["order_code"=>$orderCode,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
 
-                    ActionLog::logAdd($this->post['token'],$stx,$der['order_type'] == 2?"ZXQRD":"XSQRD",$der['status'],$der);
-                    $order=["order_type"=>$der['order_type'] == 2?"ZXQRD":"XSQRD","order_code"=>$orderCode,"order_id"=>$der['id'],"order_status"=>$data['status']];
+                    ActionLog::logAdd($this->post['token'],$stx,"XSQRD",$der['status'],$der);
+                    $order=["order_type"=>"XSQRD","order_code"=>$orderCode,"order_id"=>$der['id'],"order_status"=>$data['status']];
 
                     ProcessOrder::AddProcess($this->post['token'],$order);
                 }
@@ -2455,7 +2538,7 @@ class Sale extends Base
             return error_show(1005, $e->getMessage());
         }
     }
-
+       // 废弃
     public function customer()
     {
         $outCode = isset($this->post['outCode']) && $this->post['outCode'] !== "" ? trim($this->post['outCode']) : "";
@@ -2486,9 +2569,8 @@ class Sale extends Base
             $cust = Db::name('order_out')->save($codeinfo);
             if ($cust) {
                 $stx = ["order_code"=>$outCode,"status"=>$time,"action_remark"=>'',"action_type"=>"status"];
-                ActionLog::logAdd($this->post['token'],$stx,$codeinfo['order_type'] == 2?"ZXCKD":"CKD",$codeinfo['status'],$codeinfo);
-                $order=["order_type"=>$codeinfo['order_type'] == 2?"ZXCKD":"CKD","order_code"=>$outCode,
-                    "order_id"=>$codeinfo['id'],"order_status"=>$codeinfo['status']];
+                ActionLog::logAdd($this->post['token'],$stx,"CKD",$codeinfo['status'],$codeinfo);
+                $order=["order_type"=>"CKD","order_code"=>$outCode,"order_id"=>$codeinfo['id'],"order_status"=>$codeinfo['status']];
                 ProcessOrder::AddProcess($this->post['token'],$order);
                 if ($status == 1) {
 
@@ -2666,8 +2748,8 @@ class Sale extends Base
         $up = Db::name("sale_diff")->save($info);
         if ($up) {
             $stx = ["order_code"=>$info["orderCode"],"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$stx,"QRGCD",$info['status'],$info);
-            $order=["order_type"=>"QRGCD","order_code"=>$info["orderCode"],"order_id"=>$info['id'],"order_status"=>$info['status']];
+            ActionLog::logAdd($this->post['token'],$stx,"XSGCD",$info['status'],$info);
+            $order=["order_type"=>"XSGCD","order_code"=>$info["orderCode"],"order_id"=>$info['id'],"order_status"=>$info['status']];
             ProcessOrder::AddProcess($this->post['token'],$order);
             return app_show(0, "更新成功");
         } else {
@@ -2690,6 +2772,10 @@ class Sale extends Base
         }
         $info = Db::name("sale_diff")->where(["id" => $id])->find();
         if ($info==false) {
+            return error_show(1004, "工差单数据未找到");
+        }
+        $sale =Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
+        if($sale==false){
             return error_show(1004, "订单数据未找到");
         }
         $cgd = Db::name("purchease_diff")->where(['id'=>$info['cgd_diffid']])->find();
@@ -2709,11 +2795,21 @@ class Sale extends Base
             $up = Db::name("sale_diff")->where($info)->save($upda);
             if ($up) {
                 $stx = ["order_code"=>$info["orderCode"],"status"=>$ite,"action_remark"=>'',"action_type"=>"status"];
-                ActionLog::logAdd($this->post['token'],$stx,"QRGCD",$info['status'],$info);
-                $order=["order_type"=>"QRGCD","order_code"=>$info["orderCode"],"order_id"=>$info['id'],"order_status"=>$status];
+                ActionLog::logAdd($this->post['token'],$stx,"XSGCD",$status,$info);
+                $order=["order_type"=>"XSGCD","order_code"=>$info["orderCode"],"order_id"=>$info['id'],"order_status"=>$status];
                 ProcessOrder::AddProcess($this->post['token'],$order);
                 $cgdup =Db::name("purchease_diff")->where(["id"=>$info['cgd_diffid']])->save($upda);
                 if($cgdup){
+                    if($status==2){
+                        $sale['diff_weight'] = $info['diff_weight'];
+                        $sale['diff_fee'] = $info['diff_price'];
+                        $sale['updatetime'] = date("Y-m-d H:i:s");
+                        $sal=Db::name("sale")->save($sale);
+                        if($sal==false){
+                            Db::rollback();
+                            return error_show(1003, "订单更新工差失败");
+                        }
+                    }
                     Db::commit();
                     return app_show(0, "更新成功");
                 }
@@ -3054,6 +3150,10 @@ class Sale extends Base
                                 Db::rollback();
                                 return error_show(1004, '库存更新失败');
                             }
+                           // ::todo
+                            $good_data[] = ['good_log_code' =>$outCode, "stock_id" =>$temp['id'], "type" => 1,'stock'=>$send_num, "stock_name" => "wait_out_stock"];
+                            $good_data[] = ['good_log_code' =>$outCode, "stock_id" =>$temp['id'], "type" => 2,'stock'=>$send_num, "stock_name" => "usable_stock"];
+                            GoodLog::LogAdd($this->post['token'],$good_data,"CKD");
                         }
 
                     $datainfo = Db::name('order_out')->insert($data,true);
@@ -3126,8 +3226,21 @@ 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']
+                ]);
+                    $orderstatus= $einfo['status'];
                     $einfo['send_num']+=$outinfo['send_num'];
                     $einfo['wsend_num']-=$outinfo['send_num'];
                     $einfo['status']=$einfo['wsend_num']==0?2:($einfo['send_num']==0?0:1);
@@ -3141,17 +3254,17 @@ class Sale extends Base
 //                }
                 //修改状态，添加待办
                 ActionLog::logAdd($this->post['token'], [
-                    "order_code" => $outinfo['outCode'],//出库单号
-                    "status" => $old_outinfo_status,//这里的status是之前的值
+                    "order_code" => $einfo['orderCode'],//出库单号
+                    "status" => $orderstatus,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "edit"//新建create，编辑edit，更改状态status
-                ], "CKD", $outinfo['status'], $outinfo);
+                ], "XSQRD", $einfo['status'], $einfo);
 
                 ProcessOrder::AddProcess($this->post['token'], [
-                    "order_type" => 'CKD',
-                    "order_code" => $outinfo['outCode'],//出库单号
-                    "order_id" => $outinfo['id'],
-                    "order_status" => $outinfo['status']
+                    "order_type" => 'XSQRD',
+                    "order_code" =>$einfo['orderCode'],//出库单号
+                    "order_id" => $einfo['id'],
+                    "order_status" => $einfo['status']
                 ]);
 
                 $stokc =Db::name("good_stock")->where(['spuCode'=>$einfo['good_code'],"wsm_code"=>$outinfo['wsm_code'],"is_del"=>0])->find();
@@ -3164,6 +3277,7 @@ class Sale extends Base
                         return error_show(1002, "超出库存数量");
                     }
                     $stokc['wait_out_stock']-=$outinfo['send_num'];
+                    $stokc['total_stock']= $stokc['wait_out_stock']+ $stokc['usable_stock'];
                   //  $stokc['intra_stock']+=$outinfo['send_num'];
                     $stokc['updatetime']=date("Y-m-d H:i:s");
                 }
@@ -3172,6 +3286,8 @@ class Sale extends Base
                     Db::rollback();
                     return error_show(1002, "库存更新失败");
                 }
+                $good_data[] = ['good_log_code' =>$outCode, "stock_id" =>$temp['id'], "type" => 2,'stock'=>$outinfo['send_num'],"stock_name" => "wait_out_stock"];
+                GoodLog::LogAdd($this->post['token'],$good_data,"CKD");
                 Db::commit();
                 return app_show(0,"发货成功");
             }else{