diff --git a/database/migrations/2026_09_14_000000_create_third_party_warehouse_storage_settlements_table.php b/database/migrations/2026_09_14_000000_create_third_party_warehouse_storage_settlements_table.php index f3013dee..1f2c88fa 100644 --- a/database/migrations/2026_09_14_000000_create_third_party_warehouse_storage_settlements_table.php +++ b/database/migrations/2026_09_14_000000_create_third_party_warehouse_storage_settlements_table.php @@ -38,6 +38,7 @@ return new class extends Migration $table->text('remark')->nullable(); $table->unsignedInteger('calculated_by')->nullable(); $table->timestamps(); + $table->softDeletes(); $table->unique( ['company_id', 'warehouse_id', 'period'], diff --git a/tests/Feature/Business/ThirdPartyWarehouseQuotePageTest.php b/tests/Feature/Business/ThirdPartyWarehouseQuotePageTest.php index 3738a172..6f93701a 100644 --- a/tests/Feature/Business/ThirdPartyWarehouseQuotePageTest.php +++ b/tests/Feature/Business/ThirdPartyWarehouseQuotePageTest.php @@ -32,8 +32,8 @@ class ThirdPartyWarehouseQuotePageTest extends FeatureTestCase ->assertSeeText('每托折算件数(件/托)') ->assertSeeText('每托占地面积(㎡/托)') ->assertSeeText('仓储面积单价(元/㎡·月)') - ->assertSeeText('普通商品资料重量 kg ÷ 1000 × 三方仓采购进仓数量') - ->assertSeeText('三方仓销售出仓数量 + 其它出库数量') + ->assertSeeText('Σ(普通商品资料重量kg ÷ 1000 ×(加工进仓+加工出仓+采购进仓+采购退货+其它退货+销售退货+盘点+调拨入))× 入库管理费单价') + ->assertSeeText('Σ(销售出仓 + 其它出库 + 调拨出)× 出库费单价') ->assertSeeText('系统数据为唯一核算来源,不读取仓库提供、核对或差异列') ->assertSeeText($this->user->name) ->assertSee('data-quote-panel="warehouse"', false);