归还详情与编辑

app/mobile/controller/InvRequisitionItemReturnController.php

@@ -4,6 +4,7 @@ namespace app\mobile\controller;
 use app\common\controller\BaseController;
 use app\common\model\Corp;
 use app\common\model\InvItem;
+use app\common\model\InvRequisitionItem;
 use app\common\traits\crud\CrudControllerTrait;
 use app\common\service\InvRequisitionItemReturnService;
 use support\Request;
@@ -62,6 +63,26 @@ class InvRequisitionItemReturnController extends BaseController
          return $data;
      }
 
+    /**
+     * 获取详情
+     *
+     * @param Request $request 请求对象
+     * @param int|string $id 资源 ID
+     * @return mixed 返回资源详情数据
+     */
+    public function show(Request $request)
+    {
+        try {
+            $raw = $this->service->serviceShow($request);
+            $data = $this->transformData($raw, method_exists($this, 'showFormat')
+                ? [$this, 'showFormat']
+                : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
     /**
      * 列表页数据格式化
      *
@@ -70,23 +91,37 @@ class InvRequisitionItemReturnController extends BaseController
      */
      protected function showFormat($data)
      {
-         if (isset($data['item_id'])){
-             $data['item'] = InvItem::where('id', $data['item_id'])->get();
-             foreach ($data['item'] as $key => $item){
-                 $corpId = InvItem::where('id', $item->item_id)->value('company_id');
-                 $item['company_name'] = Corp::where('id', $corpId)->value('name');
-             }
+         foreach ($data['item_return'] as $key => $item){
+             $data['item_return'][$key]['requisition_item'] = InvRequisitionItem::where('id', $item['requisition_item_id'])->first();
          }
          if (isset($data['return_at']))
              $data['return_at'] = date('Y-m-d H:i:s', $data['return_at']);
-         if (isset($data['created_at']))
+         /*if (isset($data['created_at']))
              $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
          if (isset($data['updated_at']))
-             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);*/
          return $data;
      }
 
 
+    /**
+     * 更新
+     *
+     * @param Request $request 请求对象
+     * @return mixed 返回更新成功的数据或信息
+     */
+    public function update(Request $request)
+    {
+        try {
+            $data = $this->validate($this->service->getValidator(), $request->post(), 'update');
+            $res = $this->service->serviceUpdate($request, $data);
+            return $this->success([], '更新成功');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+
     /**
      * 物品归还确认
      *