poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Merge pull request 'ranjith-dev' (#1090) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 20s
Details

Browse Source 
Reviewed-on: #1090
This commit was merged in pull request #1090.
This commit is contained in:
jothi
2026-09-25 05:15:55 +00:00
parent 845d2e5a85 24c9077f30
commit 314bb6d19b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/SendProductionReport.php
View File

@@ -74,7 +74,7 @@ class SendProductionReport extends Command
$tableData = [];
$no = 1;
// .
// ..
// foreach ($plants as $plant) {
// $lines = Line::where('plant_id', $plant->id)->get();
@@ -240,8 +240,8 @@ class SendProductionReport extends Command
->count();
}
if ($capacityQuan > 0) {
$efficiency = ($productionQuantity / $capacityQuan) * 100;
if ($totalTargetQuantity > 0) {
$efficiency = ($totalTargetQuantity / $productionQuantity) * 100;
} else {
$efficiency = 0;
}

2
app/Http/Controllers/CharacteristicsController.php
View File

@@ -342,7 +342,7 @@ class CharacteristicsController extends Controller
$charField = 'NIL';
}
if ($expectedTime == null || $expectedTime == '' || $expectedTime == '0' || ! $expectedTime) {
if ($expectedTime == null || $expectedTime == '' || ($markedStatus == 'Marked' && $expectedTime == '0')) { // || ! $expectedTime
return response()->json([
'status_code' => 'ERROR',
'status_description' => "Expected time can't be empty or zero!",

6
resources/views/mail/production_report.blade.php
View File

@@ -62,10 +62,10 @@
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2; white-space: nowrap;">Plant</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2; white-space: nowrap;">Line</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Line Type</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Capacity Quantity</th>
{{-- <th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Capacity Quantity</th> --}}
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Target Quantity</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Production Quantity</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">OverAll Efficiency(%)</th>
<th style="text-align: center; border: 1px solid #444; padding: 8px; background: #f2f2f2;">Plan Vs Actual Efficiency(%)</th>
</tr>
</thead>
<tbody>
@@ -75,7 +75,7 @@
<td style="border: 1px solid #444; padding: 8px; text-align: center; white-space: nowrap;">{{ $row['plant'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center; white-space: nowrap;">{{ $row['line'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['type'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['capacityQuantity'] }}</td>
{{-- <td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['capacityQuantity'] }}</td> --}}
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['targetQuantity'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['productionQuantity'] }}</td>
<td style="border: 1px solid #444; padding: 8px; text-align: center;">{{ $row['efficiency'] }}</td>