From 7d9f3d7bd14aed6ea225d779b04a11bf7f95ca82 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 17 Nov 2026 10:24:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=B1=87=E6=80=BB=E9=87=91=E9=A2=9D=E5=89=8D=E5=AF=BC?= =?UTF-8?q?=E5=8A=A0=E5=8F=B7=E5=85=AC=E5=BC=8F=20(#1221)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupplierSummaryInboundImporter.php | 2 +- .../SupplierSummaryInboundImportTest.php | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app/Business/SupplierSummaryInboundImporter.php b/app/Business/SupplierSummaryInboundImporter.php index d792c784..f7361677 100644 --- a/app/Business/SupplierSummaryInboundImporter.php +++ b/app/Business/SupplierSummaryInboundImporter.php @@ -466,7 +466,7 @@ class SupplierSummaryInboundImporter if ( preg_match( - '/^=?\s*\$?([A-Z]{1,3})\$?(\d+)\s*\*\s*\$?([A-Z]{1,3})\$?(\d+)\s*$/i', + '/^[=+]?\s*\$?([A-Z]{1,3})\$?(\d+)\s*\*\s*\$?([A-Z]{1,3})\$?(\d+)\s*$/i', $formula, $matches, ) !== 1 diff --git a/tests/Feature/Console/SupplierSummaryInboundImportTest.php b/tests/Feature/Console/SupplierSummaryInboundImportTest.php index 02ffd930..4dab490b 100644 --- a/tests/Feature/Console/SupplierSummaryInboundImportTest.php +++ b/tests/Feature/Console/SupplierSummaryInboundImportTest.php @@ -2,10 +2,12 @@ namespace Tests\Feature\Console; +use App\Business\SupplierSummaryInboundImporter; use App\Models\Business\InventoryWarehouseNameMapping; use Illuminate\Support\Facades\DB; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; +use ReflectionMethod; use Tests\Feature\FeatureTestCase; class SupplierSummaryInboundImportTest extends FeatureTestCase @@ -107,6 +109,41 @@ class SupplierSummaryInboundImportTest extends FeatureTestCase } } + public function test_amount_formulas_accept_excel_leading_plus(): void + { + $importer = new SupplierSummaryInboundImporter(); + $method = new ReflectionMethod($importer, 'formulaValue'); + $method->setAccessible(true); + + $values = array_fill(0, 20, null); + $values[7] = 2; // H: 库存变动量 + $values[8] = 10; // I: 单价 + $values[10] = 11; // K: 预估单价 + $columns = [ + 'quantity' => 7, + 'unit_price' => 8, + 'estimated_unit_price' => 10, + 'estimated_amount' => 11, + ]; + + $this->assertSame( + 20.0, + $method->invoke($importer, '金额', 'amount', '+H2*I2', 2, $values, $columns), + ); + $this->assertSame( + 22.0, + $method->invoke( + $importer, + '预估金额', + 'estimated_amount', + '+K2*H2', + 2, + $values, + $columns, + ), + ); + } + private function writeWorkbook( string $path, string $provider,