Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Purchin.php

@@ -332,7 +332,7 @@ class Purchin extends BaseController
                                         foreach ($out as $k => $v_outCode) {
                                             //修改状态，添加待办
                                             ActionLog::logAdd($this->post['token'], [
-                                                "order_code" => $v_outCode,//出库单号
+                                                "order_code" => $v_outCode['outCode'],//出库单号
                                                 "status" => 0,//这里的status是之前的值
                                                 "action_remark" => '',//备注
                                                 "action_type" => "status"//新建create，编辑edit，更改状态status
@@ -340,7 +340,7 @@ class Purchin extends BaseController
 
                                             ProcessOrder::AddProcess($this->post['token'], [
                                                 "order_type" => 'CKD',
-                                                "order_code" => $v_outCode,//出库单号
+                                                "order_code" => $v_outCode['outCode'],//出库单号
                                                 "order_id" => 0,
                                                 "order_status" => 1
                                             ]);