发货单关于流程部分优化

app/admin/controller/Sale.php

@@ -406,23 +406,23 @@ class Sale extends Base
                                 "addtime" => date("Y-m-d H:i:s"),
                                 "updatetime" => date("Y-m-d H:i:s")
                             ];
-                            $ou = Db::name("order_out")->insert($out);
+                            $ou = Db::name("order_out")->insertGetId($out);
                             if ($ou == false) {
                                 Db::rollback();
                                 return error_show(1002, "发货地址添加创建失败");
                             } else {
                                 //修改状态，添加待办
-                                ActionLog::logAdd($this->post['token'], [
+                                ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                                     "order_code" => $outCode,//出库单号
                                     "status" => $out['status'],//这里的status是之前的值
                                     "action_remark" => '',//备注
                                     "action_type" => "create"//新建create，编辑edit，更改状态status
                                 ], "CKD", $out['status'], $out);
 
-                                ProcessOrder::AddProcess($this->post['token'], [
+                                ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                                     "order_type" => 'CKD',
                                     "order_code" => $outCode,//出库单号
-                                    "order_id" => Db::name("order_out")->getLastInsID(),
+                                    "order_id" => $ou,
                                     "order_status" => $out['status'], "before_status" => $out['status']
                                 ]);
 
@@ -773,23 +773,23 @@ class Sale extends Base
                         "addtime" => date("Y-m-d H:i:s"),
                         "updatetime" => date("Y-m-d H:i:s")
                     ];
-                    $ou = Db::name("order_out")->insert($out);
+                    $ou = Db::name("order_out")->insertGetId($out);
                     if ($ou == false) {
                         Db::rollback();
                         return error_show(1002, "发货地址添加创建失败");
                     } else {
                         //修改状态，添加待办
-                        ActionLog::logAdd($this->post['token'], [
+                        ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                             "order_code" => $outCode,//出库单号
                             "status" => 0,//这里的status是之前的值
                             "action_remark" => '',//备注
                             "action_type" => "create"//新建create，编辑edit，更改状态status
                         ], "CKD", 0, $out);
 
-                        ProcessOrder::AddProcess($this->post['token'], [
+                        ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                             "order_type" => 'CKD',
                             "order_code" => $outCode,//出库单号
-                            "order_id" => Db::name("order_out")->getLastInsID(),
+                            "order_id" => $ou,
                             "order_status" => $status, "before_status" => 0
                         ]);
 
@@ -1124,23 +1124,23 @@ class Sale extends Base
                                 "addtime" => date("Y-m-d H:i:s"),
                                 "updatetime" => date("Y-m-d H:i:s")
                             ];
-                            $ou = Db::name("order_out")->insert($out);
+                            $ou = Db::name("order_out")->insertGetId($out);
                             if ($ou == false) {
                                 Db::rollback();
                                 return error_show(1002, "发货地址添加创建失败");
                             } else {
                                 //修改状态，添加待办
-                                ActionLog::logAdd($this->post['token'], [
+                                ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                                     "order_code" => $outCode,//出库单号
                                     "status" => 0,//这里的status是之前的值
                                     "action_remark" => '',//备注
                                     "action_type" => "create"//新建create，编辑edit，更改状态status
                                 ], "CKD", 0, $out);
 
-                                ProcessOrder::AddProcess($this->post['token'], [
+                                ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                                     "order_type" => 'CKD',
                                     "order_code" => $outCode,//出库单号
-                                    "order_id" => Db::name("order_out")->getLastInsID(),
+                                    "order_id" => $ou,
                                     "order_status" => 0, "before_status" => 0
                                 ]);
 
@@ -1621,7 +1621,7 @@ class Sale extends Base
                             "addtime" => date("Y-m-d H:i:s"),
                             "updatetime" => date("Y-m-d H:i:s")
                         ];
-                        $ou = Db::name("order_out")->insert($out);
+                        $ou = Db::name("order_out")->insertGetId($out);
                         if ($ou == false) {
                             return false;
                         }
@@ -1636,7 +1636,7 @@ class Sale extends Base
                         ProcessOrder::AddProcess($this->post['token'], [
                             "order_type" => 'CKD',
                             "order_code" => $outCode,
-                            "order_id" => Db::name("order_out")->getLastInsID(),
+                            "order_id" => $ou,
                             "order_status" => 0, "before_status" => 0
                         ]);
                         $order['send_num'] += $value['receipt_quantity'];
@@ -1915,7 +1915,7 @@ class Sale extends Base
                             "addtime" => date("Y-m-d H:i:s"),
                             "updatetime" => date("Y-m-d H:i:s")
                         ];
-                        $ou = Db::name("order_out")->insert($out);
+                        $ou = Db::name("order_out")->insertGetId($out);
                         if ($ou == false) {
                             return 0;
                         } else {
@@ -1931,7 +1931,7 @@ class Sale extends Base
                             ProcessOrder::AddProcess($this->post['token'], [
                                 "order_type" => 'CKD',
                                 "order_code" => $outCode,//出库单号
-                                "order_id" => Db::name("order_out")->getLastInsID(),
+                                "order_id" => $ou,
                                 "order_status" => 0, "before_status" => 0
                             ]);
                         }
@@ -2536,7 +2536,7 @@ class Sale extends Base
                                 "addtime" => date("Y-m-d H:i:s"),
                                 "updatetime" => date("Y-m-d H:i:s")
                             ];
-                            $datainfo = Db::name('order_out')->insert($data);
+                            $datainfo = Db::name('order_out')->insertGetId($data);
                             if (!$datainfo) {
                                 $sti = ["order_code" => $dio['orderCode'], "status" => 0, "action_remark" => '', "action_type" => "create"];
                                 ActionLog::logAdd($this->post['token'], $sti, "xsd", 0, $sti);
@@ -2544,17 +2544,17 @@ class Sale extends Base
                                 return error_show(1003, "创建失败");
                             } else {
                                 //修改状态，添加待办
-                                ActionLog::logAdd($this->post['token'], [
+                                ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                                     "order_code" => $outCode,//出库单号
                                     "status" => 0,//这里的status是之前的值
                                     "action_remark" => '',//备注
                                     "action_type" => "create"//新建create，编辑edit，更改状态status
                                 ], "CKD", 0, $data);
 
-                                ProcessOrder::AddProcess($this->post['token'], [
+                                ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                                     "order_type" => 'CKD',
                                     "order_code" => $outCode,//出库单号
-                                    "order_id" => 0,
+                                    "order_id" => $datainfo,
                                     "order_status" => 0, "before_status" => 0
                                 ]);
                             }
@@ -3508,14 +3508,14 @@ class Sale extends Base
                 $datainfo = Db::name('order_out')->insert($data, true);
                 if ($datainfo > 0) {
                     //修改状态，添加待办
-                    ActionLog::logAdd($this->post['token'], [
+                    ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                         "order_code" => $data['outCode'],//出库单号
                         "status" => $data['status'],//这里的status是之前的值
                         "action_remark" => '',//备注
                         "action_type" => "create"//新建create，编辑edit，更改状态status
                     ], "CKD", $data['status'], $data);
 
-                    ProcessOrder::AddProcess($this->post['token'], [
+                    ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                         "order_type" => 'CKD',
                         "order_code" => $data['outCode'],//出库单号
                         "order_id" => $datainfo,

app/admin/controller/Salezx.php

@@ -192,25 +192,26 @@ class Salezx extends \app\BaseController
                                 "addtime"=>date("Y-m-d H:i:s"),
                                 "updatetime"=>date("Y-m-d H:i:s")
                             ];
-                           $ou =Db::name("order_out")->insert($out);
+                           $ou =Db::name("order_out")->insertGetId($out);
                            if($ou==false){
                                Db::rollback();
                                return error_show(1002,"咨询订单创建失败");
                            }else{
 
                                //修改状态，添加待办
-                               ActionLog::logAdd($this->post['token'], [
+                               ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                                    "order_code" => $outCode,//出库单号
                                    "status" => $out['status'],//这里的status是之前的值
                                    "action_remark" => '',//备注
                                    "action_type" => "create"//新建create，编辑edit，更改状态status
                                ], "CKD", $out['status'], $out);
 
-                               ProcessOrder::AddProcess($this->post['token'], [
+                               ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                                    "order_type" => 'CKD',
                                    "order_code" => $outCode,//出库单号
-                                   "order_id" => 0,
-                                   "order_status" => $out['status']
+                                   "order_id" => $ou,
+                                   "order_status" => $out['status'],
+                                   'before_status'=>0
                                ]);
 
                                $standing_bood_data['outCode'][]=$outCode;
@@ -224,14 +225,14 @@ class Salezx extends \app\BaseController
                 }
 
                 //修改状态，添加待办
-                ActionLog::logAdd($this->post['token'], [
+                ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri], [
                     "order_code" => $orderCode,//销售单code
                     "status" => 0,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "create"//新建create，编辑edit，更改状态status
                 ], "XSQRD", 0, $data);
 
-                ProcessOrder::AddProcess($this->post['token'], [
+                ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
                     "order_type" => 'XSQRD',
                     "order_code" => $orderCode,//销售单code
                     "order_id" => $datainfo,
@@ -723,9 +724,9 @@ class Salezx extends \app\BaseController
                     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);
+                ActionLog::logAdd(['id'=>$rm,'nickname'=>$ri],$sio,"CKD",0,$data);
+                $order=["order_type"=>"CKD","order_code"=>$data['outCode'],"order_id"=>$datainfo,"order_status"=>$data['status'],'before_status'=>0];
+                ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri],$order);
                 $item = $der['status'];
                 $der['send_num']+= $receipt_quantity;
                 $der['wsend_num']-=$receipt_quantity;//($der['send_num'])?$der['wsend_num'] =="" ? $der['send']