回筐逻辑修改

database/migrations/2026_07_23_030608_create_store_table.php

@@ -60,8 +60,6 @@ return new class extends Migration
                 $table->string('phone', 20)->default('')->comment('联系电话');
                 $table->string('address', 255)->default('')->comment('门店地址');
                 $table->integer('payment_cycle_days')->default(0)->comment('回款周期（天）');
-                $table->integer('pending_box_num')->default(0)->comment('待回筐数量（生成账单压筐累加，回筐登记扣减）');
-                $table->integer('pending_tray_num')->default(0)->comment('待回托盘数量');
                 $table->decimal('total_purchase_amount', 12, 2)->default(0)->comment('总采购金额（只统计商品金额，账单支付后累加）');
                 $table->integer('status')->default(1)->comment('状态（1正常 0停用）');
                 $table->string('remark', 255)->nullable()->default('')->comment('备注');

database/migrations/2026_08_14_000001_create_container_return_table.php

@@ -8,7 +8,8 @@ return new class extends Migration
 {
     /**
      * Run the migrations.
-     * 门店回筐台账：压筐（生成账单时自动写入）+ 回筐（门店退回，后台手动登记）
+     * 门店压回筐记录：周转筐/托盘跟账单走，生成账单时写入完整快照；
+     * 数量正数=压筐（附加金额），负数=回筐（抵扣金额），数量为 0 不写记录
      */
     public function up(): void
     {
@@ -16,17 +17,17 @@ return new class extends Migration
             Schema::create('container_return', function (Blueprint $table) {
                 $table->increments('id')->comment('记录ID');
                 $table->integer('store_id')->comment('门店ID');
-                $table->integer('bill_id')->default(0)->comment('关联账单ID（0=手动回筐登记）');
-                $table->integer('type')->comment('类型（1压筐-账单生成 2回筐-退回登记）');
-                $table->integer('box_num')->default(0)->comment('周转筐数量');
-                $table->integer('tray_num')->default(0)->comment('周转托盘数量');
-                $table->date('return_date')->comment('记录日期（压筐=账单日期，回筐=退回日期）');
+                $table->integer('bill_id')->comment('关联账单ID');
+                $table->integer('box_num')->default(0)->comment('压（回）筐数量（正数=压筐，负数=回筐）');
+                $table->integer('tray_num')->default(0)->comment('压（回）托盘数量（正数=压筐，负数=回筐）');
+                $table->decimal('box_price', 10, 2)->default(0)->comment('周转筐单价（生成账单时快照）');
+                $table->decimal('tray_price', 10, 2)->default(0)->comment('周转托盘单价（生成账单时快照）');
+                $table->decimal('amount', 10, 2)->default(0)->comment('抵扣（附加）金额 = 筐×筐单价 + 托盘×托盘单价（正=压筐附加，负=回筐抵扣）');
                 $table->integer('operator_id')->default(0)->comment('操作人（后台系统用户ID）');
-                $table->string('remark', 255)->default('')->comment('备注');
                 $table->timestamps();
-                $table->index(['store_id', 'type'], 'container_return_store_type_index');
+                $table->index(['store_id'], 'container_return_store_index');
                 $table->index(['bill_id'], 'container_return_bill_index');
-                $table->comment('门店回筐记录表（压筐=生成账单压出，回筐=门店退回登记）');
+                $table->comment('门店压回筐记录表（随账单生成：正数=压筐附加金额，负数=回筐抵扣金额）');
             });
         }
     }

database/seeders/PermissionSeeder.php

@@ -223,8 +223,6 @@ class PermissionSeeder extends Seeder
                         'path' => '/recon/container-return',
                         'children' => [
                             ['type' => 'rule', 'key' => 'recon.containerReturn.query', 'name' => '查询'],
-                            ['type' => 'rule', 'key' => 'recon.containerReturn.create', 'name' => '回筐登记'],
-                            ['type' => 'rule', 'key' => 'recon.containerReturn.delete', 'name' => '删除'],
                         ],
                     ],
                     [