kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-16 18:54:35 +00:00
Code Issues Projects Releases Wiki Activity

Optimized stock logic

Browse Source
This commit is contained in:
Bernd Bestel
2018-11-18 12:34:05 +01:00
parent 862fd7c644
commit c71e46191f
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
services/StockService.php
View File

@@ -114,7 +114,7 @@ class StockService extends BaseService
throw new \Exception('Product does not exist'); throw new \Exception('Product does not exist');
} }
if ($transactionType === self::TRANSACTION_TYPE_CONSUME || $transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION) if ($transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION)
{ {
$stockId = uniqid(); $stockId = uniqid();
@@ -156,7 +156,7 @@ class StockService extends BaseService
throw new \Exception('Product does not exist'); throw new \Exception('Product does not exist');
} }
if ($transactionType === self::TRANSACTION_TYPE_CONSUME || $transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION) if ($transactionType === self::TRANSACTION_TYPE_CONSUME || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION)
{ {
$productStockAmount = $this->Database->stock()->where('product_id', $productId)->sum('amount'); $productStockAmount = $this->Database->stock()->where('product_id', $productId)->sum('amount');
$potentialStockEntries = $this->GetProductStockEntries($productId); $potentialStockEntries = $this->GetProductStockEntries($productId);
@@ -194,11 +194,14 @@ class StockService extends BaseService
)); ));
$logRow->save(); $logRow->save();
$amount -= $stockEntry->amount;
$stockEntry->delete(); $stockEntry->delete();
$amount -= $stockEntry->amount;
} }
else // Stock entry amount is > than needed amount -> split the stock entry resp. update the amount else // Stock entry amount is > than needed amount -> split the stock entry resp. update the amount
{ {
$restStockAmount = $stockEntry->amount - $amount;
$logRow = $this->Database->stock_log()->createRow(array( $logRow = $this->Database->stock_log()->createRow(array(
'product_id' => $stockEntry->product_id, 'product_id' => $stockEntry->product_id,
'amount' => $amount * -1, 'amount' => $amount * -1,
@@ -213,12 +216,11 @@ class StockService extends BaseService
)); ));
$logRow->save(); $logRow->save();
$restStockAmount = $stockEntry->amount - $amount;
$amount = 0;
$stockEntry->update(array( $stockEntry->update(array(
'amount' => $restStockAmount 'amount' => $restStockAmount
)); ));
$amount = 0;
} }
} }
@@ -285,10 +287,10 @@ class StockService extends BaseService
$newBestBeforeDate = $stockEntry->best_before_date; $newBestBeforeDate = $stockEntry->best_before_date;
if ($product->default_best_before_days_after_open > 0) if ($product->default_best_before_days_after_open > 0)
{ {
$newBestBeforeDate = date("Y-m-d", (strtotime('+' . $product->default_best_before_days_after_open . ' days'))); $newBestBeforeDate = date("Y-m-d", strtotime('+' . $product->default_best_before_days_after_open . ' days'));
} }
if ($amount >= $stockEntry->amount) //Take the whole stock entry if ($amount >= $stockEntry->amount) // Mark the whole stock entry as opened
{ {
$logRow = $this->Database->stock_log()->createRow(array( $logRow = $this->Database->stock_log()->createRow(array(
'product_id' => $stockEntry->product_id, 'product_id' => $stockEntry->product_id,
@@ -302,16 +304,28 @@ class StockService extends BaseService
)); ));
$logRow->save(); $logRow->save();
$amount -= $stockEntry->amount;
$stockEntry->update(array( $stockEntry->update(array(
'open' => 1, 'open' => 1,
'opened_date' => date('Y-m-d'), 'opened_date' => date('Y-m-d'),
'best_before_date' => $newBestBeforeDate 'best_before_date' => $newBestBeforeDate
)); ));
$amount -= $stockEntry->amount;
} }
else //Stock entry amount is > than needed amount -> split the stock entry resp. update the amount else // Stock entry amount is > than needed amount -> split the stock entry
{ {
$restStockAmount = $stockEntry->amount - $amount;
$newStockRow = $this->Database->stock()->createRow(array(
'product_id' => $stockEntry->product_id,
'amount' => $restStockAmount,
'best_before_date' => $stockEntry->best_before_date,
'purchased_date' => $stockEntry->purchased_date,
'stock_id' => $stockEntry->stock_id,
'price' => $stockEntry->price
));
$newStockRow->save();
$logRow = $this->Database->stock_log()->createRow(array( $logRow = $this->Database->stock_log()->createRow(array(
'product_id' => $stockEntry->product_id, 'product_id' => $stockEntry->product_id,
'amount' => $amount, 'amount' => $amount,
@@ -324,15 +338,14 @@ class StockService extends BaseService
)); ));
$logRow->save(); $logRow->save();
$restStockAmount = $stockEntry->amount - $amount;
$amount = 0;
$stockEntry->update(array( $stockEntry->update(array(
'amount' => $restStockAmount, 'amount' => $amount,
'open' => 1, 'open' => 1,
'opened_date' => date('Y-m-d'), 'opened_date' => date('Y-m-d'),
'best_before_date' => $newBestBeforeDate 'best_before_date' => $newBestBeforeDate
)); ));
$amount = 0;
} }
} }
@@ -451,7 +464,8 @@ class StockService extends BaseService
'best_before_date' => $logRow->best_before_date, 'best_before_date' => $logRow->best_before_date,
'purchased_date' => $logRow->purchased_date, 'purchased_date' => $logRow->purchased_date,
'stock_id' => $logRow->stock_id, 'stock_id' => $logRow->stock_id,
'price' => $logRow->price 'price' => $logRow->price,
'opened_date' => $logRow->opened_date
)); ));
$stockRow->save(); $stockRow->save();
@@ -464,7 +478,7 @@ class StockService extends BaseService
elseif ($logRow->transaction_type === self::TRANSACTION_TYPE_PRODUCT_OPENED) elseif ($logRow->transaction_type === self::TRANSACTION_TYPE_PRODUCT_OPENED)
{ {
// Remove opened flag from corresponding log entry // Remove opened flag from corresponding log entry
$stockRows = $this->Database->stock()->where('stock_id = :1 AND amount = :2', $logRow->stock_id, $logRow->amount); $stockRows = $this->Database->stock()->where('stock_id = :1 AND amount = :2 AND purchased_date = :3', $logRow->stock_id, $logRow->amount, $logRow->purchased_date)->limit(1);
$stockRows->update(array( $stockRows->update(array(
'open' => 0, 'open' => 0,
'opened_date' => null 'opened_date' => null