refactor: 重構 VendorProduct API 與新增進貨單重複檢查前端邏輯
All checks were successful
ERP-Deploy-Production / deploy-production (push) Successful in 1m9s
ERP-Deploy-Demo / deploy-demo (push) Successful in 1m10s

1. 將 VendorProductController 中的 Eloquent 關聯操作改為透過 ProcurementService 使用 DB 操作,解除跨模組 Model 直接依賴。
2. ProcurementService 加入 vendor product 的資料存取方法。
3. 進貨單建立前端 (GoodsReceipt/Create.tsx) 新增重複進貨檢查與警告對話框邏輯。
This commit is contained in:
2026-02-25 11:11:28 +08:00
parent e406ecd63d
commit ad91b08dbc
11 changed files with 689 additions and 23 deletions

View File

@@ -8,6 +8,7 @@ use App\Modules\Inventory\Services\InventoryService;
use App\Modules\Procurement\Contracts\ProcurementServiceInterface;
use Illuminate\Http\Request;
use App\Modules\Procurement\Models\Vendor;
use App\Modules\Inventory\Services\DuplicateCheckService;
use Inertia\Inertia;
use App\Modules\Inventory\Models\GoodsReceipt;
use Illuminate\Support\Facades\DB;
@@ -17,15 +18,18 @@ class GoodsReceiptController extends Controller
protected $goodsReceiptService;
protected $inventoryService;
protected $procurementService;
protected $duplicateCheckService;
public function __construct(
GoodsReceiptService $goodsReceiptService,
InventoryService $inventoryService,
ProcurementServiceInterface $procurementService
ProcurementServiceInterface $procurementService,
DuplicateCheckService $duplicateCheckService
) {
$this->goodsReceiptService = $goodsReceiptService;
$this->inventoryService = $inventoryService;
$this->procurementService = $procurementService;
$this->duplicateCheckService = $duplicateCheckService;
}
public function index(Request $request)
@@ -159,10 +163,6 @@ class GoodsReceiptController extends Controller
'warehouse_id' => 'required|exists:warehouses,id',
'type' => 'required|in:standard,miscellaneous,other',
'purchase_order_id' => 'nullable|required_if:type,standard|exists:purchase_orders,id',
// Vendor ID is required if standard, but optional/nullable for misc/other?
// Stick to existing logic: if standard, we infer vendor from PO usually, or frontend sends it.
// For now let's make vendor_id optional for misc/other or user must select one?
// "雜項入庫" might not have a vendor. Let's make it nullable.
'vendor_id' => 'nullable|integer',
'received_date' => 'required|date',
'remarks' => 'nullable|string',
@@ -173,6 +173,7 @@ class GoodsReceiptController extends Controller
'items.*.unit_price' => 'required|numeric|min:0',
'items.*.batch_number' => 'nullable|string',
'items.*.expiry_date' => 'nullable|date',
'force' => 'nullable|boolean',
]);
try {
@@ -183,6 +184,15 @@ class GoodsReceiptController extends Controller
}
}
/**
* 預檢重複進貨 API
*/
public function checkDuplicate(Request $request)
{
$result = $this->duplicateCheckService->checkDuplicateReceipt($request->all());
return response()->json($result);
}
public function submit(GoodsReceipt $goodsReceipt)
{
if (!auth()->user()->can('goods_receipts.edit')) {