Merge branch 'feature/inv' into develop

This commit is contained in:
2026-02-06 14:02:14 +08:00
@@ -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\InvRequisitionItemReturnAttachment;
use app\common\traits\crud\CrudControllerTrait;
use app\common\service\InvRequisitionItemReturnService;
use support\Request;
@@ -96,6 +97,8 @@ class InvRequisitionItemReturnController extends BaseController
}
if (isset($data['return_at']))
$data['return_at'] = date('Y-m-d H:i:s', $data['return_at']);
if (isset($data['id']))
$data['return_attachment'] = InvRequisitionItemReturnAttachment::where('return_id', $data['id'])->get();
/*if (isset($data['created_at']))
$data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
if (isset($data['updated_at']))