From 6cecd87e05c4f9efa38513ac33941d4075d20fbc Mon Sep 17 00:00:00 2001 From: yueyang <2495544247@qq.com> Date: Tue, 17 Nov 2026 10:47:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0OA=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=8F=8A=E5=87=BA=E7=BA=B3=E6=89=93=E6=AC=BE=E6=8A=AC=E5=A4=B4?= =?UTF-8?q?=20(#1222)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...t_titles_to_ding_process_detail_mirror.php | 50 +++++++++++++++++++ .../Http/Controllers/ProcessDetails.php | 3 ++ .../DingProcessDetailMirrorSynchronizer.php | 26 ++++++++-- .../process-details-content.blade.php | 6 ++- .../Business/ProcessDetailsPageTest.php | 35 +++++++++++++ .../DingProcessDetailMirrorRepositoryTest.php | 6 +++ ...ingProcessDetailMirrorSynchronizerTest.php | 22 ++++++++ .../ProcessDetailsPageDataTest.php | 2 + 8 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 database/migrations/2026_11_17_105000_add_invoice_and_cashier_payment_titles_to_ding_process_detail_mirror.php diff --git a/database/migrations/2026_11_17_105000_add_invoice_and_cashier_payment_titles_to_ding_process_detail_mirror.php b/database/migrations/2026_11_17_105000_add_invoice_and_cashier_payment_titles_to_ding_process_detail_mirror.php new file mode 100644 index 00000000..03c2854c --- /dev/null +++ b/database/migrations/2026_11_17_105000_add_invoice_and_cashier_payment_titles_to_ding_process_detail_mirror.php @@ -0,0 +1,50 @@ +environment('testing') + || (string) config('system_database.mode', 'bootstrap') === 'bootstrap') { + return; + } + + $schema = Schema::connection($this->connection()); + if (! $schema->hasTable('ding_process_detail_mirror') + || $schema->hasColumn('ding_process_detail_mirror', 'invoice_title')) { + return; + } + + $schema->table('ding_process_detail_mirror', function (Blueprint $table): void { + $table->string('invoice_title', 255)->nullable()->after('purpose'); + $table->string('cashier_payment_title', 255)->nullable()->after('invoice_title'); + }); + } + + public function down(): void + { + if (app()->environment('testing') + || (string) config('system_database.mode', 'bootstrap') === 'bootstrap') { + return; + } + + $schema = Schema::connection($this->connection()); + if (! $schema->hasTable('ding_process_detail_mirror') + || ! $schema->hasColumn('ding_process_detail_mirror', 'invoice_title')) { + return; + } + + $schema->table('ding_process_detail_mirror', function (Blueprint $table): void { + $table->dropColumn(['invoice_title', 'cashier_payment_title']); + }); + } +}; diff --git a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php index f9e6c693..5914160b 100644 --- a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php +++ b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php @@ -84,6 +84,7 @@ class ProcessDetails extends Controller fwrite($stream, "\xEF\xBB\xBF"); $headers = DingProcessDetailMirrorImporter::HEADERS; array_splice($headers, 2, 0, ['发起人部门']); + array_splice($headers, 7, 0, ['发票抬头', '出纳打款抬头']); fputcsv($stream, [...$headers, '付款状态', '付款差额']); $number = 0; @@ -97,6 +98,8 @@ class ProcessDetails extends Controller (string) ($row['status'] ?? ''), (string) ($row['document_type'] ?? ''), (string) ($row['purpose'] ?? ''), + (string) ($row['invoice_title'] ?? ''), + (string) ($row['cashier_payment_title'] ?? ''), (int) ($row['line_no'] ?? 0), (string) ($row['account_code'] ?? ''), (string) ($row['account_name'] ?? ''), diff --git a/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php b/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php index b260527d..52f4d76a 100644 --- a/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php +++ b/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php @@ -1111,6 +1111,8 @@ class DingProcessDetailMirrorSynchronizer $title, '', '', + '', + '', $this->storeName([], $fields), $originator, $documentType, @@ -1274,7 +1276,7 @@ class DingProcessDetailMirrorSynchronizer : []; if ($tableName !== '' && ! $this->emptyTableValue($officialTableValue)) { $officialRows = $this->tableRows($officialTableValue, $workflow, $tableName, $issues); - $rows = $this->mergeOfficialDetailAccountFields($rows, $officialRows); + $rows = $this->mergeOfficialDetailFields($rows, $officialRows); } if ($tableName === '' && (bool) ($process['scalar_detail'] ?? false)) { $rows = [$this->scalarDetailRow($fields)]; @@ -1305,6 +1307,8 @@ class DingProcessDetailMirrorSynchronizer if ($accountName === '') { $accountName = trim((string) ($process['fallback_account_name'] ?? '')); } + $invoiceTitle = trim((string) ($row['开票抬头'] ?? $row['发票抬头'] ?? '')); + $cashierPaymentTitle = trim((string) ($row['出纳打款抬头'] ?? '')); $details[] = $this->detailRecord( $workflow, $process, @@ -1315,6 +1319,8 @@ class DingProcessDetailMirrorSynchronizer $this->purpose($row) ?: (string) ($workflow['title'] ?? ''), $accountCode, $accountName, + $invoiceTitle, + $cashierPaymentTitle, $storeName, $originator, $documentType, @@ -1332,13 +1338,13 @@ class DingProcessDetailMirrorSynchronizer /** * The replica table can lag behind DingTalk's current table definition. - * Keep replica business values and only fill missing account columns. + * Keep replica business values and only fill missing detail columns. * * @param list> $rows * @param list> $officialRows * @return list> */ - private function mergeOfficialDetailAccountFields(array $rows, array $officialRows): array + private function mergeOfficialDetailFields(array $rows, array $officialRows): array { $bySequence = []; foreach ($officialRows as $index => $officialRow) { @@ -1357,7 +1363,15 @@ class DingProcessDetailMirrorSynchronizer if ($officialRow === null) { continue; } - foreach (['科目编码', '科目名称', '店铺', '店铺名称'] as $field) { + foreach ([ + '科目编码', + '科目名称', + '店铺', + '店铺名称', + '开票抬头', + '发票抬头', + '出纳打款抬头', + ] as $field) { if (trim((string) ($row[$field] ?? '')) === '' && trim((string) ($officialRow[$field] ?? '')) !== '') { $row[$field] = (string) $officialRow[$field]; @@ -2069,6 +2083,8 @@ class DingProcessDetailMirrorSynchronizer string $purpose, string $accountCode, string $accountName, + string $invoiceTitle, + string $cashierPaymentTitle, string $storeName, string $originator, string $documentType, @@ -2110,6 +2126,8 @@ class DingProcessDetailMirrorSynchronizer 'cashier_task_started_at' => $taskState['cashier_task_started_at'] ?? null, 'document_type' => mb_substr($documentType, 0, 100), 'purpose' => $purpose, + 'invoice_title' => mb_substr($invoiceTitle, 0, 255), + 'cashier_payment_title' => mb_substr($cashierPaymentTitle, 0, 255), 'account_code' => mb_substr($accountCode, 0, 64), 'account_name' => mb_substr($accountName, 0, 255), 'store_name' => mb_substr($storeName, 0, 500), diff --git a/resources/views/business/pages/financial-operations/process-details-content.blade.php b/resources/views/business/pages/financial-operations/process-details-content.blade.php index b0afc80e..2295eda2 100644 --- a/resources/views/business/pages/financial-operations/process-details-content.blade.php +++ b/resources/views/business/pages/financial-operations/process-details-content.blade.php @@ -1429,6 +1429,8 @@ 已等待 单据类型 用途/摘要 + 发票抬头 + 出纳打款抬头 单据内行号 科目编码 科目名称 @@ -1500,6 +1502,8 @@ {{ $waitText($row->current_task_started_at ?? null) }} {{ $text($row->document_type) }} {{ $text($row->purpose) }} + {{ $text($row->invoice_title ?? null) }} + {{ $text($row->cashier_payment_title ?? null) }} {{ $row->line_no }} {{ $text($row->account_code) }} {{ $text($row->account_name) }} @@ -1514,7 +1518,7 @@ @endif @empty - + 当前筛选条件没有OA流程数据。可以调整月份、单据类型、状态或关键词后重试。 diff --git a/tests/Feature/Business/ProcessDetailsPageTest.php b/tests/Feature/Business/ProcessDetailsPageTest.php index 4d42e67a..c9c930c7 100644 --- a/tests/Feature/Business/ProcessDetailsPageTest.php +++ b/tests/Feature/Business/ProcessDetailsPageTest.php @@ -36,6 +36,8 @@ class ProcessDetailsPageTest extends FeatureTestCase ->format('Y-m-d H:i:s'), 'document_type' => '公摊日常报销', 'purpose' => '办公用品采购', + 'invoice_title' => '江苏简尚品牌管理有限公司', + 'cashier_payment_title' => '常州欧伯娜家居有限公司', 'account_code' => '5602.04', 'account_name' => '管理费用_办公费', 'amount' => 100.00, @@ -124,6 +126,10 @@ class ProcessDetailsPageTest extends FeatureTestCase ->assertSee('