diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 054785d5..e7743f36 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1135,17 +1135,25 @@ class StockController extends BaseController // Update stock values for each day in the month foreach ($resultExists as $index => $result) { + if ($index == 0) { // Update the first entry with new consumption - $result['consumption'] = (float)($result['consumption']) + (float)($consumption); - $result['total'] = (float)$result['opening'] + (float)$result['purchaseBharath'] + (float)$result['purchaseIndian']; + $result['consumption'] = (float)($result['consumption']) + (float)($consumption); + + $result['total'] = (float)$result['opening'] + (float)$result['purchaseBharath'] + (float)$result['purchaseIndian']; + $result['balanceStock'] = $result['total'] - $result['consumption']; - $updatedOpeningStock = (int)$result['balanceStock']; + + $updatedOpeningStock = (int)$result['balanceStock']; } else { // Update subsequent entries based on previous balance + $result['opening'] = (float)$updatedOpeningStock; + $result['total'] = (float)$result['opening'] + (float)$result['purchaseBharath'] + (float)$result['purchaseIndian']; + $result['balanceStock'] = (float)$result['total'] - (float)$result['consumption']; + $updatedOpeningStock = (int)$result['balanceStock']; } @@ -1159,6 +1167,8 @@ class StockController extends BaseController } else { return 0; } + + } else { // Get the last date of the previous month $previousMonthDate = new DateTime($date); @@ -3277,7 +3287,7 @@ class StockController extends BaseController $this->TrpProductionWaste_model->insertBatch($insertWaste); } - + // Update existing records in batch if (!empty($updateMaintenance)) { $this->TrpProductionMaintenance_model->updateBatch($updateMaintenance, 'id'); diff --git a/app/Views/stock/CoatingMachineDetail.php b/app/Views/stock/CoatingMachineDetail.php index a0ecdce6..28473619 100644 --- a/app/Views/stock/CoatingMachineDetail.php +++ b/app/Views/stock/CoatingMachineDetail.php @@ -1604,41 +1604,47 @@ + + +