待办已办流程优化-第三部分

app/abutment/controller/Good.php

@@ -530,7 +530,9 @@ class Good extends HomeBaseController
                     "order_type" => 'SPCB',
                     "order_code" => $spucode,//咨询单详情编号
                     "order_id" => $in,
-                    "order_status" => 0, "before_status" => 0
+                    "order_status" => 0,
+                    "before_status" => 0,
+                    'holder_id' => $data['createrid'],
                 ]);
                 Db::commit();
                 return json_show(0, "创建成功", ["spuCode" => $spucode]);
@@ -796,7 +798,9 @@ class Good extends HomeBaseController
                     "order_type" => 'SPCB',
                     "order_code" => $supcode,//咨询单详情编号
                     "order_id" => $data['id'],
-                    "order_status" => $temp['status'], "before_status" => $data['status']
+                    "order_status" => $temp['status'],
+                    "before_status" => $data['status'],
+                    'holder_id' => $data['createrid'],
                 ]);
                 Db::commit();
                 return json_show(0, "更新成功");
@@ -900,7 +904,9 @@ class Good extends HomeBaseController
                     "order_type" => 'SPCB',
                     "order_code" => $supcode,//咨询单详情编号
                     "order_id" => $datas['id'],
-                    "order_status" => $data['status'], "before_status" => $datas['status']
+                    "order_status" => $data['status'],
+                    "before_status" => $datas['status'],
+                    'holder_id' => $datas['createrid'],
                 ]);
 //                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
 //                if($online){
@@ -1257,7 +1263,9 @@ class Good extends HomeBaseController
                     "order_type" => 'SPCB',
                     "order_code" => $supcode,//咨询单详情编号
                     "order_id" => $data['id'],
-                    "order_status" => 0, "before_status" => 0
+                    "order_status" => 0,
+                    "before_status" => 0,
+                    'holder_id' => $data['createrid'],
                 ]);
                 if ($speclist !== "" && !empty($speclist)) {
                     foreach ($speclist as $value) {
@@ -1695,7 +1703,9 @@ class Good extends HomeBaseController
                     "order_type" => 'SPCB',
                     "order_code" => $newCode,//咨询单详情编号
                     "order_id" => Db::name("good_basic")->getLastInsID(),
-                    "order_status" => 7, "before_status" => 0
+                    "order_status" => 7,
+                    "before_status" => 0,
+                    'holder_id' => $data['createrid'],
                 ]);
                 if (!empty($ladd)) {
                     $na = Db::name("good_nake")->insertAll($ladd);

app/abutment/controller/Order.php

@@ -594,7 +594,8 @@ class Order extends HomeBaseController
                                                 "order_code" => $v_outCode['outCode'],//出库单号
                                                 "order_id" => $v_outCode['id'],
                                                 "order_status" => 1,
-                                                "before_status" => 0
+                                                "before_status" => 0,
+                                                'holder_id' => $v_outCode['apply_id']
                                             ]);
                                         }
                                     }

app/abutment/controller/Sale.php

@@ -271,6 +271,7 @@ class Sale extends HomeBaseController
                     "before_status" => $old_outinfo_status,
                     'wait_id' => $outinfo['apply_id'],
                     'wait_name' => $outinfo['apply_name'],
+                    'holder_id' => $outinfo['apply_id'],
                 ]);
                 $orderstatus = $einfo['status'];
                 $einfo['send_num'] += $outinfo['send_num'];
@@ -298,7 +299,9 @@ class Sale extends HomeBaseController
                     "order_type" => 'XSQRD',
                     "order_code" => $einfo['orderCode'],//出库单号
                     "order_id" => $einfo['id'],
-                    "order_status" => $einfo['status'], "before_status" => $orderstatus
+                    "order_status" => $einfo['status'],
+                    "before_status" => $orderstatus,
+                    'holder_id' => $einfo['apply_id']
                 ]);
 
                 $stokc = Db::name("good_stock")->where(['spuCode' => $einfo['good_code'], "wsm_code" => $outinfo['wsm_code'], "is_del" => 0])->find();
@@ -395,7 +398,7 @@ class Sale extends HomeBaseController
                 $sale_infos = Db::name("sale")
                     ->where('orderCode', $order_out_infos[$value['outCode']]['orderCode'])
                     ->where('is_del', 0)
-                    ->column('id,send_num,wsend_num,status,good_code,order_source', 'orderCode');
+                    ->column('id,send_num,wsend_num,status,good_code,order_source,apply_id', 'orderCode');
 
                 if (!isset($sale_infos[$order_out_infos[$value['outCode']]['orderCode']])) throw new Exception($value['outCode'] . '该发货单对应的销售单未找到');
 
@@ -439,6 +442,7 @@ class Sale extends HomeBaseController
                         "before_status" => $order_out_infos[$value['outCode']]['status'],
                         'wait_id' => $order_out_infos[$value['outCode']]['apply_id'],
                         'wait_name' => $order_out_infos[$value['outCode']]['apply_name'],
+                        'holder_id' => $order_out_infos[$value['outCode']]['apply_id'],
                     ]);
 
 
@@ -467,7 +471,9 @@ class Sale extends HomeBaseController
                         "order_type" => 'XSQRD',
                         "order_code" => $order_out_infos[$value['outCode']]['orderCode'],//出库单号
                         "order_id" => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['id'],
-                        "order_status" => $einfo['status'], "before_status" => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['status']
+                        "order_status" => $einfo['status'],
+                        "before_status" => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['status'],
+                        'holder_id' => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['apply_id']
                     ]);
 
                     //【库存】

app/admin/controller/Activity.php

@@ -336,7 +336,7 @@ class Activity extends Base
 
                 $stn = ["order_code" => $activity_code, "status" => 0, "action_remark" => '', "action_type" => "create"];
                 ActionLog::logAdd($this->post['token'], $stn, "HD", $data['status'], $data);
-                $process = ["order_code" => $activity_code, "order_id" => $inset, "order_status" => $data['status'], "order_type" => 'HD', "before_status" => 0];
+                $process = ["order_code" => $activity_code, "order_id" => $inset, "order_status" => $data['status'], "order_type" => 'HD', "before_status" => 0, 'holder_id' => $data['createrid']];
                 ProcessOrder::AddProcess($this->post['token'], $process);
 
                 Db::commit();
@@ -388,7 +388,7 @@ class Activity extends Base
 
                 $stn = ["order_code" => $activity_code, "status" => $old_activity_status, "action_remark" => '', "action_type" => "status"];
                 ActionLog::logAdd($this->post['token'], $stn, "HD", $activity['status'], $activity);
-                $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_activity_status];
+                $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_activity_status, 'holder_id' => $activity['createrid']];
                 ProcessOrder::AddProcess($this->post['token'], $process);
 
                 Db::commit();
@@ -448,7 +448,7 @@ class Activity extends Base
                     ->leftJoin('depart_user u', 'u.uid=ur.uid AND u.is_del=0 AND u.status=1')
                     ->where('r.id', 20)//财务负责人
                     ->findOrEmpty();
-                $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_activity_status, 'wait_id' => isset($user['uid']) ? $user['uid'] : 0, 'wait_name' => isset($user['nickname']) ? $user['nickname'] : ''];
+                $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_activity_status, 'wait_id' => isset($user['uid']) ? $user['uid'] : 0, 'wait_name' => isset($user['nickname']) ? $user['nickname'] : '', 'holder_id' => isset($user['uid']) ? $user['uid'] : 0];
                 ProcessOrder::AddProcess($this->post['token'], $process);
 
                 Db::commit();
@@ -500,7 +500,7 @@ class Activity extends Base
 
                 $stn = ["order_code" => $activity_code, "status" => $old_activity_status, "action_remark" => '', "action_type" => "status"];
                 ActionLog::logAdd($this->post['token'], $stn, "HD", $activity['status'], $activity);
-                $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_activity_status];
+                $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_activity_status, 'holder_id' => $activity['createrid']];
                 ProcessOrder::AddProcess($this->post['token'], $process);
 
                 Db::commit();
@@ -600,7 +600,7 @@ class Activity extends Base
 
             $stn = ["order_code" => $activity_code, "status" => $old_status, "action_remark" => '', "action_type" => "status"];
             ActionLog::logAdd($this->post['token'], $stn, "HD", $activity['status'], $activity);
-            $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_status];
+            $process = ["order_code" => $activity_code, "order_id" => $activity['id'], "order_status" => $activity['status'], "order_type" => 'HD', "before_status" => $old_status, 'holder_id' => $activity['createrid']];
             ProcessOrder::AddProcess($this->post['token'], $process);
 
             return  app_show(0,"修改成功");

app/admin/controller/After.php

@@ -1463,7 +1463,9 @@ class After extends Base
                     "order_type" => 'XSQRD',
                     "order_code" => $orderCode,//销售单code
                     "order_id" => $datainfo,
-                    "order_status" => 0, "before_status" => 0
+                    "order_status" => 0,
+                    "before_status" => 0,
+                    'holder_id' => $data['apply_id']
                 ]);
 
                 if ($is_activity == 1) {
@@ -1836,7 +1838,9 @@ class After extends Base
                     "order_type" => 'XSQRD',
                     "order_code" => $orderCode,//销售单code
                     "order_id" => $datainfo,
-                    "order_status" => $data['status'], "before_status" => 0
+                    "order_status" => $data['status'],
+                    "before_status" => 0,
+                    'holder_id' => $data['apply_id']
                 ]);
 //                $old_zx_status = $zx['status'];
 //                $zx['status']=5;
@@ -1991,7 +1995,9 @@ class After extends Base
                         "order_type" => 'CKD',
                         "order_code" => $outCode,//出库单号
                         "order_id" => Db::name("order_out")->getLastInsID(),
-                        "order_status" => 0, "before_status" => 0
+                        "order_status" => 0,
+                        "before_status" => 0,
+                        'holder_id' => $out['apply_id']
                     ]);
 
                     //将发货编号添加到台账中

app/admin/controller/Allot.php

@@ -242,7 +242,7 @@ class Allot extends Base
                 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',"before_status"=>0];
+                    $process = ["order_code" => $allot_code, "order_id" => $pd, "order_status" => $status, "order_type" => 'DBD', "before_status" => 0, 'holder_id' => $data['apply_id']];
                     ProcessOrder::AddProcess($token,$process);
                     Db::commit();
                     return error_show(0, "调拨创建成功");
@@ -491,7 +491,7 @@ class Allot extends Base
                 }
                 $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',"before_status"=>$sr];
+                $process=["order_code"=>$st['allot_code'],"order_id"=>$st['id'],"order_status"=>$st['status'],"order_type"=>'DBD',"before_status"=>$sr, 'holder_id' => $st['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return error_show(0,"状态更新成功");
@@ -564,7 +564,7 @@ class Allot extends Base
                 }
                 $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',"before_status"=>$al['status']];
+                $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>3,"order_type"=>'DBD',"before_status"=>$al['status'], 'holder_id' => $al['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return error_show(0,"发货更新成功");
@@ -673,7 +673,7 @@ class Allot extends Base
             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',"before_status"=>$al['status']];
+            $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>4,"order_type"=>'DBD',"before_status"=>$al['status'], 'holder_id' => $al['apply_id']];
             ProcessOrder::AddProcess($this->post['token'],$process);
             Db::commit();
             return error_show(0, "入库验货更新成功");
@@ -756,7 +756,7 @@ public function vesio(){
                 $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,'DBD');
-            $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>5,"order_type"=>'DBD',"before_status"=>$al['status']];
+            $process=["order_code"=>$allot_code,"order_id"=>$al['id'],"order_status"=>5,"order_type"=>'DBD',"before_status"=>$al['status'], 'holder_id' => $al['apply_id']];
             ProcessOrder::AddProcess($this->post['token'],$process);
             Db::commit();
             return error_show(0, "验货更新成功");

app/admin/controller/Check.php

@@ -333,7 +333,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,'PDD',$data['status'],$orde);
-            $process=["order_code"=>$check_code,"order_id"=>$da,"order_status"=>$data['status'],"order_type"=>'PDD',"before_status"=>$data['status']];
+            $process=["order_code"=>$check_code,"order_id"=>$da,"order_status"=>$data['status'],"order_type"=>'PDD',"before_status"=>$data['status'], 'holder_id' => $data['apply_id']];
             ProcessOrder::AddProcess($this->post['token'],$process);
            Db::commit();
             return error_show(0,"盘点创建成功");
@@ -475,8 +475,7 @@ 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,'PDD',$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,"删除成功");
@@ -532,8 +531,7 @@ public function edit()
                         return error_show(1003,"未上传盘点结果");
                     }
                 }
-                $process=["order_code"=>$st['check_code'],"order_id"=>$st['id'],"order_status"=>$stauts,
-                    "order_type"=>'PDD',"before_status"=>$temp];
+                $process=["order_code"=>$st['check_code'],"order_id"=>$st['id'],"order_status"=>$stauts, "order_type"=>'PDD',"before_status"=>$temp, 'holder_id' => $st['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return error_show(0,"状态更新成功");
@@ -639,7 +637,7 @@ public function edit()
                 if($check_up){
                     $orde = ["order_code"=>$fo['check_code'],$fo['status'],"action_remark"=>'',"action_type"=>"edit"];
                     ActionLog::logAdd($this->post['token'],$orde,'PDD',2,["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-                    $process=["order_code"=>$fo['check_code'],"order_id"=>$fo['id'],"order_status"=>2,"order_type"=>'PDD',"before_status"=>$fo['status']];
+                    $process = ["order_code" => $fo['check_code'], "order_id" => $fo['id'], "order_status" => 2, "order_type" => 'PDD', "before_status" => $fo['status'], 'holder_id' => $fo['apply_id']];
                     ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"盘点数据导入成功");

app/admin/controller/Goodup.php

@@ -531,7 +531,9 @@ class Goodup extends Base
                     "order_type" => 'SPCB',
                     "order_code" => $spucode,//咨询单详情编号
                     "order_id" => $in,
-                    "order_status" => 0, "before_status" => 0
+                    "order_status" => 0,
+                    "before_status" => 0,
+                    'holder_id'=>$data['createrid'],
                 ]);
                     Db::commit();
                     return app_show(0,"创建成功",["spuCode"=>$spucode]);
@@ -793,7 +795,9 @@ class Goodup extends Base
                     "order_type" => 'SPCB',
                     "order_code" => $supcode,//咨询单详情编号
                     "order_id" => $data['id'],
-                    "order_status" =>$temp['status'],"before_status"=>$data['status']
+                    "order_status" =>$temp['status'],
+                    "before_status"=>$data['status'],
+                    'holder_id'=>$data['createrid'],
                 ]);
                 Db::commit();
                 return app_show(0,"更新成功");
@@ -887,7 +891,9 @@ class Goodup extends Base
                     "order_type" => 'SPCB',
                     "order_code" => $supcode,//咨询单详情编号
                     "order_id" => $datas['id'],
-                    "order_status" =>$data['status'],"before_status"=>$datas['status']
+                    "order_status" =>$data['status'],
+                    "before_status"=>$datas['status'],
+                    'holder_id'=>$datas['createrid'],
                 ]);
 //                $online =  Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->find();
 //                if($online){
@@ -1016,7 +1022,9 @@ class Goodup extends Base
                         "order_type" => 'SPSX',
                         "order_code" =>$online['skuCode'],//咨询单详情编号
                         "order_id" => $online['id'],
-                        "order_status" => 2,"before_status"=>$online['exam_status']
+                        "order_status" => 2,
+                        "before_status"=>$online['exam_status'],
+                        'holder_id' => $online['createrid'],
                     ]);
                 }
             }
@@ -1045,7 +1053,9 @@ class Goodup extends Base
                     "order_type" => 'SPCB',
                     "order_code" => $supcode,//咨询单详情编号
                     "order_id" => $data['id'],
-                    "order_status" =>$data['status'],"before_status"=>$old_status
+                    "order_status" =>$data['status'],
+                    "before_status"=>$old_status,
+                    'holder_id'=>$data['createrid'],
                 ]);
                 $data=[
                     "code"=>$supcode,
@@ -1340,7 +1350,9 @@ class Goodup extends Base
                         "order_type" => 'SPSX',
                         "order_code" =>$skuCode,//咨询单详情编号
                         "order_id" => $create,
-                        "order_status" =>$tmp['exam_status'],"before_status"=>$tmp['exam_status']
+                        "order_status" =>$tmp['exam_status'],
+                        "before_status"=>$tmp['exam_status'],
+                        'holder_id' => $tmp['createrid'],
                     ]);
                     $iso = Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                     if($iso==false){
@@ -1567,7 +1579,9 @@ class Goodup extends Base
                         "order_type" => 'SPSX',
                         "order_code" => $skuCode,//咨询单详情编号
                         "order_id" => $platform['id'],
-                        "order_status" => $exam_status, "before_status" => $bifore
+                        "order_status" => $exam_status,
+                        "before_status" => $bifore,
+                        'holder_id' => $platform['createrid'],
                     ]);
 
                     //商品上线的话，将数据包塞入到队列中
@@ -1685,7 +1699,9 @@ class Goodup extends Base
                     "order_type" => 'SPSX',
                     "order_code" =>$platform['skuCode'],//咨询单详情编号
                     "order_id" => $platform['id'],
-                    "order_status" => $platform['exam_status'],"before_status"=>$bifore
+                    "order_status" => $platform['exam_status'],
+                    "before_status"=>$bifore,
+                    'holder_id' => $platform['createrid'],
                 ]);
                 $proof=[
                     'spuCode'=>$platform['spuCode'],
@@ -1798,7 +1814,9 @@ class Goodup extends Base
                     "order_type" => 'SPSX',
                     "order_code" =>$platform['skuCode'],//咨询单详情编号
                     "order_id" => $platform['id'],
-                    "order_status" => $platform['exam_status'],"before_status"=>$bifore
+                    "order_status" => $platform['exam_status'],
+                    "before_status"=>$bifore,
+                    'holder_id' => $platform['createrid'],
                 ]);
                 $data=[
                     "code"=>$platform['skuCode'],
@@ -1919,7 +1937,9 @@ class Goodup extends Base
                     "order_type" => 'SPCB',
                     "order_code" =>$newCode,//咨询单详情编号
                     "order_id" => $cre,
-                    "order_status" =>7,"before_status"=>0
+                    "order_status" =>7,
+                    "before_status"=>0,
+                    'holder_id'=>$data['createrid'],
                 ]);
                 if(!empty($ladd)){
                     $na = Db::name("good_nake")->insertAll($ladd);
@@ -2225,7 +2245,9 @@ class Goodup extends Base
                     "order_type" => 'SPCB',
                     "order_code" =>$supcode,//咨询单详情编号
                     "order_id" => $data['id'],
-                    "order_status" =>0,"before_status"=>0
+                    "order_status" =>0,
+                    "before_status"=>0,
+                    'holder_id'=>$data['createrid'],
                 ]);
                 if($speclist!=="" && !empty($speclist)){
                     foreach ($speclist as $value){
@@ -2660,6 +2682,7 @@ class Goodup extends Base
                         "order_id" => isset($value['id']) ? $value['id'] : 0,
                         "order_status" => 8,//待产品审核
                         "before_status" => 0,//待产品审核
+                        'holder_id'=>$value['createrid'],
                     ]);
                 }
                 foreach ($data as $value) {
@@ -2676,7 +2699,8 @@ class Goodup extends Base
                         "order_code" =>$value['skuCode'],//
                         "order_id" => isset($value['id']) ? $value['id'] : 0,
                         "order_status" =>$value['exam_status'],//待产品审核
-                        "before_status" => 0
+                        "before_status" => 0,
+                        'holder_id' => $value['createrid'],
                     ]);
                 }
                 Db::commit();
@@ -2710,7 +2734,7 @@ class Goodup extends Base
         try {
 
             $rs = Db::name("good_platform")
-                ->field('id,spuCode,skuCode,exam_status')
+                ->field('id,spuCode,skuCode,exam_status,createrid')
                 ->where(['skuCode' => $param['skuCode'], 'is_del' => 0])
                 ->where('exam_status', '<>', 6)//exam_status==6上线成功
                 ->find();
@@ -2755,7 +2779,9 @@ class Goodup extends Base
                 "order_type" => 'SPSX',
                 "order_code" => $param['skuCode'],//咨询单详情编号
                 "order_id" => $rs['id'],
-                "order_status" => $exam_status, "before_status" => $rs['exam_status']
+                "order_status" => $exam_status,
+                "before_status" => $rs['exam_status'],
+                'holder_id' => $rs['createrid'],
             ]);
 
             Db::commit();

app/admin/controller/Purchin.php

@@ -364,7 +364,9 @@ class Purchin extends Base
                                                 "order_type" => 'CKD',
                                                 "order_code" => $v_outCode['outCode'],//出库单号
                                                 "order_id" => $v_outCode['id'],
-                                                "order_status" => 1,"before_status"=>0
+                                                "order_status" => 1,
+                                                "before_status"=>0,
+                                                'holder_id' => $v_outCode['apply_id']
                                             ]);
                                         }
                                     }

app/admin/controller/Reorder.php

@@ -1081,7 +1081,7 @@ class Reorder extends Base
                             $value['updatetime']=date("Y-m-d H:i:s");
                            $up =Db::name("order_out")->save($value);
                            if($up){
-                               $process=["order_code"=> $value['outCode'],"order_id"=>$value['id'],"order_status"=>0,"order_type"=>'CKD',"before_status"=>$tt];
+                               $process=["order_code"=> $value['outCode'],"order_id"=>$value['id'],"order_status"=>0,"order_type"=>'CKD',"before_status"=>$tt,'holder_id' => $value['apply_id']];
                                ProcessOrder::AddProcess($this->post['token'],$process);
                                $ste = ["order_code"=>$value['outCode'],"status"=>$tt,"action_remark"=>'',"action_type"=>"status"];
                                ActionLog::logAdd($this->post['token'],$ste,"CKD",0,$value);
@@ -1276,7 +1276,9 @@ class Reorder extends Base
                         "order_type" => 'XSQRD',
                         "order_code" =>$order["orderCode"],//出库单号
                         "order_id" => $order["id"],
-                        "order_status" =>$order['status'],"before_status"=>$lor
+                        "order_status" =>$order['status'],
+                        "before_status"=>$lor,
+                        'holder_id=' => $order['apply_id']
                     ]);
 
                     $ordernum['send_num'] -= $thnum;

app/admin/controller/Resign.php

@@ -204,7 +204,7 @@ 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"=>1,"before_status"=>1];
+            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>1,"before_status"=>1, 'holder_id' => $info['apply_id']];
             ProcessOrder::AddProcess($token,$order);
             $ste = ["order_code"=>$bk_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
             ActionLog::logAdd($token,$ste,"BHD",1,$info);
@@ -260,7 +260,7 @@ 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"=>1,"before_status"=>1];
+            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_id"=>$in,"order_status"=>1,"before_status"=>1, 'holder_id' => $info['apply_id']];
             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",1,$info);
@@ -372,7 +372,7 @@ class Resign extends Base
         ];
         $in = Db::name("purchease")->where($info)->save($up);
         if($in){
-            $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'],"order_status"=>$info['status'],"before_status"=>1];
+            $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'],"order_status"=>$info['status'],"before_status"=>1, 'holder_id' => $info['apply_id']];
             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",$info['status'],$up);
@@ -421,8 +421,7 @@ class Resign extends Base
         $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,"before_status"=>$temp];
+            $order = ["order_type" => 'BHD', "order_code" => $info['bk_code'], "order_id" => $info['id'], "order_status" => $status, "before_status" => $temp, 'holder_id' => $info['apply_id']];
             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);
@@ -537,7 +536,7 @@ class Resign extends Base
                 $info['addtime']=date("Y-m-d H:i:s");
                 $ood=Db::name('purchease')->save($info);
                 if($ood){
-                    $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'], "order_status"=>$info['status'],"before_status"=>$temp];
+                    $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'], "order_status"=>$info['status'],"before_status"=>$temp, 'holder_id' => $info['apply_id']];
                     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);
@@ -629,7 +628,7 @@ class Resign extends Base
             $feed['updatetime']=date("Y-m-d H:i:s");
             $up = Db::name("purchease")->update($feed);
             if($up){
-                $order=["order_type"=>'BHD',"order_code"=>$feed['bk_code'],"order_id"=>$feed['id'], "order_status"=>$feed['status'],"before_status"=>$tem];
+                $order=["order_type"=>'BHD',"order_code"=>$feed['bk_code'],"order_id"=>$feed['id'], "order_status"=>$feed['status'],"before_status"=>$tem, 'holder_id' => $feed['apply_id']];
                 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);
@@ -790,7 +789,9 @@ class Resign extends Base
                 "order_type" => 'BHD',
                 "order_code" => $info['bk_code'],//销售单code
                 "order_id" => $info['id'],
-                "order_status" => $info['status'],"before_status"=>$old_info_status
+                "order_status" => $info['status'],
+                "before_status"=>$old_info_status,
+                'holder_id' => $info['apply_id']
             ]);
 
             return app_show(0,"备库单仓库选择成功");
@@ -936,7 +937,9 @@ class Resign extends Base
                                 "order_type" => 'BHD',
                                 "order_code" => $info['bk_code'],//销售单code
                                 "order_id" => $info['id'],
-                                "order_status" => $info['status'],"before_status"=> $old_info_status
+                                "order_status" => $info['status'],
+                                "before_status"=> $old_info_status,
+                                'holder_id' => $info['apply_id']
                             ]);
 
                             //维护台账记录

app/admin/controller/Resigninfo.php

@@ -113,7 +113,7 @@ class Resigninfo extends Base
         $stn = ["order_code"=>'',"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
         ActionLog::logAdd(['id'=>isset($resign_uid["data"]['id'])?$resign_uid["data"]['id']:0,'nickname'=>$ri],$stn,"LZJJ",$status,$stn);
 
-        $process=["order_code"=>'',"order_id"=>$in,"order_status"=>$status,"order_type"=>'LZJJ',"before_status"=>0];
+        $process=["order_code"=>'',"order_id"=>$in,"order_status"=>$status,"order_type"=>'LZJJ',"before_status"=>0, 'holder_id' => $data['hand_uid']];
         ProcessOrder::AddProcess(['id'=>isset($resign_uid["data"]['id'])?$resign_uid["data"]['id']:0,'nickname'=>$ri],$process);
         return $in ? error_show(0,"添加成功") : error_show(1002,"添加失败");
     }
@@ -174,8 +174,8 @@ class Resigninfo extends Base
       if($it){
           $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
           ActionLog::logAdd($this->post['token'],$stn,"LZJJ",0,$stn);
-          $process=["order_code"=>'',"order_id"=>$id,"order_status"=>$status,"order_type"=>'LZJJ',"before_status"=>0];
-          ProcessOrder::AddProcess(['id'=>isset($resign_uid["data"]['id'])?$resign_uid["data"]['id']:0,'nickname'=>$ri],$process);
+          $process=["order_code"=>'',"order_id"=>$id,"order_status"=>$eid['status'],"order_type"=>'LZJJ',"before_status"=>0, 'holder_id' => $eid['hand_uid']];
+          ProcessOrder::AddProcess(['id'=>$hand_id,'nickname'=>$r],$process);
           return error_show(0,"编辑成功");
       }else{
           return error_show(1002,"编辑失败");
@@ -218,7 +218,7 @@ class Resigninfo extends Base
         if($sv){
             $stn = ["order_code"=>$id,"status"=>$tn,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$stn,"LZJJ",$stauts,$st);
-            $process=["order_code"=>'',"order_id"=>$id,"order_status"=>$stauts,"order_type"=>'LZJJ',"before_status"=>$tn];
+            $process = ["order_code" => '', "order_id" => $id, "order_status" => $stauts, "order_type" => 'LZJJ', "before_status" => $tn, 'holder_id' => $st['hand_uid']];
             ProcessOrder::AddProcess($this->post['token'],$process);
             return error_show(0,"状态更新成功");
         }else{

app/admin/controller/Sale.php

@@ -204,12 +204,12 @@ class Sale extends Base
         $remark = isset($this->post['remark']) && $this->post['remark'] !== "" ? trim($this->post['remark']) : "";
         $proof_id = isset($this->post['proof_id']) && $this->post['proof_id'] !== "" ? intval($this->post['proof_id']) : 0;
 
-        $apply_id = GetUserInfo($token);
-        if (empty($apply_id) || $apply_id['code'] != 0) {
-            return error_show(1002, "申请人数据不存在");
-        }
-        $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
-        $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
+//        $apply_id = GetUserInfo($token);
+//        if (empty($apply_id) || $apply_id['code'] != 0) {
+//            return error_show(1002, "申请人数据不存在");
+//        }
+        $rm = $this->uid;
+        $ri = $this->uname;
         Db::startTrans();
         try {
             $data = [
@@ -274,7 +274,9 @@ class Sale extends Base
                     "order_type" => 'XSQRD',
                     "order_code" => $orderCode,//销售单code
                     "order_id" => $datainfo,
-                    "order_status" => 0, "before_status" => 0
+                    "order_status" => 0,
+                    "before_status" => 0,
+                    'holder_id' => $data['apply_id']
                 ]);
 
                 if ($is_activity == 1) {
@@ -440,7 +442,9 @@ class Sale extends Base
                                     "order_type" => 'CKD',
                                     "order_code" => $outCode,//出库单号
                                     "order_id" => $ou,
-                                    "order_status" => $out['status'], "before_status" => $out['status']
+                                    "order_status" => $out['status'],
+                                    "before_status" => $out['status'],
+                                    'holder_id'=>$out['apply_id'],
                                 ]);
 
 
@@ -816,7 +820,9 @@ class Sale extends Base
                             "order_type" => 'CKD',
                             "order_code" => $outCode,//出库单号
                             "order_id" => $ou,
-                            "order_status" => $status, "before_status" => 0
+                            "order_status" => $status,
+                            "before_status" => 0,
+                            'holder_id'=>$out['apply_id'],
                         ]);
 
                         //处理台账-既然是根据orderCode更新的数据，那么肯定是有数据的，只需要更新就行了
@@ -1042,7 +1048,9 @@ class Sale extends Base
                     "order_type" => 'XSQRD',
                     "order_code" => $orderCode,//销售单code
                     "order_id" => $datainfo,
-                    "order_status" => $data['status'], "before_status" => 0
+                    "order_status" => $data['status'],
+                    "before_status" => 0,
+                    'holder_id' => $data['apply_id']
                 ]);
                 $old_zx_status = $zx['status'];
                 $sa = Db::name("consult_info")->where($zx)->save(["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
@@ -1184,7 +1192,9 @@ class Sale extends Base
                                     "order_type" => 'CKD',
                                     "order_code" => $outCode,//出库单号
                                     "order_id" => $ou,
-                                    "order_status" => 0, "before_status" => 0
+                                    "order_status" => 0,
+                                    "before_status" => 0,
+                                    'holder_id'=>$out['apply_id'],
                                 ]);
 
                                 //将发货编号添加到台账中
@@ -1558,7 +1568,9 @@ class Sale extends Base
                 "order_type" => 'XSQRD',
                 "order_code" => $orderCode,
                 "order_id" => $datainfo,
-                "order_status" => 0, "before_status" => 0
+                "order_status" => 0,
+                "before_status" => 0,
+                'holder_id' => $datas['apply_id']
             ]);
             $bol = $this->createCgd($cgd, $standing_book_data);
             if ($bol == false) {
@@ -1697,7 +1709,9 @@ class Sale extends Base
                             "order_type" => 'CKD',
                             "order_code" => $outCode,
                             "order_id" => $ou,
-                            "order_status" => 0, "before_status" => 0
+                            "order_status" => 0,
+                            "before_status" => 0,
+                            'holder_id'=>$out['apply_id'],
                         ]);
                         $order['send_num'] += $value['receipt_quantity'];
                         $order['wsend_num'] -= $value['receipt_quantity'];
@@ -1843,7 +1857,9 @@ class Sale extends Base
                 "order_type" => 'XSQRD',
                 "order_code" => $orderCode,
                 "order_id" => $datainfo,
-                "order_status" => 0, "before_status" => 0
+                "order_status" => 0,
+                "before_status" => 0,
+                'holder_id' => $datas['apply_id']
             ]);
             $cgd = [
                 "supplierNo" => $good['supplierNo'],
@@ -2009,7 +2025,9 @@ class Sale extends Base
                                 "order_type" => 'CKD',
                                 "order_code" => $outCode,//出库单号
                                 "order_id" => $ou,
-                                "order_status" => 0, "before_status" => 0
+                                "order_status" => 0,
+                                "before_status" => 0,
+                                'holder_id'=>$out['apply_id'],
                             ]);
                         }
                     } else {
@@ -2454,7 +2472,8 @@ class Sale extends Base
         if ($str) {
             $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']];
+            $order = ["order_type" => 'XSQRD', "order_code" => $ed['orderCode'], "order_id" => $id, "order_status" => $ed['status'],'holder_id' => $ed['apply_id']
+            ];
             ProcessOrder::workdel($order);
             return error_show(0, "删除成功");
         } else {
@@ -2501,12 +2520,12 @@ class Sale extends Base
             }
 
         }
-        $apply_id = GetUserInfo($token);
-        if (empty($apply_id) || $apply_id['code'] != 0) {
-            return error_show(1002, "申请人数据不存在");
-        }
-        $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
-        $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
+//        $apply_id = GetUserInfo($token);
+//        if (empty($apply_id) || $apply_id['code'] != 0) {
+//            return error_show(1002, "申请人数据不存在");
+//        }
+        $rm = $this->uid;
+        $ri = $this->uname;
 
         Db::startTrans();
         try {
@@ -2517,7 +2536,7 @@ class Sale extends Base
             if ($st) {
                 $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" => "XSQRD", "order_code" => $dio['orderCode'], "order_id" => $id, "order_status" => $dio['status'], "before_status" => 1];
+                $order = ["order_type" => "XSQRD", "order_code" => $dio['orderCode'], "order_id" => $id, "order_status" => $dio['status'], "before_status" => 1,'holder_id' => $dio['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'], $order);
                 if ($status == 3 && $dio['order_type'] == 1) {
                     $dn = Db::name('sale_info')->where(['orderCode' => $st['orderCode']])->select();
@@ -2636,7 +2655,9 @@ class Sale extends Base
                                     "order_type" => 'CKD',
                                     "order_code" => $outCode,//出库单号
                                     "order_id" => $datainfo,
-                                    "order_status" => 0, "before_status" => 0
+                                    "order_status" => 0,
+                                    "before_status" => 0,
+                                    'holder_id'=>$data['apply_id'],
                                 ]);
                             }
                         }
@@ -2728,7 +2749,7 @@ class Sale extends Base
             if ($datainfo) {
                 $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'], "before_status" => 0];
+                $order = ["order_type" => "XSQRD", "order_code" => $etid['orderCode'], "order_id" => $id, "order_status" => $data['status'], "before_status" => 0,'holder_id'=>$etid['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'], $order);
                 foreach ($vr as $value) {
                     $tm = [];
@@ -2838,7 +2859,8 @@ class Sale extends Base
             if ($datainfo > 0) {
                 $stx = ["order_code" => $outCode, "status" => $status, "action_remark" => '', "action_type" => "create"];
                 ActionLog::logAdd($this->post['token'], $stx, $der['order_type'] == 1 ? "CKD" : 'ZXCKD', $status, $data);
-                $order = ["order_type" => "CKD", "order_code" => $outCode, "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0];
+                $order = ["order_type" => "CKD", "order_code" => $outCode, "order_id" => $datainfo, "order_status" => $data['status'], "before_status" => 0,                                    'holder_id'=>$data['apply_id']
+                ];
                 ProcessOrder::AddProcess($this->post['token'], $order);
                 if ($status == 1) {
                     $item = $der['status'];
@@ -2855,7 +2877,7 @@ class Sale extends Base
                     $stx = ["order_code" => $orderCode, "status" => $item, "action_remark" => '', "action_type" => "edit"];
 
                     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'], "before_status" => 0];
+                    $order = ["order_type" => "XSQRD", "order_code" => $orderCode, "order_id" => $der['id'], "order_status" => $data['status'], "before_status" => 0,'holder_id'=>$der['apply_id']];
 
                     ProcessOrder::AddProcess($this->post['token'], $order);
                 }
@@ -2904,7 +2926,7 @@ class Sale extends Base
             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'], "before_status" => 0];
+                $order = ["order_type" => "CKD", "order_code" => $outCode, "order_id" => $codeinfo['id'], "order_status" => $codeinfo['status'], "before_status" => 0,            'holder_id'=>$codeinfo['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'], $order);
                 if ($status == 1) {
                     $stokc = Db::name("good_stock")->where(['spuCode' => $codeinfo['spuCode'], "wsm_code" => $codeinfo['wsm_code'],
@@ -2938,9 +2960,8 @@ class Sale extends Base
                         return error_show(1003, "更新失败");
                     }
                     $stx = ["order_code" => $dr['orderCode'], "status" => $item, "action_remark" => '', "action_type" => "edit"];
-                    ActionLog::logAdd($this->post['token'], $stx, $dr['order_type'] == 2 ? "ZXQRD" : "XSQRD", $dr['status'],
-                        $dr);
-                    $order = ["order_type" => "XSQRD", "order_code" => $dr['orderCode'], "order_id" => $dr['id'], "order_status" => $dr['status'], "before_status" => 0];
+                    ActionLog::logAdd($this->post['token'], $stx, $dr['order_type'] == 2 ? "ZXQRD" : "XSQRD", $dr['status'],$dr);
+                    $order = ["order_type" => "XSQRD", "order_code" => $dr['orderCode'], "order_id" => $dr['id'], "order_status" => $dr['status'], "before_status" => 0, 'holder_id' => $dr['apply_id']];
                     ProcessOrder::AddProcess($this->post['token'], $order);
 
                     //商品变动日志表，good_log_code字段存储销售订单编号
@@ -3633,7 +3654,9 @@ class Sale extends Base
                         "order_type" => 'CKD',
                         "order_code" => $data['outCode'],//出库单号
                         "order_id" => $datainfo,
-                        "order_status" => $data['status'], "before_status" => 0
+                        "order_status" => $data['status'],
+                        "before_status" => 0,
+                        'holder_id'=>$data['apply_id']
                     ]);
 
                     //维护台账记录
@@ -3730,6 +3753,7 @@ class Sale extends Base
                     "before_status" => $old_outinfo_status,
                     'wait_id'=>$outinfo['apply_id'],
                     'wait_name'=>$outinfo['apply_name'],
+                    'holder_id'=>$outinfo['apply_id'],
                 ]);
                 if($einfo['wsend_num']<$outinfo['send_num']){
                     Db::rollback();
@@ -3761,7 +3785,9 @@ class Sale extends Base
                     "order_type" => 'XSQRD',
                     "order_code" => $einfo['orderCode'],//出库单号
                     "order_id" => $einfo['id'],
-                    "order_status" => $einfo['status'], "before_status" => $orderstatus
+                    "order_status" => $einfo['status'],
+                    "before_status" => $orderstatus,
+                    'holder_id' => $einfo['apply_id']
                 ]);
 
                 $stokc = Db::name("good_stock")->where(['spuCode' => $einfo['good_code'], "wsm_code" => $outinfo['wsm_code'], "is_del" => 0])->find();
@@ -4275,7 +4301,7 @@ class Sale extends Base
         try {
 
             $rs = Db::name('order_out')
-                ->field('id,orderCode')
+                ->field('id,orderCode,apply_id')
                 ->where(['outCode' => $outCode, 'status' => 2, "is_del" => 0])
                 ->find();
 
@@ -4313,7 +4339,8 @@ class Sale extends Base
                 "order_id" => $rs['id'],
                 "order_status" => 3,
                 "order_type" => 'CKD',
-                "before_status" => 2
+                "before_status" => 2,
+                'holder_id' => $rs['apply_id']
             ]);
 
             if ($res_order_out) {
@@ -4363,9 +4390,9 @@ class Sale extends Base
 
 
 
-        $user = GetUserInfo($param['token']);
-        $createrid = isset($user['data']['id']) ? $user['data']['id'] : 0;
-        $creater = isset($user['data']['nickname']) ? $user['data']['nickname'] : '';
+//        $user = GetUserInfo($param['token']);
+        $createrid = $this->uid;
+        $creater = $this->uname;
 
         //所有发货单信息
         $order_out_infos = Db::name("order_out")
@@ -4389,7 +4416,7 @@ class Sale extends Base
                 $sale_infos = Db::name("sale")
                     ->where('orderCode', $order_out_infos[$value['outCode']]['orderCode'])
                     ->where('is_del', 0)
-                    ->column('id,send_num,wsend_num,status,good_code,order_source', 'orderCode');
+                    ->column('id,send_num,wsend_num,status,good_code,order_source,apply_id', 'orderCode');
 
                 if (!isset($sale_infos[$order_out_infos[$value['outCode']]['orderCode']])) throw new Exception($value['outCode'] . '该发货单对应的销售单未找到');
 
@@ -4433,6 +4460,7 @@ class Sale extends Base
                         "before_status" => $order_out_infos[$value['outCode']]['status'],
                         'wait_id' => $order_out_infos[$value['outCode']]['apply_id'],
                         'wait_name' => $order_out_infos[$value['outCode']]['apply_name'],
+                        'holder_id' => $order_out_infos[$value['outCode']]['apply_id'],
                     ]);
 
 
@@ -4461,7 +4489,9 @@ class Sale extends Base
                         "order_type" => 'XSQRD',
                         "order_code" => $order_out_infos[$value['outCode']]['orderCode'],//出库单号
                         "order_id" => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['id'],
-                        "order_status" => $einfo['status'], "before_status" => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['status']
+                        "order_status" => $einfo['status'],
+                        "before_status" => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['status'],
+                        'holder_id' => $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['apply_id']
                     ]);
 
                     //【库存】

app/admin/controller/Salezx.php

@@ -223,7 +223,8 @@ class Salezx extends \app\BaseController
                                    "order_code" => $outCode,//出库单号
                                    "order_id" => $ou,
                                    "order_status" => $out['status'],
-                                   'before_status'=>0
+                                   'before_status'=>0,
+                                   'holder_id' => $out['apply_id']
                                ]);
 
                                $standing_bood_data['outCode'][]=$outCode;
@@ -248,7 +249,8 @@ class Salezx extends \app\BaseController
                     "order_type" => 'XSQRD',
                     "order_code" => $orderCode,//销售单code
                     "order_id" => $datainfo,
-                    "order_status" => 0
+                    "order_status" => 0,
+                    'holder_id=' => $data['apply_id']
                 ]);
 
 
@@ -586,7 +588,7 @@ class Salezx extends \app\BaseController
             if($datainfo) {
                 $st = ["order_code"=>$der['outCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
                 ActionLog::logAdd($this->post['token'],$st,"CKD",1,$der);
-                $ord=["order_type"=>"CKD","order_code"=>$der['outCode'],"order_id"=>$der['id'], "order_status"=>$der['status']];
+                $ord=["order_type"=>"CKD","order_code"=>$der['outCode'],"order_id"=>$der['id'], "order_status"=>$der['status'],'holder_id' => $der['apply_id']];
                 ProcessOrder::AddProcess($this->post['token'],$ord);
 //                    $send =Db::name("order_out")->where(["wsm_code"=>$der['wsm_code'],'orderCode'=>$der['orderCode']])->sum("send_num");
 //                    $order['send_num']+= $der['send_num'];
@@ -761,7 +763,7 @@ class Salezx extends \app\BaseController
                 }
                 $sio = ["order_code"=>$outCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
                 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];
+                $order=["order_type"=>"CKD","order_code"=>$data['outCode'],"order_id"=>$datainfo,"order_status"=>$data['status'],'before_status'=>0, 'holder_id' => $data['apply_id']];
                 ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri],$order);
                 $item = $der['status'];
                 $der['send_num']+= $receipt_quantity;
@@ -786,12 +788,13 @@ class Salezx extends \app\BaseController
                         "order_type" => 'XSQRD',
                         "order_code" => $der['orderCode'],//销售单code
                         "order_id" => $der['id'],
-                        "order_status" => $der['status']
+                        "order_status" => $der['status'],
+                        'holder_id=' => $der['apply_id']
                     ]);
                 }
             $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']];
+            $order=["order_type"=>"CKD","order_code"=>$orderCode,"order_id"=>$der['id'],"order_status"=>$der['status'], 'holder_id' => $data['apply_id']];
             ProcessOrder::AddProcess($this->post['token'],$order);
                 Db::commit();
                 return error_show(0,"创建成功");

app/command/ImportOrderFromCHandleData.php

@@ -402,7 +402,8 @@ class ImportOrderFromCHandleData extends Command
                                         "order_code" => $outCode,//出库单号
                                         "order_id" => 0,
                                         "order_status" => 0,
-                                        "before_status" => 0
+                                        "before_status" => 0,
+                                        'holder_id' => $out['apply_id']
                                     ]);
 
                                     $standing_book_data['outCode'] = $outCode;