xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/inv' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2026-02-11 15:10:39 +08:00
parent 466519378e 9b55bcce79
commit e4fb1fda2c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/InvRequisitionItemReturnService.php
+6
View File
@@ -2,9 +2,11 @@
namespace app\common\service; namespace app\common\service;
use app\common\model\InvItem;
use app\common\model\InvRequisition; use app\common\model\InvRequisition;
use app\common\model\InvRequisitionItem; use app\common\model\InvRequisitionItem;
use app\common\model\InvRequisitionReturn; use app\common\model\InvRequisitionReturn;
use app\common\model\User;
use app\common\service\UserService; use app\common\service\UserService;
use app\common\validate\InvRequisitionItemReturnValidate; use app\common\validate\InvRequisitionItemReturnValidate;
use app\common\traits\crud\CrudServiceTrait; use app\common\traits\crud\CrudServiceTrait;
@@ -127,6 +129,8 @@ class InvRequisitionItemReturnService
if (!isset($newReqItems[$reqItemId])) { if (!isset($newReqItems[$reqItemId])) {
continue; continue;
} }
$item = InvItem::where('id', $reqItem['item_id'])->first();
$manage = User::where('id',$item['manage_user_id'])->first();
$arr[] = [ $arr[] = [
'requisition_id' => $data['requisition_id'], 'requisition_id' => $data['requisition_id'],
@@ -136,6 +140,8 @@ class InvRequisitionItemReturnService
'apply_user_name' => $user['user']['name'], 'apply_user_name' => $user['user']['name'],
'return_qty' => $newReqItems[$reqItemId]['return_qty'] ?: '1', 'return_qty' => $newReqItems[$reqItemId]['return_qty'] ?: '1',
'apply_remark' => $data['apply_remark'] ?? '', 'apply_remark' => $data['apply_remark'] ?? '',
'handler_id' => $item['manage_user_id'] ?? 0,
'handler_name' => $manage['name'] ?? '',
//'attachment' => $newReqItems[$reqItemId]['attachment'], //'attachment' => $newReqItems[$reqItemId]['attachment'],
//'return_at' => time(), //'return_at' => time(),
'return_at' => $data['return_at'], 'return_at' => $data['return_at'],