diff --git a/resources/templates/courier-payables/freight-difference-import-template.xlsx b/resources/templates/courier-payables/freight-difference-import-template.xlsx index aab26937..6e3df03b 100644 Binary files a/resources/templates/courier-payables/freight-difference-import-template.xlsx and b/resources/templates/courier-payables/freight-difference-import-template.xlsx differ diff --git a/resources/views/business/pages/courier-payables/summary-table.blade.php b/resources/views/business/pages/courier-payables/summary-table.blade.php index cbd9fbc3..26d7b94c 100644 --- a/resources/views/business/pages/courier-payables/summary-table.blade.php +++ b/resources/views/business/pages/courier-payables/summary-table.blade.php @@ -108,7 +108,7 @@
运费差导入模板 - .xlsx · 10 个字段 + .xlsx · 11 个字段
diff --git a/tests/Feature/Business/CourierPayableSummaryPagesTest.php b/tests/Feature/Business/CourierPayableSummaryPagesTest.php index 4e7ebe41..4a7c6c34 100644 --- a/tests/Feature/Business/CourierPayableSummaryPagesTest.php +++ b/tests/Feature/Business/CourierPayableSummaryPagesTest.php @@ -83,6 +83,7 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase $worksheet = $spreadsheet->getActiveSheet(); $this->assertSame([ + '日期', '负责人', '快递公司', '快递单号', @@ -93,12 +94,13 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase '差异(结算运费-提供成本运费)', '是否配件', '配件成品条码', - ], $worksheet->rangeToArray('A1:J1', null, false, false)[0]); - $this->assertSame('FFFFC000', $worksheet->getStyle('D1')->getFill()->getStartColor()->getARGB()); + ], $worksheet->rangeToArray('A1:K1', null, false, false)[0]); $this->assertSame('FFFFC000', $worksheet->getStyle('E1')->getFill()->getStartColor()->getARGB()); - $this->assertSame('FFFFC000', $worksheet->getStyle('G1')->getFill()->getStartColor()->getARGB()); - $this->assertSame('@', $worksheet->getStyle('E2')->getNumberFormat()->getFormatCode()); - $this->assertSame('@', $worksheet->getStyle('G2')->getNumberFormat()->getFormatCode()); + $this->assertSame('FFFFC000', $worksheet->getStyle('F1')->getFill()->getStartColor()->getARGB()); + $this->assertSame('FFFFC000', $worksheet->getStyle('H1')->getFill()->getStartColor()->getARGB()); + $this->assertSame('@', $worksheet->getStyle('A2')->getNumberFormat()->getFormatCode()); + $this->assertSame('@', $worksheet->getStyle('F2')->getNumberFormat()->getFormatCode()); + $this->assertSame('@', $worksheet->getStyle('H2')->getNumberFormat()->getFormatCode()); $this->assertSame('', (string) $worksheet->getCell('A2')->getValue()); $spreadsheet->disconnectWorksheets(); @@ -120,6 +122,7 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase $spreadsheet = IOFactory::load(resource_path('templates/courier-payables/freight-difference-import-template.xlsx')); $worksheet = $spreadsheet->getActiveSheet(); $worksheet->fromArray([ + '2026-07', '苏木', '测试快递', 'YT7632543323146', @@ -131,8 +134,8 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase '成品', '', ], null, 'A2'); - $worksheet->getCell('E2')->setValueExplicit('855226246304', DataType::TYPE_STRING); - $worksheet->getCell('G2')->setValueExplicit('3312228147193110069', DataType::TYPE_STRING); + $worksheet->getCell('F2')->setValueExplicit('855226246304', DataType::TYPE_STRING); + $worksheet->getCell('H2')->setValueExplicit('3312228147193110069', DataType::TYPE_STRING); $path = tempnam(sys_get_temp_dir(), 'freight-template-'); $this->assertNotFalse($path); @@ -157,15 +160,16 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase 'section' => 'courier-payables', 'page' => 'freight-difference', ])) - ->assertSessionHas('success', '导入完成:1 条数据,10 个字段。'); + ->assertSessionHas('success', '导入完成:1 条数据,11 个字段。'); $snapshot = app(CourierPayableSummaryStore::class)->snapshot( (int) $this->company->id, 'freight-difference', ); - $this->assertSame('855226246304', $snapshot['rows'][0][4]); - $this->assertSame('3312228147193110069', $snapshot['rows'][0][6]); - $this->assertSame('0.1827', $snapshot['rows'][0][7]); + $this->assertSame('2026-07', $snapshot['rows'][0][0]); + $this->assertSame('855226246304', $snapshot['rows'][0][5]); + $this->assertSame('3312228147193110069', $snapshot['rows'][0][7]); + $this->assertSame('0.1827', $snapshot['rows'][0][8]); } finally { if (isset($spreadsheet)) { $spreadsheet->disconnectWorksheets();