wugg 2 years ago
parent
commit
ceada4fe3e
2 changed files with 2 additions and 1 deletions
  1. 1 1
      app/admin/controller/Menu.php
  2. 1 0
      app/admin/controller/Purchin.php

+ 1 - 1
app/admin/controller/Menu.php

@@ -256,7 +256,7 @@ class Menu extends BaseController
         }
 
         $result =  Db::name("action")->delete($menu);
-        $orde = ["order_code"=>$menu['menu_name'],"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
+        $orde = ["order_code"=>$menu['id'],"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
         ActionLog::logAdd($token,$orde,"action",0,$orde);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }

+ 1 - 0
app/admin/controller/Purchin.php

@@ -658,6 +658,7 @@ class Purchin extends BaseController
                     ActionLog::logAdd($this->post['token'],$stn,"RKD",5,$stn);
                     $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>5,"order_type"=>'RKD'];
                     ProcessOrder::AddProcess($this->post['token'],$process);
+
                     Db::commit();
                     return  app_show(0,"退货发货成功");
                 }else{