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

Merge branch 'feature/fin' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-10-30 17:54:43 +08:00
parent 695c398962 d737281283
commit 9f167ad526
4 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/FinPaymentApplyService.php
+6
View File
@@ -87,9 +87,12 @@ class FinPaymentApplyService
{
$data['apply_no'] = $this->generateUniqueApplyNo();
$data['doc_user_id'] = $request->user->uid;
$data['voucher_file'] = json_encode($data['voucher_file']);
$data['submit_files'] = json_encode($data['submit_files']);
redis::set('stock_' . $data['doc_user_id'], json_encode($request->post('stock')), 'EX', 30);
unset($data['stock']);
if($data['voucher_file'] == '[]' || $data['voucher_file'] == '{}' )
$data['voucher_file'] = '';
if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' )
$data['submit_files'] = '';
return $data;
@@ -118,6 +121,9 @@ class FinPaymentApplyService
$data['submit_files'] = json_encode($data['submit_files']);
if($data['submit_files'] == '[]' || $data['submit_files'] == '{}' )
$data['submit_files'] = '';
$data['voucher_file'] = json_encode($data['voucher_file']);
if($data['voucher_file'] == '[]' || $data['voucher_file'] == '{}' )
$data['voucher_file'] = '';
return $data;
}
app/common/service/FinReceiptService.php
+5 -1
View File
@@ -114,6 +114,8 @@ class FinReceiptService
$data['arrived_at'] = strtotime( $data['arrived_at']);
$data['created_by'] = $request->user->uid;
$data['updated_by'] = $request->user->uid;
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' )
$data['fx_receipt_file'] = '';
return $data;
}
@@ -132,7 +134,9 @@ class FinReceiptService
$data['arrived_at'] = strtotime($data['arrived_at']);
if(isset($data['received_at']))
$data['received_at'] = strtotime($data['received_at']);
if($data['fx_receipt_file'] == '[]' || $data['fx_receipt_file'] == '{}' )
$data['fx_receipt_file'] = '';
return $data;
}
public function afterServiceUpdate($res)