ad

app/admin/controller/After.php

@@ -95,7 +95,7 @@ class After extends Base
             ];
             $create = Db::name("order_return")->insert($in,true);
             $orde = ["order_code"=>$returnCode,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$orde,'SHD',0,$orde);
+            ActionLog::logAdd($this->post['token'],$orde,'SHD',1,$orde);
             if($create>0){
                     $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>$in['status'],"order_type"=>'SHD'];
                     ProcessOrder::AddProcess($token,$process);

app/admin/controller/Check.php

@@ -312,7 +312,7 @@ public function create(){
 //        }
         if($da){
             $orde = ["order_code"=>$check_code,"status"=>$data['status'],"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$orde,'qrd',$data['status'],$orde);
+            ActionLog::logAdd($this->post['token'],$orde,'PDD',$data['status'],$orde);
             $process=["order_code"=>$check_code,"order_id"=>$da,"order_status"=>$data['status'],"order_type"=>'PDD'];
             ProcessOrder::AddProcess($this->post['token'],$process);
            Db::commit();
@@ -455,7 +455,8 @@ public function edit()
         $sv = Db::name('good_check')->update(['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
         if($sv){
             $orde = ["order_code"=>$deln['check_code'],"status"=>$deln['status'],"action_remark"=>'',"action_type"=>"delete"];
-            ActionLog::logAdd($this->post['token'],$orde,'qrd',$deln['status'],['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
+            ActionLog::logAdd($this->post['token'],$orde,'PDD',$deln['status'],['id'=>$id,'is_del'=>1,
+                'updatetime'=>date("Y-m-d H:i:s")]);
             $process=["order_code"=>$deln['check_code'],"order_status"=>$deln['status'],"order_type"=>'PDD'];
             ProcessOrder::workdel($process);
             return error_show(0,"删除成功");

app/admin/controller/Goodup.php

@@ -1211,7 +1211,7 @@ class Goodup extends Base
                     ], "SPSX",$tmp['exam_status'],$tmp);
 
                     ProcessOrder::AddProcess($this->post['token'], [
-                        "order_type" => 'SPCB',
+                        "order_type" => 'SPSX',
                         "order_code" =>$skuCode,//咨询单详情编号
                         "order_id" => $create,
                         "order_status" =>$tmp['exam_status']

app/admin/controller/Reorder.php

@@ -873,11 +873,11 @@ class Reorder extends Base
             ];
             $create = Db::name("sale_return")->insert($in,true);
             if($create>0) {
-                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'ZXTHD'];
+                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'XSTHD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 $ste = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',
                     "action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$ste,"ZXTHD",3,$in);
+                ActionLog::logAdd($this->post['token'],$ste,"XSTHD",3,$in);
                 if ($order['send_type'] == 1) {
                     $wsend = Db::name("order_out")->where(['orderCode' => $ordeCode, "status" => 1, "order_type"
                     =>2])->select();

app/admin/controller/Resign.php

@@ -341,7 +341,7 @@ class Resign extends Base
             $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'],"order_status"=>$info['status']];
             ProcessOrder::AddProcess($this->post['token'],$order);
             $ste = ["order_code"=>$info['bk_code'],"status"=>$info['status'],"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$ste,"BHD",1,$up);
+            ActionLog::logAdd($this->post['token'],$ste,"BHD",$info['status'],$up);
             return app_show(0,"更新成功",['bk_code'=>$info['bk_code']]);
         }else{
             return error_show(1005,"更新失败");
@@ -364,7 +364,7 @@ class Resign extends Base
             $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'],"order_status"=>$info['status']];
             ProcessOrder::workdel($order);
             $ste = ["order_code"=>$info['bk_code'],"status"=>$info['status'],"action_remark"=>'',"action_type"=>"delete"];
-            ActionLog::logAdd($this->post['token'],$ste,"BHD",0,$info);
+            ActionLog::logAdd($this->post['token'],$ste,"BHD",$info['status'],$info);
         }
         return $up ? app_show(0,"删除成功"):error_show(1005,"删除失败");
     }

app/admin/controller/Sale.php

@@ -3226,8 +3226,21 @@ class Sale extends Base
         try{
             $up =Db::name("order_out")->save($outinfo);
             if($up){
+                //修改状态，添加待办
+                ActionLog::logAdd($this->post['token'], [
+                    "order_code" => $outinfo['outCode'],//出库单号
+                    "status" => $old_outinfo_status,//这里的status是之前的值
+                    "action_remark" => '',//备注
+                    "action_type" => "edit"//新建create，编辑edit，更改状态status
+                ], "CKD", $outinfo['status'], $outinfo);
 
-
+                ProcessOrder::AddProcess($this->post['token'], [
+                    "order_type" => 'CKD',
+                    "order_code" => $outinfo['outCode'],//出库单号
+                    "order_id" => $outinfo['id'],
+                    "order_status" => $outinfo['status']
+                ]);
+                    $orderstatus= $einfo['status'];
                     $einfo['send_num']+=$outinfo['send_num'];
                     $einfo['wsend_num']-=$outinfo['send_num'];
                     $einfo['status']=$einfo['wsend_num']==0?2:($einfo['send_num']==0?0:1);
@@ -3241,17 +3254,17 @@ class Sale extends Base
 //                }
                 //修改状态，添加待办
                 ActionLog::logAdd($this->post['token'], [
-                    "order_code" => $outinfo['outCode'],//出库单号
-                    "status" => $old_outinfo_status,//这里的status是之前的值
+                    "order_code" => $einfo['orderCode'],//出库单号
+                    "status" => $orderstatus,//这里的status是之前的值
                     "action_remark" => '',//备注
                     "action_type" => "edit"//新建create，编辑edit，更改状态status
-                ], "CKD", $outinfo['status'], $outinfo);
+                ], "XSQRD", $einfo['status'], $einfo);
 
                 ProcessOrder::AddProcess($this->post['token'], [
-                    "order_type" => 'CKD',
-                    "order_code" => $outinfo['outCode'],//出库单号
-                    "order_id" => $outinfo['id'],
-                    "order_status" => $outinfo['status']
+                    "order_type" => 'XSQRD',
+                    "order_code" =>$einfo['orderCode'],//出库单号
+                    "order_id" => $einfo['id'],
+                    "order_status" => $einfo['status']
                 ]);
 
                 $stokc =Db::name("good_stock")->where(['spuCode'=>$einfo['good_code'],"wsm_code"=>$outinfo['wsm_code'],"is_del"=>0])->find();