From 688ae307472392cc09e8583f8c82a2e14e35be57 Mon Sep 17 00:00:00 2001 From: renshen <1005457301@qq.com> Date: Fri, 16 Oct 2026 22:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E4=BB=98=E6=AC=BE=E7=BB=88=E7=89=88?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=AF=B9=E8=B4=A6=EF=BC=9Awms=E9=85=8D?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E5=8F=B7=E8=B0=83=E6=95=B4=E5=88=B0=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E5=90=8E=20(#355)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 「标题」在前、「wms配货单号」在后（与基础页面一致），导入模板与页面/导出同步；其他页签不受影响。 --- .../EcommerceFinance/Services/PayablesFinalRegistry.php | 4 ++-- tests/Feature/Business/SupplierPayableFinalPagesTest.php | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/EcommerceFinance/Services/PayablesFinalRegistry.php b/modules/EcommerceFinance/Services/PayablesFinalRegistry.php index e5467670..98c9e9bb 100644 --- a/modules/EcommerceFinance/Services/PayablesFinalRegistry.php +++ b/modules/EcommerceFinance/Services/PayablesFinalRegistry.php @@ -41,7 +41,7 @@ class PayablesFinalRegistry * - insert：锚点列之后插入的列（锚点列名 => 列定义）； * - append：追加到末尾的列。 * 货款对账在「月份」后补入库单号、采购单号，末尾补未发出、对账人； - * 退货对账去掉「快递名称」，在「备注」后插入 wms 配货单号，在「标记多标签」后补创建人。 + * 退货对账去掉「快递名称」，在「标题」后插入 wms 配货单号，在「标记多标签」后补创建人。 */ private const SUPPLIER_FIELD_PATCHES = [ 'payment-reconciliation' => [ @@ -57,7 +57,7 @@ class PayablesFinalRegistry 'return-reconciliation' => [ 'remove' => ['express_name'], 'insert' => [ - 'remark' => ['wms_pick_no' => ['label' => 'wms配货单号', 'type' => 'text']], + 'title' => ['wms_pick_no' => ['label' => 'wms配货单号', 'type' => 'text']], 'labels' => ['creator' => ['label' => '创建人', 'type' => 'text']], ], ], diff --git a/tests/Feature/Business/SupplierPayableFinalPagesTest.php b/tests/Feature/Business/SupplierPayableFinalPagesTest.php index f107b3b1..40ed0237 100644 --- a/tests/Feature/Business/SupplierPayableFinalPagesTest.php +++ b/tests/Feature/Business/SupplierPayableFinalPagesTest.php @@ -152,7 +152,7 @@ class SupplierPayableFinalPagesTest extends FeatureTestCase $this->assertSame([ '记录标识', '月份', '发货时间', '明细供应商', '条形码', '商品名称', '发货量', '单价', '金额', '预估单价', - '预估金额', '供应商条码', '备注', 'wms配货单号', '标题', '仓库名称', '快递单号', '标记多标签', '创建人', '对账人', + '预估金额', '供应商条码', '备注', '标题', 'wms配货单号', '仓库名称', '快递单号', '标记多标签', '创建人', '对账人', ], $header); $this->assertNotContains('快递名称', $header); } finally { @@ -164,8 +164,8 @@ class SupplierPayableFinalPagesTest extends FeatureTestCase { $file = UploadedFile::fake()->createWithContent( 'return-reconciliation.csv', - "\xEF\xBB\xBF月份,发货时间,明细供应商,条形码,商品名称,发货量,单价,金额,预估单价,预估金额,供应商条码,备注,wms配货单号,标题,仓库名称,快递单号,标记多标签,创建人,对账人\n" - . "2026-09,2026-09-01,退货供应商,BC-1,商品甲,3,10,30,9,27,SB-1,备注甲,WMS-1,标题甲,华南仓,SF-9,多标签,创建人甲,对账人乙\n", + "\xEF\xBB\xBF月份,发货时间,明细供应商,条形码,商品名称,发货量,单价,金额,预估单价,预估金额,供应商条码,备注,标题,wms配货单号,仓库名称,快递单号,标记多标签,创建人,对账人\n" + . "2026-09,2026-09-01,退货供应商,BC-1,商品甲,3,10,30,9,27,SB-1,备注甲,标题甲,WMS-1,华南仓,SF-9,多标签,创建人甲,对账人乙\n", ); $this->loginAs() @@ -192,6 +192,7 @@ class SupplierPayableFinalPagesTest extends FeatureTestCase $export = $this->loginAs()->get(route('business.supplier-payables-final.return-reconciliation.export')); $export->assertOk(); + $this->assertStringContainsString('备注,标题,wms配货单号', $export->streamedContent()); $this->assertStringContainsString('标记多标签,创建人,对账人', $export->streamedContent()); $this->assertStringNotContainsString('快递名称', $export->streamedContent()); }