diff --git a/app/Business/KukaPostingReconciliation/KukaReconciliationPageData.php b/app/Business/KukaPostingReconciliation/KukaReconciliationPageData.php index ca14a591..8803a5c0 100644 --- a/app/Business/KukaPostingReconciliation/KukaReconciliationPageData.php +++ b/app/Business/KukaPostingReconciliation/KukaReconciliationPageData.php @@ -144,6 +144,7 @@ class KukaReconciliationPageData $orders = []; $postingQuantityTotal = '0'; $postingSupplierAmountTotal = '0.00'; + $postingSalesAmountTotal = '0.00'; $supplierAmountTotal = '0.00'; $salesAmountTotal = '0.00'; $shippingMatched = 0; @@ -303,6 +304,10 @@ class KukaReconciliationPageData $postingSupplierAmountTotal, $supplierAmount, ); + $postingSalesAmountTotal = $this->addMoney( + $postingSalesAmountTotal, + $salesAmount, + ); } if (! isset($inventory[$materialNumber])) { @@ -417,6 +422,7 @@ class KukaReconciliationPageData 'posting_material_count' => count($posting), 'posting_quantity_total' => $this->formatQuantity($postingQuantityTotal), 'posting_supplier_amount_total' => $postingSupplierAmountTotal, + 'posting_sales_amount_total' => $postingSalesAmountTotal, 'toc_quantity_total' => $this->formatQuantity($postingQuantityTotal), 'order_count' => count($orders), 'skipped_missing_material_rows' => $skippedMissingMaterial, @@ -732,6 +738,7 @@ class KukaReconciliationPageData 'posting_material_count' => 0, 'posting_quantity_total' => '0', 'posting_supplier_amount_total' => '0.00', + 'posting_sales_amount_total' => '0.00', 'toc_quantity_total' => '0', 'order_count' => 0, 'skipped_missing_material_rows' => 0, diff --git a/resources/views/business/pages/posting-data/kuka-reconciliation.blade.php b/resources/views/business/pages/posting-data/kuka-reconciliation.blade.php index d0e3a373..2fd5de69 100644 --- a/resources/views/business/pages/posting-data/kuka-reconciliation.blade.php +++ b/resources/views/business/pages/posting-data/kuka-reconciliation.blade.php @@ -187,6 +187,13 @@ 'quantityTotal' => $kukaReconciliation['summary']['toc_quantity_total'] ?? '0', ]) @endif + @if ($tab['slug'] === 'lingshan-virtual-posting' && empty($kukaReconciliation['error'])) + @include('business.pages.posting-data.partials.kuka-reconciliation-virtual-summary', [ + 'quantityTotal' => $kukaReconciliation['summary']['posting_quantity_total'] ?? '0', + 'supplierAmountTotal' => $kukaReconciliation['summary']['posting_supplier_amount_total'] ?? '0.00', + 'salesAmountTotal' => $kukaReconciliation['summary']['posting_sales_amount_total'] ?? '0.00', + ]) + @endif @if (! empty($tab['headers'])) @include($sourceTable, [ 'title' => $tab['title'], @@ -201,7 +208,7 @@ 'notice' => $tab['slug'] === 'erp-product-import' ? ($kukaReconciliation['notices']['erp'] ?? null) : null, - 'showHeader' => ! in_array($tab['slug'], ['posting-data', 'toc-orders'], true), + 'showHeader' => ! in_array($tab['slug'], ['posting-data', 'toc-orders', 'lingshan-virtual-posting'], true), 'emptyMessage' => '当前账期没有可生成的过账数据。', ]) @else diff --git a/resources/views/business/pages/posting-data/partials/kuka-reconciliation-virtual-summary.blade.php b/resources/views/business/pages/posting-data/partials/kuka-reconciliation-virtual-summary.blade.php new file mode 100644 index 00000000..14a40d59 --- /dev/null +++ b/resources/views/business/pages/posting-data/partials/kuka-reconciliation-virtual-summary.blade.php @@ -0,0 +1,65 @@ +
+
+ + + 采购数量 + + {{ number_format((float) $quantityTotal, 0, '.', ',') }} +
+
+ + + 供货商金额 + + {{ number_format((float) $supplierAmountTotal, 2, '.', ',') }} +
+
+ + + 销售金额 + + {{ number_format((float) $salesAmountTotal, 2, '.', ',') }} +
+
+ + diff --git a/tests/Feature/Business/KukaReconciliationPageTest.php b/tests/Feature/Business/KukaReconciliationPageTest.php index fa7bb7d5..7b8792f4 100644 --- a/tests/Feature/Business/KukaReconciliationPageTest.php +++ b/tests/Feature/Business/KukaReconciliationPageTest.php @@ -43,6 +43,9 @@ class KukaReconciliationPageTest extends FeatureTestCase ->assertSee('data-kuka-posting-card="quantity"', false) ->assertSee('data-kuka-posting-card="supplier-amount"', false) ->assertSee('data-kuka-toc-quantity-card', false) + ->assertSee('data-kuka-virtual-summary-card="quantity"', false) + ->assertSee('data-kuka-virtual-summary-card="supplier-amount"', false) + ->assertSee('data-kuka-virtual-summary-card="sales-amount"', false) ->assertDontSeeText('有效物料行') ->assertSeeText('供货商金额') ->assertSeeText('N单号') @@ -83,6 +86,12 @@ class KukaReconciliationPageTest extends FeatureTestCase $this->assertNotFalse($tocPanelEnd); $tocPanel = substr($html, $tocPanelStart, $tocPanelEnd - $tocPanelStart); $this->assertStringNotContainsString('
', $tocPanel); + $virtualPanelStart = strpos($html, 'data-kuka-reconciliation-panel="lingshan-virtual-posting"'); + $virtualPanelEnd = strpos($html, 'data-kuka-reconciliation-panel="', $virtualPanelStart + 20); + $this->assertNotFalse($virtualPanelStart); + $this->assertNotFalse($virtualPanelEnd); + $virtualPanel = substr($html, $virtualPanelStart, $virtualPanelEnd - $virtualPanelStart); + $this->assertStringNotContainsString('
', $virtualPanel); } public function test_kuka_reconciliation_tab_can_open_directly_from_the_url(): void diff --git a/tests/Unit/Business/KukaReconciliationPageDataTest.php b/tests/Unit/Business/KukaReconciliationPageDataTest.php index 98cded9b..2744cf93 100644 --- a/tests/Unit/Business/KukaReconciliationPageDataTest.php +++ b/tests/Unit/Business/KukaReconciliationPageDataTest.php @@ -142,6 +142,7 @@ class KukaReconciliationPageDataTest extends TestCase $this->assertSame(1, $data['summary']['posting_material_count']); $this->assertSame('2', $data['summary']['posting_quantity_total']); $this->assertSame('20.00', $data['summary']['posting_supplier_amount_total']); + $this->assertSame('22.22', $data['summary']['posting_sales_amount_total']); $this->assertSame('2', $data['summary']['toc_quantity_total']); $this->assertSame(1, $data['summary']['skipped_missing_material_rows']); $this->assertSame(1, $data['summary']['skipped_zero_quantity_rows']);