Merge branch 'plm' of wugg/stock into master

app/admin/controller/Reorder.php

@@ -530,8 +530,7 @@ class Reorder extends \app\BaseController
                            if($up){
                                $process=["order_code"=> $value['outCode'],"order_id"=>$value['id'],"order_status"=>0,"order_type"=>'CKD'];
                                ProcessOrder::AddProcess($this->post['token'],$process);
-                               $ste = ["order_code"=>$value['outCode'],"status"=>$tt,"action_remark"=>'',
-                                   "action_type"=>"status"];
+                               $ste = ["order_code"=>$value['outCode'],"status"=>$tt,"action_remark"=>'',"action_type"=>"status"];
                                ActionLog::logAdd($this->post['token'],$ste,"CKD",0,$value);
                            }else{
                                Db::rollback();

app/admin/controller/Resign.php

@@ -5,6 +5,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ActionLog;
 use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\facade\Db;
@@ -160,6 +161,8 @@ class Resign extends BaseController
         if($in>0){
             $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>0];
             ProcessOrder::AddProcess($token,$order);
+            $ste = ["order_code"=>$bk_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+            ActionLog::logAdd($token,$ste,"BHD",0,$info);
           return app_show(0,"新建成功",['bk_code'=>$bk_code]);
         }else{
           return error_show(1005,"新建失败");
@@ -197,7 +200,9 @@ class Resign extends BaseController
         $in = Db::name("purchease")->insert($info,true);
         if($in>0){
             $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>0];
-            ProcessOrder::AddProcess($this->post['token']  ,$order);
+            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);
             return app_show(0,"新建成功",['bk_code'=>$bk_code]);
         }else{
             return error_show(1005,"新建失败");
@@ -319,6 +324,8 @@ class Resign extends BaseController
         if($in){
             $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);
             return app_show(0,"更新成功",['bk_code'=>$info['bk_code']]);
         }else{
             return error_show(1005,"更新失败");
@@ -337,6 +344,12 @@ class Resign extends BaseController
         $info['is_del']=1;
         $info['updatetime']=date("Y-m-d H:i:s");
         $up = Db::name("purchease")->update($info);
+        if($up){
+            $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);
+        }
         return $up ? app_show(0,"删除成功"):error_show(1005,"删除失败");
     }
 
@@ -353,12 +366,15 @@ class Resign extends BaseController
         if($status===""){
             return error_show(1001,'status不能为空');
         }
+        $temp = $info['status'];
         $info['status']= $status;
         $info['updatetime']=date("Y-m-d H:i:s");
         $up = Db::name("purchease")->update($info);
         if($up){
             $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'],"order_status"=>$status];
             ProcessOrder::AddProcess($this->post['token'],$order);
+            $ste = ["order_code"=>$info['bk_code'],"status"=> $temp,"action_remark"=>'',"action_type"=>"status"];
+            ActionLog::logAdd($this->post['token'],$ste,"BHD",$status,$info);
             return app_show(0,"更新成功",['bk_code'=>$info['bk_code']]);
         }else{
             return error_show(1005,"更新失败");
@@ -453,14 +469,21 @@ class Resign extends BaseController
         ];
         Db::startTrans();
         try{
-            $in = Db::name('purchease_feedback')->insert($data);
-            if($in){
+            $in = Db::name('purchease_feedback')->insert($data,true);
+            if($in>0){
+                $order=["order_type"=>'FKD',"order_code"=>$info['bk_code'],"order_id"=>$in, "order_status"=>0];
+                ProcessOrder::AddProcess($this->post['token'],$order);
+                $ste = ["order_code"=>$info['bk_code'],"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$ste,"FKD",0,$data);
+                $temp=$info['status'];
                 $info['status']=2;
                 $info['addtime']=date("Y-m-d H:i:s");
                 $ood=Db::name('purchease')->save($info,true);
                 if($ood>0){
-                    $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info,"order_status"=>$info['status']];
+                    $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"=>$temp,"action_remark"=>'',"action_type"=>"status"];
+                    ActionLog::logAdd($this->post['token'],$ste,"BHD",$info['status'],$info);
                     Db::commit();
                     return app_show(0,"新建成功");
                 }
@@ -490,6 +513,12 @@ class Resign extends BaseController
         $feed['is_del']= 1;
         $feed['updatetime']=date("Y-m-d H:i:s");
         $up = Db::name("purchease_feedback")->update($feed);
+        if($up){
+            $order=["order_type"=>'FKD',"order_code"=>$feed['bk_code'],"order_id"=>$feed['id'], "order_status"=>0];
+            ProcessOrder::workdel($order);
+            $ste = ["order_code"=>$feed['bk_code'],"status"=>$feed['status'],"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$ste,"FKD",$feed['status'],$feed);
+        }
         return $up ? app_show(0,"删除成功"):error_show(1005,"删除失败");
     }
 
@@ -537,6 +566,7 @@ class Resign extends BaseController
         $remark = isset($this->post['remark'])&& $this->post['remark']!=='' ? trim($this->post['remark']) : "";
         Db::startTrans();
         try{
+            $tem =$feed['status'];
             $feed['remark']= $remark;
             $feed['status']= $status;
             $feed['updatetime']=date("Y-m-d H:i:s");
@@ -544,6 +574,8 @@ class Resign extends BaseController
             if($up){
                 $order=["order_type"=>'BHD',"order_code"=>$feed['bk_code'],"order_id"=>$feed['id'],"order_status"=>$feed['status']];
                 ProcessOrder::AddProcess($this->post['token'],$order);
+                $ste = ["order_code"=>$feed['bk_code'],"status"=>$tem,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$ste,"BHD",$feed['status'],$feed);
                 if($status==3){
                   //  $ware = Db::name("warehouse_addr")->where(["wsm_code"=>$feed['warehouse'],"is_del"=>0])->find();
                     $purse = Db::name("purchease_feedback")->where(['bkcode'=>$feed['bk_code'],"is_del"=>0])->find();
@@ -551,6 +583,7 @@ class Resign extends BaseController
                         Db::rollback();
                         return error_show(1001,'未找到备库反馈数据');
                     }
+                    $pe = $purse['status'];
                     $purse['status']=1;
                     $purse['addtime']=date("Y-m-d H:i:s");
                     $up = Db::name("purchease_feedback")->save($purse);
@@ -558,6 +591,10 @@ class Resign extends BaseController
                         Db::rollback();
                         return error_show(1001,'备库反馈数据状态修改失败');
                     }
+                    $order=["order_type"=>'FKD',"order_code"=>$feed['bk_code'],"order_id"=>$purse['id'],"order_status"=>$purse['status']];
+                    ProcessOrder::AddProcess($this->post['token'],$order);
+                    $ste = ["order_code"=>$feed['bk_code'],"status"=>$pe,"action_remark"=>'',"action_type"=>"status"];
+                    ActionLog::logAdd($this->post['token'],$ste,"FKD",$feed['status'],$purse);
                     $supplier = Db::name("supplier")->where(["code"=>$purse['supplier']])->find();
                     $inw = makeNo("CG");
                     $data=[
@@ -597,6 +634,8 @@ class Resign extends BaseController
                     if($in>0){
                         $order=["order_type"=>'CGD',"order_code"=>$data['cgdNo'],"order_id"=>$in,"order_status"=>$data['status']];
                         ProcessOrder::AddProcess($this->post['token'],$order);
+                        $ste = ["order_code"=>$inw,"status"=>$data['status'],"action_remark"=>'',"action_type"=>"create"];
+                        ActionLog::logAdd($this->post['token'],$ste,"CGD",$data['status'],$data);
                         Db::commit();
                         return app_show(0,"更新成功",['cgdNo'=>$inw]);
                     }
@@ -607,6 +646,7 @@ class Resign extends BaseController
                             Db::rollback();
                             return error_show(1001,'未找到备库反馈数据');
                         }
+                        $pe=$purse['status'];
                         $purse['status']=2;
                         $purse['addtime']=date("Y-m-d H:i:s");
                         $up = Db::name("purchease_feedback")->save($purse);
@@ -614,6 +654,10 @@ class Resign extends BaseController
                             Db::rollback();
                             return error_show(1001,'备库反馈数据状态修改失败');
                         }
+                        $order=["order_type"=>'FKD',"order_code"=>$feed['bk_code'],"order_id"=>$purse['id'],"order_status"=>$purse['status']];
+                        ProcessOrder::AddProcess($this->post['token'],$order);
+                        $ste = ["order_code"=>$feed['bk_code'],"status"=>$pe,"action_remark"=>'',"action_type"=>"status"];
+                        ActionLog::logAdd($this->post['token'],$ste,"FKD",$feed['status'],$purse);
                     }
                     Db::commit();
                     return app_show(0,"更新成功");

app/admin/controller/Sale.php

@@ -2,6 +2,8 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\GoodLog;
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -100,8 +102,10 @@ class Sale extends BaseController
             $vat = [];
             $inn = [];
             if ($datainfo > 0) {
-                $st = ["order_code"=>$orderCode,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$st,"xsd",1,$st);
+                $st = ["order_code"=>$orderCode,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$st,"XSQRD",$status,$data);
+                $order=["order_type"=>'XSQRD',"order_code"=>$orderCode,"order_id"=>$datainfo,"order_status"=>$status];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 foreach ($vi as $ion) {
                     $iten = [];
                     $iten['orderCode'] = $orderCode;
@@ -120,8 +124,6 @@ class Sale extends BaseController
 //            }
                 $vp = Db::name('sale_info')->insertAll($inn);
                 if ($vp == "") {
-                    $stn = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($this->post['token'],$stn,"xsd",0,$stn);
                     Db::rollback();
                     return error_show(1002, "添加失败");
                 }
@@ -152,8 +154,6 @@ class Sale extends BaseController
                 }
                 $vmp = Db::name('order_addr')->insertAll($vat);
                 if ($vmp) {
-                    $stp = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($this->post['token'],$stp,"xsd",0,$stp);
                     Db::commit();
                     return error_show(0, "销售订单创建成功");
                 }
@@ -319,8 +319,10 @@ class Sale extends BaseController
             ];
             $datninfo = Db::name('sale')->where(['id' => $id, 'is_del' => 0])->save($datn);
             if ($datninfo > 0) {
-                $stn = ["order_code"=>$good_code,"status"=>$etid['status'],"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$stn,"xsd",$etid['status'],$stn);
+                $stn = ["order_code"=>$etid['orderCode'],"status"=>$etid['status'],"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$stn,"XSQRD",$etid['status'],$datn);
+                $order=["order_type"=>'XSQRD',"order_code"=>$etid['orderCode'],"order_id"=>$id,"order_status"=>$etid['status']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 foreach ($vi as $ion) {
                     $iten = [];
                     isset($ion['id']) && $ion['id'] !== "" ? $iten['id'] = $ion['id'] : '';
@@ -499,8 +501,10 @@ class Sale extends BaseController
         }
         $str = Db::name('sale')->update(['id' => $id, 'is_del' => 1, 'updatetime' => date("Y-m-d H:i:s")]);
         if ($str) {
-            $stc = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
-            ActionLog::logAdd($this->post['token'],$stc,"xsd",0,$stc);
+            $stc = ["order_code"=>$id,"status"=>$ed['status'],"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$stc,"XSQRD",$ed['status'],['id' => $id, 'is_del' => 1, 'updatetime' => date("Y-m-d H:i:s")]);
+            $order=["order_type"=>'XSQRD',"order_code"=>$ed['orderCode'],"order_id"=>$id,"order_status"=>$ed['status']];
+            ProcessOrder::workdel($order);
             return error_show(0, "删除成功");
         } else {
             return error_show(1002, "删除失败");
@@ -559,9 +563,10 @@ class Sale extends BaseController
             $dio['updatetime'] = date("Y-m-d H:i:s");
             $st = Db::name('sale')->save($dio);
             if ($st) {
-
-                $stc = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$stc,"xsd",$dio['status'],$stc);
+                $stn = ["order_code"=>$dio['orderCode'],"status"=>$vmp,"action_remark"=>'',"action_type"=>"status"];
+                ActionLog::logAdd($this->post['token'],$stn, $dio['order_type'] == 2?"ZXQRD":"XSQRD",$dio['status'],$dio);
+                $order=["order_type"=>$dio['order_type'] == 2?"ZXQRD":"XSQRD","order_code"=>$dio['orderCode'],"order_id"=>$id,"order_status"=>$dio['status']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 if ($status == 3 && $dio['order_type'] == 1) {
                     $dn = Db::name('sale_info')->where(['orderCode' => $st['orderCode']])->select();
                     foreach ($dn as $value) {
@@ -744,8 +749,11 @@ class Sale extends BaseController
             ];
             $datainfo = Db::name('sale')->where(['id' => $id, 'is_del' => 0])->save($data);
             if ($datainfo) {
-                $stx = ["order_code"=> $id,"status"=>2,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$stx,"xsd",2,$stx);
+                $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']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 foreach ($vr as $value) {
                     $tm = [];
                     $tm['id'] = $value['id'];
@@ -754,8 +762,6 @@ class Sale extends BaseController
                     $tm['updatetime'] = date("Y-m-d H:i:s");
                     $dn = Db::name('order_addr')->save($tm);
                     if ($dn == false) {
-                        $stx = ["order_code"=>$value['id'],"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-                        ActionLog::logAdd($this->post['token'],$stx,"xsd",0,$stx);
                         Db::rollback();
                         return error_show(1002, "更新失败");
                     }
@@ -851,10 +857,12 @@ class Sale extends BaseController
                 "addtime" => date("Y-m-d H:i:s"),
                 "updatetime" => date("Y-m-d H:i:s")
             ];
-            $datainfo = Db::name('order_out')->insert($data);
-            if ($datainfo) {
-                $stx = ["order_code"=>$orderCode,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$stx,"xsd",$status,$stx);
+            $datainfo = Db::name('order_out')->insert($data,true);
+            if ($datainfo>0) {
+                $stx = ["order_code"=>$outCode,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$stx,"CKD",$status,$data);
+                $order=["order_type"=>"CKD","order_code"=>$outCode,"order_id"=>$datainfo,"order_status"=>$data['status']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 if ($status == 1) {
 
                     $var = Db::name('sale_info')->where(['orderCode' => $orderCode, 'wsm_code' => $wsm_code])->find();
@@ -864,7 +872,7 @@ class Sale extends BaseController
                     }
                   //  $send = Db::name("order_out")->where(["wsm_code" => $wsm_code, 'orderCode' => $orderCode])->sum
                     //("send_num");
-                   // $item =$der['status'];
+                    $item =$der['status'];
                     $der['send_num'] += $send_num;
                     $der['wsend_num'] -= $send_num;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
                     $der['send_status'] = $der['send_num'] == 0 ? 1 : $der['wsend_num'] == 0 ? 3 : 2;
@@ -875,6 +883,11 @@ class Sale extends BaseController
                         Db::rollback();
                         return error_show(1003, "更新失败");
                     }
+                    $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"=>$outCode,"order_id"=>$datainfo,"order_status"=>$data['status']];
+                    ProcessOrder::AddProcess($this->post['token'],$order);
                     $str = Db::name('good_stock')->where(['wsm_code' => $var['wsm_code'], 'good_type_code' => $der['good_code']])->find();
                     if ($str == false) {
                         Db::rollback();
@@ -892,6 +905,9 @@ class Sale extends BaseController
                         Db::rollback();
                         return error_show(1002, "状态更新失败");
                     }
+                    $good_data[]=  ["stock_id"=>$str['id'],"type"=>2,'stock'=>$send_num,"stock_name"=>"wait_out_stock"];
+                    $good_data[]=  ["stock_id"=>$str['id'],"type"=>1,'stock'=>$send_num,"stock_name"=>"intra_stock"];
+                    GoodLog::LogAdd($this->post['token'],$good_data,'CKD');
                 }
 
                 Db::commit();
@@ -935,6 +951,10 @@ class Sale extends BaseController
             $codeinfo['updatetime'] = date("Y-m-d H:i:s");
             $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,"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 == 2) {
                     $ct = Db::name('sale_info')->where(['orderCode' => $dr['orderCode'], 'wsm_code' => $codeinfo['wsm_code']])->find();
                     if ($ct == false) {
@@ -952,8 +972,8 @@ class Sale extends BaseController
                     $var['intra_stock'] -= $codeinfo['send_num'];
                     $var['updatetime'] = date("Y-m-d H:i:s");
                     $stre = Db::name('good_stock')->save($var);
-                    $stx = ["order_code"=>$outCode,"status"=>$time,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$stx,"xsd", $codeinfo['status'],$stx);
+                    $good_data[]=  ["stock_id"=>$var['id'],"type"=>2,'stock'=>$codeinfo['send_num'],"stock_name"=>"intra_stock"];
+                    GoodLog::LogAdd($this->post['token'],$good_data,'CKD');
                     if ($stre == false) {
                         Db::rollback();
                         return error_show(1002, "状态更新失败");
@@ -1077,8 +1097,10 @@ class Sale extends BaseController
         $info['updatetime'] = date("Y-m-d H:i:s");
         $up = Db::name("sale_diff")->save($info);
         if ($up) {
-            $stx = ["order_code"=>$id,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$stx,"sxd", $info['status'],$stx);
+            $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']];
+            ProcessOrder::AddProcess($this->post['token'],$order);
             return app_show(0, "更新成功");
         } else {
             return error_show(1003, "更新失败");
@@ -1110,8 +1132,10 @@ class Sale extends BaseController
         $info['updatetime'] = date("Y-m-d H:i:s");
         $up = Db::name("sale_diff")->save($info);
         if ($up) {
-            $stx = ["order_code"=>$id,"status"=>$ite,"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$stx,"sxd", $info['status'],$stx);
+            $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"=>$info['status']];
+            ProcessOrder::AddProcess($this->post['token'],$order);
             return app_show(0, "更新成功");
         } else {
             return error_show(1003, "更新失败");

app/admin/controller/Salezx.php

@@ -2,6 +2,8 @@
 
 
 namespace app\admin\controller;
+use app\admin\model\GoodLog;
+use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
@@ -103,7 +105,9 @@ class Salezx extends \app\BaseController
             $vat=[];
             if($datainfo>0){
                 $st = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$st,"zxd",0,$st);
+                ActionLog::logAdd($this->post['token'],$st,"ZXQRD",0,$st);
+                $order=["order_type"=>"ZXQRD","order_code"=>$orderCode,"order_id"=>$datainfo,"order_status"=>$data['status']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 $addgood=$this->addGood($zxinfo);
                 if($addgood==false){
                     Db::rollback();
@@ -311,8 +315,10 @@ class Salezx extends \app\BaseController
             ];
             $datainfo = Db::name('sale')->where(["id"=>$zxNo])->save($data);
             if($datainfo!=false){
-                $st = ["order_code"=>$customer_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$st,"resign_info",0,$st);
+                $st = ["order_code"=>$saleinfo['orderCode'],"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$st,"ZXQRD",0,$data);
+                $order=["order_type"=>"ZXQRD","order_code"=>$saleinfo['orderCode'],"order_id"=>$saleinfo['id'],"order_status"=>$saleinfo['status']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 $saleinfos=[
                     "wsm_code"=>$wsm['wsm_code'],
                     "num"=>$good_num,
@@ -427,6 +433,11 @@ class Salezx extends \app\BaseController
             $st = ["order_code"=>$outCode,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$st,"resign_info",$der['status'] ,$st);
             if($datainfo) {
+                $st = ["order_code"=>$der['outCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$st,"CKD",1,$der);
+                $order=["order_type"=>"CKD","order_code"=>$der['outCode'],"order_id"=>$der['id'],
+                    "order_status"=>$der['status']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
 //                    $send =Db::name("order_out")->where(["wsm_code"=>$der['wsm_code'],'orderCode'=>$der['orderCode']])->sum("send_num");
 //                    $order['send_num']+= $der['send_num'];
 //                    $order['wsend_num']-=$der['send_num'] ;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
@@ -455,6 +466,9 @@ class Salezx extends \app\BaseController
                         Db::rollback();
                         return error_show(1002, "状态更新失败");
                     }
+                $good_data[]=["stock_id"=>$str['id'],"type"=>1,'stock'=>$der['send_num'],"stock_name"=>"intra_stock"];
+                $good_data[]=  ["stock_id"=>$str['id'],"type"=>2,'stock'=>$der['send_num'],"stock_name"=>"wait_out_stock"];
+                GoodLog::LogAdd($this->post['token'],$good_data,'CKD');
                 Db::commit();
                 return error_show(0,"创建成功");
             }else{
@@ -585,13 +599,16 @@ class Salezx extends \app\BaseController
                     "addtime"=>date("Y-m-d H:i:s"),
                     "updatetime"=>date("Y-m-d H:i:s")
                 ];
-                $datainfo = Db::name('order_out')->insert($data);
-                if(!$datainfo){
-                    $sio = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($this->post['token'],$sio,"zxd",0,$sio);
+                $datainfo = Db::name('order_out')->insert($data,true);
+                if($datainfo<=0){
+
                     Db::rollback();
                     return error_show(1003,"创建失败");
                 }
+                $sio = ["order_code"=>$outCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                ActionLog::logAdd($this->post['token'],$sio,"CKD",0,$data);
+                $order=["order_type"=>"CKD","order_code"=>$data['outCode'],"order_id"=>$datainfo,"order_status"=>$data['status']];
+                ProcessOrder::AddProcess($this->post['token'],$order);
                 $item = $der['status'];
                 $der['send_num']+= $receipt_quantity;
                 $der['wsend_num']-=$receipt_quantity;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']
@@ -600,11 +617,14 @@ class Salezx extends \app\BaseController
                 $der['updatetime'] = date("Y-m-d H:i:s");
                 $si = Db::name('sale')->save($der);
                 if($si==false){
-                    $sio = ["order_code"=>$orderCode,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$sio,"zxd",$der['status'],$sio);
+
                     Db::rollback();
                     return error_show(1003,"创建失败");
                 }
+            $sio = ["order_code"=>$orderCode,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$sio,"zxd",$der['status'],$der);
+            $order=["order_type"=>"CKD","order_code"=>$orderCode,"order_id"=>$der['id'],"order_status"=>$der['status']];
+            ProcessOrder::AddProcess($this->post['token'],$order);
                 Db::commit();
                 return error_show(0,"创建成功");
         }catch (\Exception $e) {

app/admin/controller/Supplier.php

@@ -180,8 +180,8 @@ public function edit(){
         "updatetime"=>date("Y-m-d H:i:s")
     ];
     $ed = Db::name('supplier')->where(['is_del'=>0,'id'=>$id])->save($vmp);
-    $st = ["order_code"=>"GYS","status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-    ActionLog::logAdd($this->post['token'],$st,"role_share",0,$st);
+    $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+    ActionLog::logAdd($this->post['token'],$st,"GYS",0,$vmp);
     return $ed ? error_show(0,"编辑成功") : error_show(1002,"编辑失败");
 }
 /*查询*/
@@ -202,6 +202,8 @@ public function selec(){
     }
     $supp= Db::name('supplier')->update(['id'=>$id,'is_del'=>1,"updatetime"=>date("Y-m-d H:i:s")]);
     if($supp){
+        $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"del"];
+        ActionLog::logAdd($this->post['token'],$st,"GYS",0,$supp);
         return error_show(0,"供应商信息删除成功");
     }else{
         return error_show(1002,"供应商信息删除失败");

app/admin/controller/WareHouse.php

@@ -90,7 +90,7 @@ class WareHouse extends BaseController
             $add = Db::name('warehouse_info')->insert($data,true);
             if($add>0){
                 $st = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($post['token'],$st,"resign_info",1,$st);
+                ActionLog::logAdd($post['token'],$st,"warehouse_info",1,$data);
                 $addrinfo = [
                     "wsm_code"=>$wsm_code,
                     "wsm_type"=> $wsm_type,
@@ -104,9 +104,8 @@ class WareHouse extends BaseController
                 ];
                 $addri = DB::name("warehouse_addr")->insert($addrinfo);
                 if($addri){
-
                     $sf = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($post['token'],$sf,"resign_info",1,$sf);
+                    ActionLog::logAdd($post['token'],$sf,"warehouse_addr",1,$addrinfo);
                     Db::commit();
                     return app_show(0,'仓库创建成功');
                 }
@@ -269,6 +268,8 @@ class WareHouse extends BaseController
             ];
             $add = Db::name('warehouse_info')->where($warse)->update($data);
             if($add){
+                $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($post['token'],$st,"warehouse_info",0,$data);
                 $addrinfo = [
                     "wsm_type"=> $wsm_type,
                     "wsm_name"=>$wsm_name,
@@ -279,6 +280,8 @@ class WareHouse extends BaseController
                 ];
              $addri = DB::name("warehouse_addr")->where(["wsm_code"=>$warse['wsm_code'],"is_del"=>0])->update($addrinfo);
                 if($addri){
+                    $sti = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($post['token'],$sti,"warehouse_info",0,$addrinfo);
                     Db::commit();
                     return app_show(0,'仓库更新成功');
                 }
@@ -304,6 +307,8 @@ class WareHouse extends BaseController
         $warse['is_del'] = 1;
         $warse['updatetime'] = date("Y-m-d H:i:s");
         $Del= Db::name("warehouse_info")->save($warse);
+        $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"del"];
+        ActionLog::logAdd($post['token'],$st,"warehouse_info",0,$warse);
         return $Del? app_show(0,'仓库删除成功'): error_show(1005,'仓库删除失败');
     }
 
@@ -325,7 +330,7 @@ class WareHouse extends BaseController
         $warse['status'] = $status;
         $warse['updatetime'] = date("Y-m-d H:i:s");
         $Del= Db::name("warehouse_info")->save($warse);
-        $st = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"create"];
+        $st = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"edit"];
         ActionLog::logAdd($post['token'],$st,"warehouse_info",$warse['status'],$st);
         return $Del? app_show(0,'仓库状态修改成功'): error_show(1005,'仓库状态修改失败');
     }

app/admin/route/app.php

@@ -264,3 +264,5 @@ Route::rule('salediffcheck','admin/Sale/diffcheck');
 Route::rule('salediffinfo','admin/Sale/diffinfo');
 Route::rule('salediffstatus','admin/Sale/diffstatus');
 
+
+