diff --git a/app/mobile/controller/InvRequisitionItemReturnController.php b/app/mobile/controller/InvRequisitionItemReturnController.php index e7604f1..db29da5 100644 --- a/app/mobile/controller/InvRequisitionItemReturnController.php +++ b/app/mobile/controller/InvRequisitionItemReturnController.php @@ -5,6 +5,7 @@ use app\common\controller\BaseController; use app\common\model\Corp; use app\common\model\InvItem; use app\common\model\InvRequisitionItem; +use app\common\model\InvRequisitionItemReturn; use app\common\model\InvRequisitionItemReturnAttachment; use app\common\service\OssService; use app\common\traits\crud\CrudControllerTrait; @@ -49,11 +50,10 @@ class InvRequisitionItemReturnController extends BaseController */ protected function indexFormat($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'); + if(isset($data['id'])){ + $data['return_item'] = InvRequisitionItemReturn::where('return_id', $data['id'])->get(); + foreach ($data['return_item'] as $key => $value) { + $data['return_item'][$key]['item'] = InvItem::where('id', $data['item_id'])->get(); } } if (isset($data['return_at']))