ad

app/admin/controller/Purchin.php

@@ -310,7 +310,8 @@ class Purchin extends BaseController
                           "addtime"=>date("Y-m-d H:i:s"),
                           "updatetime"=>date("Y-m-d H:i:s"),
                       ];
-                        $order = ["order_code"=>$good['good_type_code'],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
+                        $order = ["order_code"=>$good['good_type_code'],"status"=>1,"action_remark"=>'',
+                            "action_type"=>"create"];
 
                     }else{
                         $order = ["order_code"=>$good['good_type_code'],"status"=>1,"action_remark"=>'', "action_type"=>"edit"];
@@ -320,7 +321,7 @@ class Purchin extends BaseController
                     $good['updatetime'] = date("Y-m-d H:i:s");
                     $upd=  Db::name("good_stock")->save($good);
                     if($upd){
-                        ActionLog::logAdd($this->post['token'],$order,"gst", 1,$info  );
+                        ActionLog::logAdd($this->post['token'],$order,"gst", 1,$good  );
                         Db::commit();
                         return app_show(0,'商品入库成功');
                     }else{
@@ -336,7 +337,7 @@ class Purchin extends BaseController
 
         }catch (\Exception $e){
             Db::rollback();
-            return error_show(1002,"状态修改失败");
+            return error_show(1002,$e->getMessage());
         }
 
     }

app/admin/model/ActionLog.php

@@ -37,7 +37,7 @@ class ActionLog extends Model
             "order_type"=>$type,
             "action_type"=>isset($order['action_type']) ? trim($order['action_type']) :"",
             "action_data"=>json_encode($post),
-            "order_status"=>isset($order['status']) ? trim($order['status']) :"",
+            "order_status"=>isset($order['status']) ? $order['status'] :"",
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
         ];