WuYongJie/CaiWuXiTong
1
0
Fork 0
Code Issues Pull Requests 7 Packages Projects Releases Wiki Activity

增加运费差模板日期列 #210

Merged
renshen merged 1 commits from feature/renshen-freight-import-month into main 2026-09-20 11:04:02 +08:00
Conversation 0 Commits 1 Files Changed 3 +16 -12
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/templates/courier-payables/freight-difference-import-template.xlsx
View File

Binary file not shown.

2
resources/views/business/pages/courier-payables/summary-table.blade.php
View File

@ -108,7 +108,7 @@
<span class="material-icons-outlined" aria-hidden="true">description</span>
<div>
<strong>运费差导入模板</strong>
<span>.xlsx · 10 个字段</span>
<span>.xlsx · 11 个字段</span>
</div>
<a class="courier-summary__button" href="{{ route('business.courier-payable-summaries.template', ['summaryPage' => $courierSummaryPage]) }}">
<span class="material-icons-outlined" aria-hidden="true">download</span>

26
tests/Feature/Business/CourierPayableSummaryPagesTest.php
View File

@ -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();