Merge branch 'feature/inv' into develop

app/common/service/InvRequisitionItemReturnService.php

@@ -2,9 +2,11 @@
 
 namespace app\common\service;
 
+use app\common\model\InvItem;
 use app\common\model\InvRequisition;
 use app\common\model\InvRequisitionItem;
 use app\common\model\InvRequisitionReturn;
+use app\common\model\User;
 use app\common\service\UserService;
 use app\common\validate\InvRequisitionItemReturnValidate;
 use app\common\traits\crud\CrudServiceTrait;
@@ -127,6 +129,8 @@ class InvRequisitionItemReturnService
                 if (!isset($newReqItems[$reqItemId])) {
                     continue;
                 }
+                $item = InvItem::where('id', $reqItem['item_id'])->first();
+                $manage = User::where('id',$item['manage_user_id'])->first();
                 
                 $arr[] = [
                     'requisition_id'        => $data['requisition_id'],
@@ -136,6 +140,8 @@ class InvRequisitionItemReturnService
                     'apply_user_name'       => $user['user']['name'],
                     'return_qty'            => $newReqItems[$reqItemId]['return_qty'] ?: '1',
                     'apply_remark'          => $data['apply_remark'] ?? '',
+                    'handler_id'            => $item['manage_user_id'] ?? 0,
+                    'handler_name'          => $manage['name'] ?? '',
                     //'attachment'            => $newReqItems[$reqItemId]['attachment'],
                     //'return_at'             => time(),
                     'return_at'             => $data['return_at'],