Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/AfterChild.php

@@ -537,7 +537,7 @@ class AfterChild extends Base
 
         $info = Db::name('order_return_child')
             ->alias('a')
-            ->where(['a,is_del' => 0, 'a.id' => $param['id']])
+            ->where(['a.is_del' => 0, 'a.id' => $param['id']])
             ->findOrEmpty();
 
         if (empty($info)) return json_show(1004, '该退货工单不存在');

app/admin/controller/ReorderChild.php

@@ -271,4 +271,21 @@ class ReorderChild extends Base
 
     }
 
+    //详情
+    public function info()
+    {
+        $param = $this->request->only(['id'], 'post', 'trim');
+
+        $val = Validate::rule(['id' => 'require|number|gt:0']);
+
+        if ($val->check($param) == false) return json_show(1004, $val->getError());
+
+        $info = Db::name('sale_return_child')
+            ->where(['is_del' => 0, 'id' => $param['id']])
+            ->findOrEmpty();
+
+        return empty($info) ? json_show(1004, '该退货工单不存在') : json_show(0, '获取退货工单详情成功', $info);
+
+    }
+
 }

app/admin/route/app.php

@@ -334,6 +334,7 @@ Route::rule('reorderExport', 'admin/Reorder/export');//退货单导出
 Route::rule('reorder_child_add', 'admin/ReorderChild/add');//退货工单创建
 Route::rule('reorder_child_list', 'admin/ReorderChild/getList');//退货工单列表
 Route::rule('reorder_child_receive', 'admin/ReorderChild/receive');//退货工单库管收货
+Route::rule('reorder_child_info', 'admin/ReorderChild/info');//退货工单详情
 
 Route::rule('salezxcreate', 'admin/Salezx/create');
 Route::rule('salezxedit', 'admin/Salezx/edit');