mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

優化門市叫貨流程：實作庫存預扣機制、鎖定自動產生的調撥單明細、修復自動販賣機貨道數量連動 Bug 及狀態同步問題
All checks were successful
ERP-Deploy-Demo / deploy-demo (push) Successful in 56s
Details

Browse Source
This commit is contained in:
sky121113
2026-02-25 17:32:28 +08:00
parent e3df090afd
commit 63e4f88a14
8 changed files with 469 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/Modules/Inventory/Services/StoreRequisitionService.php
View File

@@ -118,17 +118,57 @@ class StoreRequisitionService
}
return DB::transaction(function () use ($requisition, $data, $userId) {
// 更新核准數量
// 處理前端傳來的明細與批號資料
$processedItems = []; // 暫存處理後的明細，用於轉入調撥單
if (isset($data['items'])) {
foreach ($data['items'] as $itemData) {
StoreRequisitionItem::where('id', $itemData['id'])
$reqItemId = $itemData['id'];
$totalApprovedQty = 0;
$batches = $itemData['batches'] ?? [];
// 如果有批號，根據批號展開。若有多個無批號(null)的批次(例如來自不同貨道)，則將其數量加總
if (!empty($batches)) {
$batchGroups = [];
foreach ($batches as $batch) {
$qty = (float)($batch['qty'] ?? 0);
$bNum = $batch['batch_number'] ?? null;
if ($qty > 0) {
$totalApprovedQty += $qty;
$batchKey = $bNum ?? '';
$batchGroups[$batchKey] = ($batchGroups[$batchKey] ?? 0) + $qty;
}
}
foreach ($batchGroups as $bNumKey => $qty) {
$processedItems[] = [
'req_item_id' => $reqItemId,
'batch_number' => $bNumKey === '' ? null : $bNumKey,
'quantity' => $qty,
];
}
} else {
// 無批號，傳統輸入
$qty = (float)($itemData['approved_qty'] ?? 0);
if ($qty > 0) {
$totalApprovedQty += $qty;
$processedItems[] = [
'req_item_id' => $reqItemId,
'batch_number' => null,
'quantity' => $qty,
];
}
}
// 更新叫貨單明細的核准數量總和
StoreRequisitionItem::where('id', $reqItemId)
->where('store_requisition_id', $requisition->id)
->update(['approved_qty' => $itemData['approved_qty']]);
->update(['approved_qty' => $totalApprovedQty]);
}
}
// 優先使用傳入的供貨倉庫，若無則從單據中取得
$supplyWarehouseId = $data['supply_warehouse_id'] ?? $requisition->supply_warehouse_id;
$supplyWarehouseId = $requisition->supply_warehouse_id;
if (!$supplyWarehouseId) {
throw ValidationException::withMessages([
@@ -152,12 +192,17 @@ class StoreRequisitionService
// 將核准的明細寫入調撥單
$requisition->load('items');
$transferItems = [];
foreach ($requisition->items as $item) {
$qty = $item->approved_qty ?? $item->requested_qty;
if ($qty > 0) {
// 建立 req_item_id 對應 product_id 的 lookup
$reqItemMap = $requisition->items->keyBy('id');
foreach ($processedItems as $pItem) {
$reqItem = $reqItemMap->get($pItem['req_item_id']);
if ($reqItem) {
$transferItems[] = [
'product_id' => $item->product_id,
'quantity' => $qty,
'product_id' => $reqItem->product_id,
'batch_number' => $pItem['batch_number'],
'quantity' => $pItem['quantity'],
];
}
}

50
app/Modules/Inventory/Services/TransferService.php
View File

@@ -45,6 +45,17 @@ class TransferService
return [$key => $item];
});
// 釋放舊明細的預扣庫存
foreach ($order->items as $item) {
$inv = Inventory::where('warehouse_id', $order->from_warehouse_id)
->where('product_id', $item->product_id)
->where('batch_number', $item->batch_number)
->first();
if ($inv) {
$inv->releaseReservedQuantity($item->quantity);
}
}
$diff = [
'added' => [],
'removed' => [],
@@ -67,6 +78,21 @@ class TransferService
]);
$item->load('product');
// 增加新明細的預扣庫存
$inv = Inventory::firstOrCreate(
[
'warehouse_id' => $order->from_warehouse_id,
'product_id' => $item->product_id,
'batch_number' => $item->batch_number,
],
[
'quantity' => 0,
'unit_cost' => 0,
'total_value' => 0,
]
);
$inv->reserveQuantity($item->quantity);
if ($oldItemsMap->has($key)) {
$oldItem = $oldItemsMap->get($key);
if ((float)$oldItem->quantity !== (float)$data['quantity'] ||
@@ -163,6 +189,9 @@ class TransferService
$oldSourceQty = $sourceInventory->quantity;
$newSourceQty = $oldSourceQty - $item->quantity;
// 釋放草稿階段預扣的庫存
$sourceInventory->reserved_quantity = max(0, $sourceInventory->reserved_quantity - $item->quantity);
$item->update(['snapshot_quantity' => $oldSourceQty]);
$sourceInventory->quantity = $newSourceQty;
@@ -346,9 +375,22 @@ class TransferService
if ($order->status !== 'draft') {
throw new \Exception('只能作廢草稿狀態的單據');
}
$order->update([
'status' => 'voided',
'updated_by' => $userId
]);
DB::transaction(function () use ($order, $userId) {
foreach ($order->items as $item) {
$inv = Inventory::where('warehouse_id', $order->from_warehouse_id)
->where('product_id', $item->product_id)
->where('batch_number', $item->batch_number)
->first();
if ($inv) {
$inv->releaseReservedQuantity($item->quantity);
}
}
$order->update([
'status' => 'voided',
'updated_by' => $userId
]);
});
}
}