From d24eefb6871979e3fe96626dd0ab8cbd17161909 Mon Sep 17 00:00:00 2001 From: limeng <1131177064@qq.com> Date: Sat, 17 Oct 2026 13:12:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=B7=A5=E4=BD=9C=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8C=E6=AD=A5=E5=92=8C=E5=B1=95=E7=A4=BA=20(#380)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/upstream_mirrors.php | 9 +++++++-- docs/上游业务镜像清单.md | 4 ++++ .../SupplierManagementMirrorRepository.php | 12 ++++++++++- .../supplier-management.blade.php | 6 +++--- .../Business/SupplierManagementPageTest.php | 7 +++++-- ...SupplierManagementMirrorRepositoryTest.php | 20 +++++++++++++++++++ 6 files changed, 50 insertions(+), 8 deletions(-) diff --git a/config/upstream_mirrors.php b/config/upstream_mirrors.php index 5cbe08e6..cce072c6 100644 --- a/config/upstream_mirrors.php +++ b/config/upstream_mirrors.php @@ -211,8 +211,13 @@ return [ 'full_reconcile_hours' => 1, 'columns' => ['Id', 'guid', 'sourcefrom', 'coopersgn', 'scmcode', 'scmname', 'scmtype', 'tradebody', 'company', 'enterpriseType', 'creditcode', 'handlePerson', 'accountbankno', 'legalPerson', - 'buyer', 'tradebtime', 'tradeetime', 'cooperbtime', 'cooperetime', 'memo', - 'updator', 'local_created', 'local_updated'], + 'paycyclesgn', 'corpmobile', 'tradebtime', 'tradeetime', 'cooperbtime', 'cooperetime', + 'undefined1', 'undefined2', 'dsper', 'reconciliter', 'levelname', + 'linkerprovience', 'linkercity', 'linkerarea', 'linkeradd', 'memo', + 'buyer', 'buymid', 'buytop', 'craftType', 'outline', 'capacity', 'freereason', + 'area', 'stocker', 'region', 'sindou', 'follower', 'presc', 'strategy', + 'updator', 'local_created', 'local_updated', 'send_date', + 'endTimeA', 'endTimeB', 'finishTimeA', 'finishTimeB'], 'indexes' => [['scmcode', 'Id'], ['coopersgn', 'Id']], ], 'jiansun.dbo.js_supplier_contract_View' => [ diff --git a/docs/上游业务镜像清单.md b/docs/上游业务镜像清单.md index 09ed3ee6..d2cd7b90 100644 --- a/docs/上游业务镜像清单.md +++ b/docs/上游业务镜像清单.md @@ -152,3 +152,7 @@ php artisan business-mirror:sync-tables jiansun.dbo.jst_small_payment_order_map ``` 两张表完成后，页面按工单主记录的完成时间筛选并稳定分页，以 `woNo` 关联最新的工单主记录；查询依赖工单表 `(woTypeId, completeTime, woNo, Id)` 和映射表 `(woTypeId, woNo)` 两个索引。映射表的 `transaction_no` 是线上订单号后备来源，不得展示为支付宝批次号；支付宝批次号只读取表单中的明确字段。工单状态按聚水潭状态码翻译，已完成工单再结合打款方式显示打款状态。筛选支持完成日期、工单号、店铺、支付宝批次号、线上订单号、状态和打款原因；表单详情从镜像中的 `businessFieldList` 解析，导出与页面使用同一筛选口径。首次全量未完成、查询索引未就绪或刷新失败时均保留明确状态，不能把空结果解释为没有小额打款工单。 + +### 供应商管理完整字段 + +简尚版主视图 `jiansun.dbo.js_supplier_View` 明确同步全部 52 个源字段，包含原列表右侧资料；列表与全部筛选结果导出共用字段映射。`undefined2` 是板材提供方，`linkerprovience` 保留上游拼写；`endTimeA/endTimeB` 分别为罚款/赔付终止日期，`finishTimeA/finishTimeB` 分别为终止/重启合作日期，不能用 `cooperetime/cooperbtime` 替代。未确认业务含义的辅助字段保留在镜像中，不猜测中文列名。扩展字段上线后必须备份原镜像及同步状态，并完整校准已有行；只追加新 Id 无法回补存量资料。验收对比源字段集合、总数、全量行内容及页面分页/筛选/导出。 diff --git a/modules/EcommerceFinance/Repositories/SupplierManagementMirrorRepository.php b/modules/EcommerceFinance/Repositories/SupplierManagementMirrorRepository.php index fd419159..0ee66367 100644 --- a/modules/EcommerceFinance/Repositories/SupplierManagementMirrorRepository.php +++ b/modules/EcommerceFinance/Repositories/SupplierManagementMirrorRepository.php @@ -21,7 +21,17 @@ class SupplierManagementMirrorRepository 'sourcefrom' => '数据来源', 'coopersgn' => '是否合作', 'scmcode' => '供应商代码', 'scmname' => '供应商名称', 'scmtype' => '供应商类型', 'tradebody' => '合同主体', 'company' => '签订公司', 'enterpriseType' => '企业类型', 'creditcode' => '社会信用代码', - 'accountbankno' => '电子合同经办人', 'buyer' => '采购人员', + 'handlePerson' => '电子合同经办人姓名', 'accountbankno' => '电子合同经办人账号', + 'legalPerson' => '法人姓名', 'corpmobile' => '法人电话', 'paycyclesgn' => '结算周期', + 'tradebtime' => '合同开始时间', 'tradeetime' => '合同截止时间', + 'endTimeA' => '罚款终止日期', 'endTimeB' => '赔付终止日期', + 'finishTimeA' => '终止合作日期', 'finishTimeB' => '重启合作日期', + 'undefined2' => '板材提供方', 'dsper' => '分配人', 'reconciliter' => '对账会计', + 'levelname' => '级别', 'linkerprovience' => '联系人省', 'linkercity' => '联系人市', + 'linkerarea' => '联系人区', 'linkeradd' => '联系人详细地址', 'memo' => '备注', + 'buyer' => '采购', 'craftType' => '工艺类型', 'outline' => '生产线', + 'capacity' => '工厂产能', 'freereason' => '免罚原因', 'region' => '所属区域', + 'sindou' => '叫货周期', ]; public function __construct( diff --git a/resources/views/business/pages/supplier-payables/supplier-management.blade.php b/resources/views/business/pages/supplier-payables/supplier-management.blade.php index 821b949b..bacfc86f 100644 --- a/resources/views/business/pages/supplier-payables/supplier-management.blade.php +++ b/resources/views/business/pages/supplier-payables/supplier-management.blade.php @@ -82,12 +82,12 @@
最近一次同步失败，当前显示上次同步成功的资料。
@endif
- 共 {{ number_format($suppliers->total()) }} 家供应商 + 共 {{ number_format($suppliers->total()) }} 家供应商 · {{ count($supplierColumns) }} 项资料，横向滚动可查看完整字段 最近同步：
-
+
- +
@foreach ($supplierColumns as $label)@endforeach @forelse ($suppliers as $supplier) diff --git a/tests/Feature/Business/SupplierManagementPageTest.php b/tests/Feature/Business/SupplierManagementPageTest.php index baee0360..28138b71 100644 --- a/tests/Feature/Business/SupplierManagementPageTest.php +++ b/tests/Feature/Business/SupplierManagementPageTest.php @@ -35,13 +35,16 @@ class SupplierManagementPageTest extends FeatureTestCase public function test_filters_and_selected_supplier_details_render_without_full_page_navigation(): void { $repository = $this->repository(true); - $row = (object) ['Id' => 3, 'scmcode' => '001', 'scmname' => '测试供应商', 'coopersgn' => 1]; + $row = (object) ['Id' => 3, 'scmcode' => '001', 'scmname' => '测试供应商', 'coopersgn' => 1, + 'region' => '苏北', 'sindou' => '双日', 'capacity' => '120']; $repository->shouldReceive('paginate')->once()->with(['supplier_name' => '测试', 'buyer' => '', 'cooperation_status' => '1'], 1, 20) ->andReturn(['rows' => [$row], 'total' => 1]); $repository->shouldReceive('details')->once()->with($row, 'contacts', 1, 20) ->andReturn(['rows' => [(object) ['linker' => '测试联系人']], 'total' => 1, 'ready' => true, 'message' => null]); $this->loginAs()->get($this->url(['supplier_name' => ' 测试 ', 'cooperation_status' => '1', 'supplier_id' => 3, 'detail_tab' => 'contacts'])) - ->assertOk()->assertSeeText('测试供应商')->assertSeeText('测试联系人')->assertSee('data-caiwu-replay', false)->assertSeeText('打款信息'); + ->assertOk()->assertSeeText('测试供应商')->assertSeeText('测试联系人')->assertSee('data-caiwu-replay', false)->assertSeeText('打款信息') + ->assertSeeText('工厂产能')->assertSeeText('叫货周期')->assertSeeText('赔付终止日期') + ->assertSeeText('苏北')->assertSeeText('双日')->assertSeeText('120'); } public function test_detail_failure_keeps_the_supplier_list_visible(): void diff --git a/tests/Unit/EcommerceFinance/SupplierManagementMirrorRepositoryTest.php b/tests/Unit/EcommerceFinance/SupplierManagementMirrorRepositoryTest.php index 7a75e177..6d10fca8 100644 --- a/tests/Unit/EcommerceFinance/SupplierManagementMirrorRepositoryTest.php +++ b/tests/Unit/EcommerceFinance/SupplierManagementMirrorRepositoryTest.php @@ -50,6 +50,26 @@ class SupplierManagementMirrorRepositoryTest extends TestCase $this->assertSame([1, 2], array_map(fn ($row) => $row->Id, iterator_to_array($this->repository->exportRows($filters)))); } + public function test_right_hand_supplier_fields_survive_pagination_and_export(): void + { + $this->ready(SupplierManagementMirrorRepository::DATASET); + $fields = ['handlePerson' => '测试经办人', 'paycyclesgn' => '月结', + 'endTimeB' => '2026-12-31', 'finishTimeA' => '2026-10-01', + 'undefined2' => '第三方', 'linkerprovience' => '江苏省', 'linkeradd' => '测试地址', + 'craftType' => '板式', 'capacity' => '120', 'region' => '苏北', 'sindou' => '双日']; + $this->table('js_supplier_management')->insert(['Id' => 9, 'scmname' => '完整资料测试'] + $fields); + $page = $this->repository->paginate([], 1, 20); + $export = iterator_to_array($this->repository->exportRows([])); + foreach ($fields as $column => $value) { + $this->assertSame($value, $page['rows'][0]->{$column}); + $this->assertSame($value, $export[0]->{$column}); + $this->assertArrayHasKey($column, SupplierManagementMirrorRepository::COLUMNS); + } + $columns = (new BusinessMirrorDatasetRegistry())->columnSelection(SupplierManagementMirrorRepository::DATASET); + $this->assertCount(52, $columns); + $this->assertSame([], array_values(array_diff(array_keys(SupplierManagementMirrorRepository::COLUMNS), $columns))); + } + public function test_related_mirror_indexes_can_be_built_from_the_50_character_source_fields(): void { $registry = new BusinessMirrorDatasetRegistry();
序号{{ $label }}