回筐逻辑修改

app/Http/Requests/Purchase/PurchaseBillGenerateRequest.php

@@ -5,7 +5,8 @@ namespace App\Http\Requests\Purchase;
 use Modules\Common\Http\Requests\BaseFormRequest;
 
 /**
- * 采购单生成账单 验证（按门店提交配送费/周转筐/托盘数量，金额由系统汇总不可修改）
+ * 采购单生成账单 验证（按门店提交配送费/周转筐/托盘数量，金额由系统汇总不可修改；
+ * 筐/托盘数量正数=压筐附加金额，负数=回筐抵扣金额）
  */
 class PurchaseBillGenerateRequest extends BaseFormRequest
 {
@@ -17,8 +18,8 @@ class PurchaseBillGenerateRequest extends BaseFormRequest
             'stores' => 'required|array|min:1',
             'stores.*.store_id' => 'required|integer|distinct',
             'stores.*.delivery_fee' => 'required|numeric|min:0',
-            'stores.*.box_num' => 'required|integer|min:0',
-            'stores.*.tray_num' => 'required|integer|min:0',
+            'stores.*.box_num' => 'required|integer',
+            'stores.*.tray_num' => 'required|integer',
         ];
     }
 
@@ -35,11 +36,9 @@ class PurchaseBillGenerateRequest extends BaseFormRequest
             'stores.*.delivery_fee.numeric' => '配送费格式错误',
             'stores.*.delivery_fee.min' => '配送费不能小于 0',
             'stores.*.box_num.required' => '周转筐数量不能为空',
-            'stores.*.box_num.integer' => '周转筐数量必须为整数',
-            'stores.*.box_num.min' => '周转筐数量不能小于 0',
+            'stores.*.box_num.integer' => '周转筐数量必须为整数（正数=压筐，负数=回筐）',
             'stores.*.tray_num.required' => '周转托盘数量不能为空',
-            'stores.*.tray_num.integer' => '周转托盘数量必须为整数',
-            'stores.*.tray_num.min' => '周转托盘数量不能小于 0',
+            'stores.*.tray_num.integer' => '周转托盘数量必须为整数（正数=压筐，负数=回筐）',
         ];
     }
 }

app/Http/Requests/Recon/ContainerReturnFormRequest.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Recon;
-
-use Modules\Common\Http\Requests\BaseFormRequest;
-
-/**
- * 回筐登记 验证（门店退回周转筐/托盘，扣减门店待回数量）
- */
-class ContainerReturnFormRequest extends BaseFormRequest
-{
-    protected $stopOnFirstFailure = true;
-
-    public function rules(): array
-    {
-        return [
-            'store_id' => 'required|integer|exists:store,id',
-            'box_num' => 'required|integer|min:0',
-            'tray_num' => 'required|integer|min:0',
-            'return_date' => 'required|date_format:Y-m-d',
-            'remark' => 'nullable|string|max:255',
-        ];
-    }
-
-    public function messages(): array
-    {
-        return [
-            'store_id.required' => '请选择门店',
-            'store_id.exists' => '门店不存在',
-            'box_num.required' => '周转筐数量不能为空',
-            'box_num.integer' => '周转筐数量必须为整数',
-            'box_num.min' => '周转筐数量不能小于 0',
-            'tray_num.required' => '周转托盘数量不能为空',
-            'tray_num.integer' => '周转托盘数量必须为整数',
-            'tray_num.min' => '周转托盘数量不能小于 0',
-            'return_date.required' => '请选择退回日期',
-            'return_date.date_format' => '退回日期格式为 Y-m-d',
-            'remark.max' => '备注超过最大长度',
-        ];
-    }
-}