github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 04:16:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug regarding wrong calculation for subproductsubstitution

Browse Source
This commit is contained in:
wassi 2022-09-09 23:37:07 +02:00
parent ff056f8d81
commit 6d3f1d1a05
1 changed files with 85 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
services/StockService.php
View File

@ -406,17 +406,15 @@ class StockService extends BaseService
$potentialStockEntries = FindAllObjectsInArrayByPropertyValue($potentialStockEntries, 'stock_id', $specificStockEntryId); $potentialStockEntries = FindAllObjectsInArrayByPropertyValue($potentialStockEntries, 'stock_id', $specificStockEntryId);
} }
$productStockAmount = floatval($productDetails->stock_amount_aggregated);
if ($amount > $productStockAmount)
{
throw new \Exception('Amount to be consumed cannot be > current stock amount (if supplied, at the desired location)');
}
if ($transactionId === null) if ($transactionId === null)
{ {
$transactionId = uniqid(); $transactionId = uniqid();
} }
//first simulate stock consumption. Otherwhise calculations are wrong when stock units of parent and child products have a big conversion factor
$stockeEntriesToConsume = [];
// collect all stockentries
foreach ($potentialStockEntries as $stockEntry) foreach ($potentialStockEntries as $stockEntry)
{ {
if ($amount == 0) if ($amount == 0)
@ -431,66 +429,101 @@ class StockService extends BaseService
$conversion = $this->getDatabase()->quantity_unit_conversions_resolved()->where('product_id = :1 AND from_qu_id = :2 AND to_qu_id = :3', $stockEntry->product_id, $productDetails->product->qu_id_stock, $subProduct->qu_id_stock)->fetch(); $conversion = $this->getDatabase()->quantity_unit_conversions_resolved()->where('product_id = :1 AND from_qu_id = :2 AND to_qu_id = :3', $stockEntry->product_id, $productDetails->product->qu_id_stock, $subProduct->qu_id_stock)->fetch();
if ($conversion != null) if ($conversion != null)
{ {
$amount = $amount * floatval($conversion->factor); //remember factor for later
$factor = floatval($conversion->factor);
$amount = $amount * $factor;
}else{
//fail when no conversion is provided, calculattions will be wrong otherwhise
throw new \Exception('No conversion from child to parent product');
} }
} }
//collect data
if ($amount >= $stockEntry->amount) if ($amount >= $stockEntry->amount)
{ {
// Take the whole stock entry $stockeEntriesToConsume[] = [
$logRow = $this->getDatabase()->stock_log()->createRow([ "entry" => $stockEntry,
'product_id' => $stockEntry->product_id, "amount" => $stockEntry->amount
'amount' => $stockEntry->amount * -1, ];
'best_before_date' => $stockEntry->best_before_date,
'purchased_date' => $stockEntry->purchased_date,
'used_date' => date('Y-m-d'),
'spoiled' => $spoiled,
'stock_id' => $stockEntry->stock_id,
'transaction_type' => $transactionType,
'price' => $stockEntry->price,
'opened_date' => $stockEntry->opened_date,
'recipe_id' => $recipeId,
'transaction_id' => $transactionId,
'user_id' => GROCY_USER_ID,
'location_id' => $stockEntry->location_id,
'note' => $stockEntry->note
]);
$logRow->save();
$stockEntry->delete();
$amount -= $stockEntry->amount; $amount -= $stockEntry->amount;
} }
else else
{ {
// Stock entry amount is > than needed amount -> split the stock entry resp. update the amount $stockeEntriesToConsume[] = [
$restStockAmount = $stockEntry->amount - $amount; "entry" => $stockEntry,
"amount" => $amount
];
$logRow = $this->getDatabase()->stock_log()->createRow([
'product_id' => $stockEntry->product_id,
'amount' => $amount * -1,
'best_before_date' => $stockEntry->best_before_date,
'purchased_date' => $stockEntry->purchased_date,
'used_date' => date('Y-m-d'),
'spoiled' => $spoiled,
'stock_id' => $stockEntry->stock_id,
'transaction_type' => $transactionType,
'price' => $stockEntry->price,
'opened_date' => $stockEntry->opened_date,
'recipe_id' => $recipeId,
'transaction_id' => $transactionId,
'user_id' => GROCY_USER_ID,
'location_id' => $stockEntry->location_id,
'note' => $stockEntry->note
]);
$logRow->save();
$stockEntry->update([
'amount' => $restStockAmount
]);
$amount = 0; $amount = 0;
} }
// convert back when $amount had been scaled beforehand
if ($allowSubproductSubstitution && $stockEntry->product_id != $productId){
$amount=$amount/$factor;
}
}
//only when stock can be fullfilled, persist it
if($amount<=0){
foreach($stockeEntriesToConsume as $entry){
$stockEntry = $entry['entry'];
$amount = $entry['amount'];
// Take the whole stock entry
if($amount==$stockEntry->amount){
$logRow = $this->getDatabase()->stock_log()->createRow([
'product_id' => $stockEntry->product_id,
'amount' => $stockEntry->amount * -1,
'best_before_date' => $stockEntry->best_before_date,
'purchased_date' => $stockEntry->purchased_date,
'used_date' => date('Y-m-d'),
'spoiled' => $spoiled,
'stock_id' => $stockEntry->stock_id,
'transaction_type' => $transactionType,
'price' => $stockEntry->price,
'opened_date' => $stockEntry->opened_date,
'recipe_id' => $recipeId,
'transaction_id' => $transactionId,
'user_id' => GROCY_USER_ID,
'location_id' => $stockEntry->location_id,
'note' => $stockEntry->note
]);
$logRow->save();
$stockEntry->delete();
}else{
// Stock entry amount is > than needed amount -> split the stock entry resp. update the amount
$restStockAmount = $stockEntry->amount - $amount;
$logRow = $this->getDatabase()->stock_log()->createRow([
'product_id' => $stockEntry->product_id,
'amount' => $amount * -1,
'best_before_date' => $stockEntry->best_before_date,
'purchased_date' => $stockEntry->purchased_date,
'used_date' => date('Y-m-d'),
'spoiled' => $spoiled,
'stock_id' => $stockEntry->stock_id,
'transaction_type' => $transactionType,
'price' => $stockEntry->price,
'opened_date' => $stockEntry->opened_date,
'recipe_id' => $recipeId,
'transaction_id' => $transactionId,
'user_id' => GROCY_USER_ID,
'location_id' => $stockEntry->location_id,
'note' => $stockEntry->note
]);
$logRow->save();
$stockEntry->update([
'amount' => $restStockAmount
]);
}
}
}else{
throw new \Exception('Amount to be consumed cannot be > current stock amount (if supplied, at the desired location)');
} }
if (boolval($this->getUsersService()->GetUserSetting(GROCY_USER_ID, 'shopping_list_auto_add_below_min_stock_amount'))) if (boolval($this->getUsersService()->GetUserSetting(GROCY_USER_ID, 'shopping_list_auto_add_below_min_stock_amount')))