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-06 15:47:22 +08:00
parent 488d510ad0 74ca1a5d8c
commit eeab4934cd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/mobile/controller/InvRequisitionItemReturnController.php
+5 -5
View File
@@ -5,6 +5,7 @@ use app\common\controller\BaseController;
use app\common\model\Corp; use app\common\model\Corp;
use app\common\model\InvItem; use app\common\model\InvItem;
use app\common\model\InvRequisitionItem; use app\common\model\InvRequisitionItem;
use app\common\model\InvRequisitionItemReturn;
use app\common\model\InvRequisitionItemReturnAttachment; use app\common\model\InvRequisitionItemReturnAttachment;
use app\common\service\OssService; use app\common\service\OssService;
use app\common\traits\crud\CrudControllerTrait; use app\common\traits\crud\CrudControllerTrait;
@@ -49,11 +50,10 @@ class InvRequisitionItemReturnController extends BaseController
*/ */
protected function indexFormat($data) protected function indexFormat($data)
{ {
if (isset($data['item_id'])){ if(isset($data['id'])){
$data['item'] = InvItem::where('id', $data['item_id'])->get(); $data['return_item'] = InvRequisitionItemReturn::where('return_id', $data['id'])->get();
foreach ($data['item'] as $key => $item){ foreach ($data['return_item'] as $key => $value) {
$corpId = InvItem::where('id', $item->item_id)->value('company_id'); $data['return_item'][$key]['item'] = InvItem::where('id', $data['item_id'])->get();
$item['company_name'] = Corp::where('id', $corpId)->value('name');
} }
} }
if (isset($data['return_at'])) if (isset($data['return_at']))