Compare commits
1 Commits
renovate/t
...
dhana-dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7d27a9dc0 |
4
.github/workflows/gemini-pr-review.yaml
vendored
4
.github/workflows/gemini-pr-review.yaml
vendored
@@ -36,8 +36,8 @@ jobs:
|
|||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-npm-global-
|
${{ runner.os }}-npm-global-
|
||||||
|
|
||||||
# - name: Install Gemini CLI globally
|
- name: Install Gemini CLI globally
|
||||||
# run: npm install -g --loglevel=http @google/gemini-cli
|
run: npm install -g --loglevel=http @google/gemini-cli
|
||||||
|
|
||||||
- name: Generate git diff and review with Gemini
|
- name: Generate git diff and review with Gemini
|
||||||
id: review
|
id: review
|
||||||
|
|||||||
@@ -1,202 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Illuminate\Console\Scheduling\Schedule;
|
|
||||||
use App\Models\AlertMailRule;
|
|
||||||
use Illuminate\Support\Facades\Artisan;
|
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
|
|
||||||
class Scheduler extends Command
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The name and signature of the console command.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
// protected $signature = 'app:scheduler';
|
|
||||||
|
|
||||||
protected $signature = 'custom:scheduler';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The console command description.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
// protected $description = 'Command description';
|
|
||||||
|
|
||||||
protected $description = 'Manually trigger scheduler logic';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the console command.
|
|
||||||
*/
|
|
||||||
// public function handle()
|
|
||||||
// {
|
|
||||||
// //
|
|
||||||
// }
|
|
||||||
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
|
|
||||||
// --- Production Rules ---
|
|
||||||
$productionRules = AlertMailRule::where('module', 'ProductionQuantities')
|
|
||||||
->where('rule_name', 'ProductionMail')
|
|
||||||
->select('plant', 'schedule_type')
|
|
||||||
->distinct()
|
|
||||||
->get();
|
|
||||||
|
|
||||||
foreach ($productionRules as $rule) {
|
|
||||||
switch ($rule->schedule_type) {
|
|
||||||
case 'Live':
|
|
||||||
// Run every minute
|
|
||||||
\Artisan::call('send:production-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
break;
|
|
||||||
case 'Hourly':
|
|
||||||
if (now()->minute == 0) {
|
|
||||||
\Artisan::call('send:production-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'Daily':
|
|
||||||
if (now()->format('H:i') == '07:59') {
|
|
||||||
\Artisan::call('send:production-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// --- Invoice Validation Rules ---
|
|
||||||
$invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
|
|
||||||
->where('rule_name', 'InvoiceMail')
|
|
||||||
->select('plant', 'schedule_type')
|
|
||||||
->distinct()
|
|
||||||
->get();
|
|
||||||
|
|
||||||
foreach ($invoiceRules as $rule) {
|
|
||||||
|
|
||||||
switch ($rule->schedule_type) {
|
|
||||||
case 'Live':
|
|
||||||
// Run every minute
|
|
||||||
\Artisan::call('send:invoice-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'Hourly':
|
|
||||||
if (now()->minute == 0) {
|
|
||||||
\Artisan::call('send:invoice-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'Daily':
|
|
||||||
if (now()->format('H:i') == '07:59') {
|
|
||||||
\Artisan::call('send:invoice-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// foreach ($invoiceRules as $rule) {
|
|
||||||
|
|
||||||
// switch ($rule->schedule_type) {
|
|
||||||
// case 'Live':
|
|
||||||
// try {
|
|
||||||
// Artisan::call('send:invoice-report', [
|
|
||||||
// 'schedule_type' => $rule->schedule_type,
|
|
||||||
// 'plant' => $rule->plant,
|
|
||||||
// ]);
|
|
||||||
|
|
||||||
// Log::info('Invoice report sent | Plant: '.$rule->plant);
|
|
||||||
// } catch (\Throwable $e) {
|
|
||||||
// Log::error("Invoice Live Failed ({$rule->plant}): ".$e->getMessage());
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
|
|
||||||
// case 'Hourly':
|
|
||||||
// if (now()->minute == 0) {
|
|
||||||
// Artisan::call('send:invoice-report', [
|
|
||||||
// 'schedule_type' => $rule->schedule_type,
|
|
||||||
// 'plant' => $rule->plant,
|
|
||||||
// ]);
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
|
|
||||||
// case 'Daily':
|
|
||||||
// if (now()->format('H:i') == '07:59') {
|
|
||||||
// Artisan::call('send:invoice-report', [
|
|
||||||
// 'schedule_type' => $rule->schedule_type,
|
|
||||||
// 'plant' => $rule->plant,
|
|
||||||
// ]);
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
// --- Invoice Data Report Rules ---
|
|
||||||
$invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
|
|
||||||
->where('rule_name', 'InvoiceDataMail')
|
|
||||||
->select('plant', 'schedule_type')
|
|
||||||
->distinct()
|
|
||||||
->get();
|
|
||||||
|
|
||||||
foreach ($invoiceDataRules as $rule) {
|
|
||||||
|
|
||||||
switch ($rule->schedule_type) {
|
|
||||||
case 'Live':
|
|
||||||
// Run every minute
|
|
||||||
\Artisan::call('send:invoice-data-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
break;
|
|
||||||
case 'Hourly':
|
|
||||||
if (now()->minute == 0) {
|
|
||||||
\Artisan::call('send:invoice-data-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'Daily':
|
|
||||||
if (now()->format('H:i') == '10:00') {
|
|
||||||
\Artisan::call('send:invoice-data-report', [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper to call Artisan commands with parameters.
|
|
||||||
*/
|
|
||||||
protected function callArtisanCommand($commandName, $rule)
|
|
||||||
{
|
|
||||||
\Artisan::call($commandName, [
|
|
||||||
'schedule_type' => $rule->schedule_type,
|
|
||||||
'plant' => $rule->plant,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->info("Executed {$commandName} for plant: {$rule->plant}");
|
|
||||||
\Log::info("Executed {$commandName} for plant: {$rule->plant}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Console\Commands;
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
use App\Mail\test;
|
|
||||||
use App\Models\InvoiceValidation;
|
use App\Models\InvoiceValidation;
|
||||||
use App\Models\Plant;
|
use App\Models\Plant;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Support\Facades\Mail;
|
use Illuminate\Support\Facades\Mail;
|
||||||
|
use App\Mail\test;
|
||||||
|
|
||||||
class SendInvoiceReport extends Command
|
class SendInvoiceReport extends Command
|
||||||
{
|
{
|
||||||
@@ -18,6 +18,7 @@ class SendInvoiceReport extends Command
|
|||||||
// protected $signature = 'app:send-invoice-report';
|
// protected $signature = 'app:send-invoice-report';
|
||||||
protected $signature = 'send:invoice-report{schedule_type} {plant}';
|
protected $signature = 'send:invoice-report{schedule_type} {plant}';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The console command description.
|
* The console command description.
|
||||||
*
|
*
|
||||||
@@ -28,6 +29,8 @@ class SendInvoiceReport extends Command
|
|||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$schedule = $this->argument('schedule_type');
|
$schedule = $this->argument('schedule_type');
|
||||||
@@ -49,14 +52,18 @@ class SendInvoiceReport extends Command
|
|||||||
: [$plantIdArg];
|
: [$plantIdArg];
|
||||||
|
|
||||||
$no = 1;
|
$no = 1;
|
||||||
if (strtolower($schedule) == 'daily') {
|
if (strtolower($schedule) == 'daily')
|
||||||
|
{
|
||||||
$startDate = now()->subDay()->setTime(8, 0, 0);
|
$startDate = now()->subDay()->setTime(8, 0, 0);
|
||||||
$endDate = now()->setTime(8, 0, 0);
|
$endDate = now()->setTime(8, 0, 0);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$startDate = now()->setTime(8, 0, 0);
|
$startDate = now()->setTime(8, 0, 0);
|
||||||
$endDate = now()->copy()->addDay()->setTime(8, 0, 0);
|
$endDate = now()->copy()->addDay()->setTime(8, 0, 0);
|
||||||
}
|
}
|
||||||
foreach ($plantIds as $plantId) {
|
foreach ($plantIds as $plantId)
|
||||||
|
{
|
||||||
$plant = Plant::find($plantId);
|
$plant = Plant::find($plantId);
|
||||||
$plantName = $plant ? $plant->name : $plantId;
|
$plantName = $plant ? $plant->name : $plantId;
|
||||||
|
|
||||||
@@ -186,6 +193,7 @@ class SendInvoiceReport extends Command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Send to MaterialInvoiceMail recipients (material + bundle table)
|
// Send to MaterialInvoiceMail recipients (material + bundle table)
|
||||||
if ($mailRules->has('MaterialInvoiceMail')) {
|
if ($mailRules->has('MaterialInvoiceMail')) {
|
||||||
$emails = $mailRules['MaterialInvoiceMail']->pluck('email')->unique()->toArray();
|
$emails = $mailRules['MaterialInvoiceMail']->pluck('email')->unique()->toArray();
|
||||||
@@ -214,4 +222,6 @@ class SendInvoiceReport extends Command
|
|||||||
|
|
||||||
$this->info($contentVars['wishes'] ?? '');
|
$this->info($contentVars['wishes'] ?? '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,70 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Filament\Exports;
|
|
||||||
|
|
||||||
use App\Models\ProductCharacteristicsMaster;
|
|
||||||
use Filament\Actions\Exports\ExportColumn;
|
|
||||||
use Filament\Actions\Exports\Exporter;
|
|
||||||
use Filament\Actions\Exports\Models\Export;
|
|
||||||
|
|
||||||
class ProductCharacteristicsMasterExporter extends Exporter
|
|
||||||
{
|
|
||||||
protected static ?string $model = ProductCharacteristicsMaster::class;
|
|
||||||
|
|
||||||
public static function getColumns(): array
|
|
||||||
{
|
|
||||||
static $rowNumber = 0;
|
|
||||||
return [
|
|
||||||
ExportColumn::make('no')
|
|
||||||
->label('NO')
|
|
||||||
->state(function ($record) use (&$rowNumber) {
|
|
||||||
// Increment and return the row number
|
|
||||||
return ++$rowNumber;
|
|
||||||
}),
|
|
||||||
ExportColumn::make('plant.name')
|
|
||||||
->label('PLANT'),
|
|
||||||
ExportColumn::make('item.code')
|
|
||||||
->label('ITEM CODE'),
|
|
||||||
ExportColumn::make('line.name')
|
|
||||||
->label('LINE NAME'), //machine.workGroupMaster.name
|
|
||||||
ExportColumn::make('machine.workGroupMaster.name')
|
|
||||||
->label('WORK GROUP MASTER'),
|
|
||||||
ExportColumn::make('machine.work_center')
|
|
||||||
->label('WORK CENTER'),
|
|
||||||
ExportColumn::make('characteristics_type')
|
|
||||||
->label('CHARACTERISTICS TYPE'),
|
|
||||||
ExportColumn::make('name')
|
|
||||||
->label('NAME'),
|
|
||||||
ExportColumn::make('inspection_type')
|
|
||||||
->label('INSPECTION TYPE'),
|
|
||||||
ExportColumn::make('upper')
|
|
||||||
->label('UPPER'),
|
|
||||||
ExportColumn::make('lower')
|
|
||||||
->label('LOWER'),
|
|
||||||
ExportColumn::make('middle')
|
|
||||||
->label('MIDDLE'),
|
|
||||||
ExportColumn::make('created_at')
|
|
||||||
->label('CREATED AT'),
|
|
||||||
ExportColumn::make('updated_at')
|
|
||||||
->label('UPDATED AT'),
|
|
||||||
ExportColumn::make('created_by')
|
|
||||||
->label('CREATED BY'),
|
|
||||||
ExportColumn::make('updated_by')
|
|
||||||
->label('UPDATED BY'),
|
|
||||||
ExportColumn::make('deleted_at')
|
|
||||||
->label('DELETED AT')
|
|
||||||
->enabledByDefault(false),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getCompletedNotificationBody(Export $export): string
|
|
||||||
{
|
|
||||||
$body = 'Your product characteristics master export has completed and ' . number_format($export->successful_rows) . ' ' . str('row')->plural($export->successful_rows) . ' exported.';
|
|
||||||
|
|
||||||
if ($failedRowsCount = $export->getFailedRowsCount()) {
|
|
||||||
$body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to export.';
|
|
||||||
}
|
|
||||||
|
|
||||||
return $body;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Filament\Imports;
|
|
||||||
|
|
||||||
use App\Models\Item;
|
|
||||||
use App\Models\Line;
|
|
||||||
use App\Models\Machine;
|
|
||||||
use App\Models\Plant;
|
|
||||||
use App\Models\ProductCharacteristicsMaster;
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\WorkGroupMaster;
|
|
||||||
use Filament\Actions\Imports\ImportColumn;
|
|
||||||
use Filament\Actions\Imports\Importer;
|
|
||||||
use Filament\Actions\Imports\Models\Import;
|
|
||||||
use Str;
|
|
||||||
use Filament\Actions\Imports\Exceptions\RowImportFailedException;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class ProductCharacteristicsMasterImporter extends Importer
|
|
||||||
{
|
|
||||||
protected static ?string $model = ProductCharacteristicsMaster::class;
|
|
||||||
|
|
||||||
public static function getColumns(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
ImportColumn::make('plant')
|
|
||||||
->requiredMapping()
|
|
||||||
->exampleHeader('Plant Name')
|
|
||||||
->example('Ransar Industries-I')
|
|
||||||
->label('Plant Name')
|
|
||||||
->relationship(resolveUsing:'name')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('item')
|
|
||||||
->requiredMapping()
|
|
||||||
->exampleHeader('Item Code')
|
|
||||||
->example('630214')
|
|
||||||
->label('Item Code')
|
|
||||||
->relationship(resolveUsing:'code')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('line')
|
|
||||||
->requiredMapping()
|
|
||||||
->exampleHeader('Line')
|
|
||||||
->example('4 inch pump line')
|
|
||||||
->label('Line')
|
|
||||||
->relationship(resolveUsing:'name')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('work_group_master_id')
|
|
||||||
->label('Group Work Center')
|
|
||||||
->requiredMapping()
|
|
||||||
->exampleHeader('Group Work Center')
|
|
||||||
->example('RMGCGABC')
|
|
||||||
->relationship(resolveUsing:'name')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('machine')
|
|
||||||
->requiredMapping()
|
|
||||||
->exampleHeader('Work Center')
|
|
||||||
->example('RMGCE001')
|
|
||||||
->label('Work Center')
|
|
||||||
->relationship(resolveUsing:'work_center')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('characteristics_type')
|
|
||||||
->exampleHeader('Characteristics Type')
|
|
||||||
->example('Process or Product')
|
|
||||||
->label('Characteristics Type')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('name')
|
|
||||||
->exampleHeader('Name')
|
|
||||||
->example('Body')
|
|
||||||
->label('Name')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('inspection_type')
|
|
||||||
->exampleHeader('Inspection Type')
|
|
||||||
->example('Visual or Value')
|
|
||||||
->label('Inspection Type')
|
|
||||||
->rules(['required']),
|
|
||||||
ImportColumn::make('lower')
|
|
||||||
->exampleHeader('Lower')
|
|
||||||
->example('-0.2')
|
|
||||||
->label('Lower')
|
|
||||||
->rules(['numeric']),
|
|
||||||
ImportColumn::make('middle')
|
|
||||||
->exampleHeader('Middle')
|
|
||||||
->example('1')
|
|
||||||
->label('Middle')
|
|
||||||
->numeric()
|
|
||||||
->rules(['numeric']),
|
|
||||||
ImportColumn::make('upper')
|
|
||||||
->exampleHeader('Upper')
|
|
||||||
->example('0.2')
|
|
||||||
->label('Upper')
|
|
||||||
->rules(['numeric']),
|
|
||||||
ImportColumn::make('created_by')
|
|
||||||
->exampleHeader('Created By')
|
|
||||||
->example('Admin')
|
|
||||||
->label('Created By'),
|
|
||||||
//ImportColumn::make('updated_by'),
|
|
||||||
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function resolveRecord(): ?ProductCharacteristicsMaster
|
|
||||||
{
|
|
||||||
|
|
||||||
$warnMsg = [];
|
|
||||||
$plant = Plant::where('name', $this->data['plant'])->first();
|
|
||||||
if (!$plant) {
|
|
||||||
$warnMsg[] = "Plant not found";
|
|
||||||
}
|
|
||||||
|
|
||||||
$itemExists = Item::where('code', $this->data['item'])->first();
|
|
||||||
if (!$itemExists) {
|
|
||||||
$warnMsg[] = "Item not found";
|
|
||||||
}
|
|
||||||
|
|
||||||
$itemAgainstPlant = Item::where('code', $this->data['item'])
|
|
||||||
->where('plant_id', $plant->id)
|
|
||||||
->first();
|
|
||||||
if (!$itemAgainstPlant) {
|
|
||||||
$warnMsg[] = "Item code not found for the given plant";
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$itemId = $itemAgainstPlant->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
$lineExists = Line::where('name', $this->data['line'])->first();
|
|
||||||
if (!$lineExists) {
|
|
||||||
$warnMsg[] = "Line not found";
|
|
||||||
}
|
|
||||||
|
|
||||||
$lineAgainstPlant = Line::where('name', $this->data['line'])
|
|
||||||
->where('plant_id', $plant->id)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if (!$lineAgainstPlant) {
|
|
||||||
$warnMsg[] = "Line not found for the given plant";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$LineId = $lineAgainstPlant->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
$WorkgroupMaster = WorkGroupMaster::where('name', $this->data['work_group_master_id'])->where('plant_id', $plant->id)->first();
|
|
||||||
if (!$WorkgroupMaster) {
|
|
||||||
$warnMsg[] = "Work Group Master value not found";
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
|
|
||||||
$workGroupMasterId = $WorkgroupMaster->id;
|
|
||||||
|
|
||||||
// 2. Now check if this WorkGroupMaster id exists in ANY of the 10 columns
|
|
||||||
$existsInLine = Line::where('plant_id', $plant->id)
|
|
||||||
->where(function ($q) use ($workGroupMasterId) {
|
|
||||||
for ($i = 1; $i <= 10; $i++) {
|
|
||||||
$q->orWhere("work_group{$i}_id", $workGroupMasterId);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
->exists();
|
|
||||||
|
|
||||||
if (!$existsInLine) {
|
|
||||||
$warnMsg[] = "Work Group Master '{$WorkgroupMaster->name}' is not mapped to any line in this plant";
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$workGroupMasterId = $WorkgroupMaster->id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$machine = Machine::where('work_center', $this->data['machine'])->first();
|
|
||||||
if (!$machine) {
|
|
||||||
$warnMsg[] = "Work Center not found";
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$machineId = $machine->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
$machineAgainstPlant = Machine::where('work_center', $this->data['machine'])
|
|
||||||
->where('plant_id', $plant->id)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if (!$machineAgainstPlant) {
|
|
||||||
$warnMsg[] = "Work Center not found for the given plant";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$machineId = $machineAgainstPlant->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
$user = User::where('name', $this->data['created_by'])->first();
|
|
||||||
if (!$user) {
|
|
||||||
$warnMsg[] = "Operator ID not found";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (($this->data['inspection_type'] ?? null) == 'Value') {
|
|
||||||
$upper = $this->data['upper'] ?? null;
|
|
||||||
$lower = $this->data['lower'] ?? null;
|
|
||||||
$middle = $this->data['middle'] ?? null;
|
|
||||||
|
|
||||||
if (is_null($upper) || is_null($lower) || is_null($middle)) {
|
|
||||||
$warnMsg[] = "For 'Value' inspection type, Upper, Lower, and Middle values are required.";
|
|
||||||
} elseif (!is_numeric($upper) || !is_numeric($lower) || !is_numeric($middle)) {
|
|
||||||
$warnMsg[] = "Upper, Lower, and Middle values must be numeric.";
|
|
||||||
} elseif (!($lower <= $middle && $middle <= $upper)) {
|
|
||||||
$warnMsg[] = "For 'Value' inspection type, values must satisfy: Lower ≤ Middle ≤ Upper.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($warnMsg)) {
|
|
||||||
throw new RowImportFailedException(implode(', ', $warnMsg));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$record = ProductCharacteristicsMaster::firstOrNew([
|
|
||||||
'plant_id' => $plant->id,
|
|
||||||
'item_id' => $itemId,
|
|
||||||
'line_id' => $LineId,
|
|
||||||
'work_group_master_id' => $workGroupMasterId,
|
|
||||||
'machine_id' => $machineId,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$currentUser = Auth::check() ? Auth::user()->name : ($this->data['created_by'] ?? 'System');
|
|
||||||
|
|
||||||
// If record is new, fill all fields
|
|
||||||
if (!$record->exists) {
|
|
||||||
$record->name = $this->data['name'];
|
|
||||||
$record->characteristics_type = $this->data['characteristics_type'];
|
|
||||||
$record->inspection_type = $this->data['inspection_type'];
|
|
||||||
$record->upper = $this->data['upper'] ?? null;
|
|
||||||
$record->lower = $this->data['lower'] ?? null;
|
|
||||||
$record->middle = $this->data['middle'] ?? null;
|
|
||||||
$record->created_by = $currentUser;
|
|
||||||
} else {
|
|
||||||
// Record exists → update only updated_by and updated_at
|
|
||||||
$record->updated_by = $currentUser;
|
|
||||||
$record->touch();
|
|
||||||
}
|
|
||||||
|
|
||||||
$record->save();
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// ProductCharacteristicsMaster::updateOrCreate(
|
|
||||||
// [
|
|
||||||
// 'plant_id' => $plant->id,
|
|
||||||
// 'item_id' => $itemId,
|
|
||||||
// 'line_id' => $LineId,
|
|
||||||
// 'work_group_master_id' => $workGroupMasterId,
|
|
||||||
// 'machine_id'=> $machineId,
|
|
||||||
|
|
||||||
// ],
|
|
||||||
// [
|
|
||||||
// 'name' => $this->data['name'],
|
|
||||||
// 'characteristics_type' => $this->data['characteristics_type'],
|
|
||||||
// 'inspection_type' => $this->data['inspection_type'],
|
|
||||||
// 'upper' => $this->data['upper'] ?? null,
|
|
||||||
// 'lower' => $this->data['lower'] ?? null,
|
|
||||||
// 'middle' => $this->data['middle'] ?? null,
|
|
||||||
// //'created_by' => user ?? $this->data['created_by'],
|
|
||||||
// 'created_by' => Auth::check() ? Auth::user()->name :($this->data['created_by'] ?? null)
|
|
||||||
// ]
|
|
||||||
// );
|
|
||||||
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
|
|
||||||
//return new WorkGroupMaster();
|
|
||||||
|
|
||||||
// return new ProductCharacteristicsMaster();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getCompletedNotificationBody(Import $import): string
|
|
||||||
{
|
|
||||||
$body = 'Your product characteristics master import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.';
|
|
||||||
|
|
||||||
if ($failedRowsCount = $import->getFailedRowsCount()) {
|
|
||||||
$body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to import.';
|
|
||||||
}
|
|
||||||
|
|
||||||
return $body;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -70,6 +70,7 @@ class AlertMailRuleResource extends Resource
|
|||||||
->label('CC Emails'),
|
->label('CC Emails'),
|
||||||
Forms\Components\Select::make('schedule_type')
|
Forms\Components\Select::make('schedule_type')
|
||||||
->label('Schedule Type')
|
->label('Schedule Type')
|
||||||
|
->required()
|
||||||
->options([
|
->options([
|
||||||
'Live' => 'Live',
|
'Live' => 'Live',
|
||||||
'Hourly' => 'Hourly',
|
'Hourly' => 'Hourly',
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ namespace App\Filament\Resources;
|
|||||||
use AlperenErsoy\FilamentExport\Actions\FilamentExportBulkAction;
|
use AlperenErsoy\FilamentExport\Actions\FilamentExportBulkAction;
|
||||||
use App\Filament\Exports\InvoiceValidationExporter;
|
use App\Filament\Exports\InvoiceValidationExporter;
|
||||||
use App\Filament\Resources\InvoiceValidationResource\Pages;
|
use App\Filament\Resources\InvoiceValidationResource\Pages;
|
||||||
use App\Mail\InvoiceNotification;
|
|
||||||
use App\Models\InvoiceValidation;
|
use App\Models\InvoiceValidation;
|
||||||
use App\Models\Item;
|
use App\Models\Item;
|
||||||
use App\Models\Plant;
|
use App\Models\Plant;
|
||||||
@@ -30,6 +29,7 @@ use Filament\Tables;
|
|||||||
use Filament\Tables\Table;
|
use Filament\Tables\Table;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
||||||
|
use Filament\Forms\Components\View;
|
||||||
use Filament\Notifications\Notification;
|
use Filament\Notifications\Notification;
|
||||||
use Filament\Tables\Actions\Action;
|
use Filament\Tables\Actions\Action;
|
||||||
use Filament\Tables\Actions\ExportAction;
|
use Filament\Tables\Actions\ExportAction;
|
||||||
@@ -38,10 +38,6 @@ use Illuminate\Support\Facades\Storage;
|
|||||||
use Maatwebsite\Excel\Facades\Excel;
|
use Maatwebsite\Excel\Facades\Excel;
|
||||||
use Livewire\Livewire;
|
use Livewire\Livewire;
|
||||||
use Str;
|
use Str;
|
||||||
use Illuminate\Support\Facades\Session;
|
|
||||||
use Illuminate\Support\Facades\Mail;
|
|
||||||
use Filament\Forms\Components\View;
|
|
||||||
|
|
||||||
|
|
||||||
class InvoiceValidationResource extends Resource
|
class InvoiceValidationResource extends Resource
|
||||||
{
|
{
|
||||||
@@ -53,8 +49,6 @@ class InvoiceValidationResource extends Resource
|
|||||||
|
|
||||||
public $invoiceNumber;
|
public $invoiceNumber;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static function form(Form $form): Form
|
public static function form(Form $form): Form
|
||||||
{
|
{
|
||||||
return $form
|
return $form
|
||||||
@@ -125,9 +119,6 @@ class InvoiceValidationResource extends Resource
|
|||||||
$invNo = $get('invoice_number');
|
$invNo = $get('invoice_number');
|
||||||
$set('serial_number', null);
|
$set('serial_number', null);
|
||||||
$set('update_invoice', null);
|
$set('update_invoice', null);
|
||||||
//Session::put('invoice_number', $state);
|
|
||||||
session(['invoice_number' => $state]);
|
|
||||||
|
|
||||||
// if (!$invNo) { return; } else { }
|
// if (!$invNo) { return; } else { }
|
||||||
}),
|
}),
|
||||||
|
|
||||||
@@ -135,32 +126,17 @@ class InvoiceValidationResource extends Resource
|
|||||||
->label('Serial Number')
|
->label('Serial Number')
|
||||||
->reactive()
|
->reactive()
|
||||||
->readOnly(fn (callable $get) => empty($get('invoice_number')))
|
->readOnly(fn (callable $get) => empty($get('invoice_number')))
|
||||||
->disabled(fn (Get $get) => empty($get('invoice_number')))
|
//->disabled(fn (Get $get) => empty($get('invoice_number')))
|
||||||
->extraAttributes([
|
->extraAttributes([
|
||||||
'id' => 'serial_number_input',
|
'id' => 'serial_number_input',
|
||||||
'x-data' => '{ value: "" }',
|
'x-data' => '{ value: "" }',
|
||||||
'x-model' => 'value',
|
'x-model' => 'value',
|
||||||
'wire:keydown.enter.prevent' => 'processSerial(value)', // Using wire:keydown
|
'wire:keydown.enter.prevent' => 'processSerialNumber(value)', // Using wire:keydown
|
||||||
])
|
])
|
||||||
// ->dehydrated(false) // Do not trigger Livewire syncing
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
// ->extraAttributes([
|
|
||||||
// 'id' => 'serial_number_input',
|
|
||||||
// 'x-on:keydown.enter.prevent' => "
|
|
||||||
// let serial = \$event.target.value;
|
|
||||||
// if (serial.trim() != '') {
|
|
||||||
// \$wire.dispatch('process-scan', serial);
|
|
||||||
// \$event.target.value = '';
|
|
||||||
// }
|
|
||||||
// ",
|
|
||||||
// ])
|
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get, callable $livewire) {
|
|
||||||
$set('update_invoice', 0);
|
$set('update_invoice', 0);
|
||||||
// $this->dispatch('focus-serial-number');
|
// $this->dispatch('focus-serial-number');
|
||||||
// if (!$invNo) { return; } else { }
|
// if (!$invNo) { return; } else { }
|
||||||
// if ($state) {
|
|
||||||
// $livewire('process-scan', $state);
|
|
||||||
// $set('serial_number', null);
|
|
||||||
// }
|
|
||||||
})
|
})
|
||||||
->columnSpan(1),
|
->columnSpan(1),
|
||||||
Forms\Components\TextInput::make('total_quantity')
|
Forms\Components\TextInput::make('total_quantity')
|
||||||
@@ -1280,24 +1256,6 @@ class InvoiceValidationResource extends Resource
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
// public static function render(): View
|
|
||||||
// {
|
|
||||||
// if (session()->has('invoice_number')) {
|
|
||||||
// $invoiceNumber = session('invoice_number');
|
|
||||||
|
|
||||||
// // Debug: show the invoice number
|
|
||||||
// dd($invoiceNumber); // This will stop execution and show the value
|
|
||||||
|
|
||||||
// // Trigger email
|
|
||||||
// \Mail::to('jothikumar.padmanaban@cripumps.com')
|
|
||||||
// ->send(new InvoiceNotification($invoiceNumber));
|
|
||||||
|
|
||||||
// // Clear session so it doesn't resend on next refresh
|
|
||||||
// //session()->forget('invoice_number');
|
|
||||||
// }
|
|
||||||
// // return view('filament.resources.invoice-validation-resource.pages.list-invoice-validation');
|
|
||||||
// }
|
|
||||||
|
|
||||||
public static function getEloquentQuery(): Builder
|
public static function getEloquentQuery(): Builder
|
||||||
{
|
{
|
||||||
return parent::getEloquentQuery()
|
return parent::getEloquentQuery()
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ use Illuminate\Support\Facades\Mail;
|
|||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Maatwebsite\Excel\Facades\Excel;
|
use Maatwebsite\Excel\Facades\Excel;
|
||||||
use Str;
|
use Str;
|
||||||
use Livewire\Attributes\On;
|
|
||||||
|
|
||||||
class CreateInvoiceValidation extends CreateRecord
|
class CreateInvoiceValidation extends CreateRecord
|
||||||
{
|
{
|
||||||
@@ -70,7 +69,7 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
$totQuan = InvoiceValidation::where('invoice_number', $this->invoiceNumber)->where('plant_id', $this->plantId)->count();
|
$totQuan = InvoiceValidation::where('invoice_number', $this->invoiceNumber)->where('plant_id', $this->plantId)->count();
|
||||||
$scanSQuan = InvoiceValidation::where('invoice_number', $this->invoiceNumber)->where('scanned_status', 'Scanned')->where('plant_id', $this->plantId)->count();
|
$scanSQuan = InvoiceValidation::where('invoice_number', $this->invoiceNumber)->where('scanned_status', 'Scanned')->where('plant_id', $this->plantId)->count();
|
||||||
|
|
||||||
// $this->dispatch('playNotificationSound');
|
$this->dispatch('playNotificationSound');
|
||||||
if ($totQuan == $scanSQuan) {
|
if ($totQuan == $scanSQuan) {
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $this->plantId,
|
'plant_id' => $this->plantId,
|
||||||
@@ -2261,7 +2260,7 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function processSerial($serNo)
|
public function processSerialNumber($serNo)
|
||||||
{
|
{
|
||||||
$serNo = trim($serNo);
|
$serNo = trim($serNo);
|
||||||
$mSerNo = $serNo;
|
$mSerNo = $serNo;
|
||||||
@@ -2371,18 +2370,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
// .Mail
|
// .Mail
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2405,19 +2404,19 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
// .Mail
|
// .Mail
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2440,19 +2439,19 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
// .Mail
|
// .Mail
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2482,18 +2481,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
// .Mail
|
// .Mail
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2514,18 +2513,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2556,18 +2555,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
// .Mail
|
// .Mail
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2589,18 +2588,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
// .Mail
|
// .Mail
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2631,18 +2630,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
// .Mail
|
// .Mail
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'InvalidMaterialFormat')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2669,18 +2668,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFound')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFound')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2706,18 +2705,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFoundDB')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotFoundDB')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2742,18 +2741,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotValidMaterialType')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotValidMaterialType')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2784,18 +2783,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotInvoice')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'ItemNotInvoice')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -2825,18 +2824,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
// $mailData = $this->getMail();
|
$mailData = $this->getMail();
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
// $mInvoiceType = 'Material';
|
$mInvoiceType = 'Material';
|
||||||
|
|
||||||
// if (! empty($emails)) {
|
if (! empty($emails)) {
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'Item')
|
new InvalidSerialMail($mSerNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'Item')
|
||||||
// );
|
);
|
||||||
// } else {
|
} else {
|
||||||
// \Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -3099,6 +3098,22 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
// ..Mail
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, 'InvalidFormat')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3140,6 +3155,23 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('play-warn-sound');
|
$this->dispatch('play-warn-sound');
|
||||||
|
|
||||||
|
// ..Mail
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'NotFound')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// ..
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3208,6 +3240,19 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'NotFoundItemS')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3260,6 +3305,19 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'NotValidPackage')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3298,6 +3356,18 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->seconds(3)
|
->seconds(3)
|
||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'NotMotorQR')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -3319,6 +3389,21 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
// ..Mail
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'DuplicateMotorQR')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3429,6 +3514,20 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'NotPumpQR')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3448,6 +3547,20 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
->send();
|
->send();
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'DuplicatePumpQR')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3562,6 +3675,20 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'MissingPanelBox')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3638,6 +3765,20 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'UnknownPumpsetQR')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3658,6 +3799,20 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
|
|
||||||
$this->dispatch('playWarnSound');
|
$this->dispatch('playWarnSound');
|
||||||
|
|
||||||
|
$mInvoiceType = 'Serial';
|
||||||
|
$mailData = $this->getMail();
|
||||||
|
$mPlantName = $mailData['plant_name'];
|
||||||
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
|
if (! empty($emails)) {
|
||||||
|
// Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
|
Mail::to($emails)->send(
|
||||||
|
new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType, $itemCode, 'DuplicatePumpsetQR')
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
\Log::warning("No recipients found for plant {$plantId}, module Serial, rule invalid_serial.");
|
||||||
|
}
|
||||||
|
|
||||||
$this->form->fill([
|
$this->form->fill([
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'invoice_number' => $invoiceNumber,
|
'invoice_number' => $invoiceNumber,
|
||||||
@@ -3765,12 +3920,6 @@ class CreateInvoiceValidation extends CreateRecord
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// #[On('process-scan')]
|
|
||||||
// public function processSerial($serial)
|
|
||||||
// {
|
|
||||||
// $this->processSer($serial); // Your duplicate check + mail logic
|
|
||||||
// }
|
|
||||||
|
|
||||||
public function getHeading(): string
|
public function getHeading(): string
|
||||||
{
|
{
|
||||||
return 'Scan Invoice Validation';
|
return 'Scan Invoice Validation';
|
||||||
|
|||||||
@@ -24,12 +24,6 @@ use Illuminate\Database\Eloquent\SoftDeletingScope;
|
|||||||
use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
|
use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
|
||||||
use Smalot\PdfParser\Parser;
|
use Smalot\PdfParser\Parser;
|
||||||
use Storage;
|
use Storage;
|
||||||
use Filament\Forms\Components\DateTimePicker;
|
|
||||||
use Filament\Tables\Filters\Filter;
|
|
||||||
use Filament\Forms\Components\Select;
|
|
||||||
use App\Models\Line;
|
|
||||||
use Filament\Forms\Components\TextInput;
|
|
||||||
use App\Models\Item;
|
|
||||||
|
|
||||||
class ProcessOrderResource extends Resource
|
class ProcessOrderResource extends Resource
|
||||||
{
|
{
|
||||||
@@ -115,6 +109,7 @@ class ProcessOrderResource extends Resource
|
|||||||
->afterStateHydrated(function ($component, $state, Get $get, Set $set) {
|
->afterStateHydrated(function ($component, $state, Get $get, Set $set) {
|
||||||
$itemId = $get('item_id');
|
$itemId = $get('item_id');
|
||||||
if ($get('id')) {
|
if ($get('id')) {
|
||||||
|
|
||||||
$item = \App\Models\Item::where('id', $itemId)->first()?->description;
|
$item = \App\Models\Item::where('id', $itemId)->first()?->description;
|
||||||
if ($item) {
|
if ($item) {
|
||||||
$set('item_description', $item);
|
$set('item_description', $item);
|
||||||
@@ -144,34 +139,6 @@ class ProcessOrderResource extends Resource
|
|||||||
$set('sfgNumberError', null);
|
$set('sfgNumberError', null);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
->rule(function (callable $get) {
|
|
||||||
return function (string $attribute, $value, \Closure $fail) use ($get) {
|
|
||||||
|
|
||||||
$plantId = $get('plant_id');
|
|
||||||
$itemId = $get('item_id');
|
|
||||||
$processOrder = $value;
|
|
||||||
//$currentId = $get('id'); // current editing record id
|
|
||||||
|
|
||||||
if (! $plantId || ! $processOrder) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$existing = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('item_id', '!=', $itemId)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if ($existing) {
|
|
||||||
|
|
||||||
Notification::make()
|
|
||||||
->title('Duplicate Process Order!')
|
|
||||||
->body("Process Order '{$value}' is already exist with item code '{$existing->item->code}'.")
|
|
||||||
->danger()
|
|
||||||
->send();
|
|
||||||
$fail("process order already exists for this plant and item code '{$existing->item->code}'.");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
})
|
|
||||||
->required(),
|
->required(),
|
||||||
Forms\Components\TextInput::make('coil_number')
|
Forms\Components\TextInput::make('coil_number')
|
||||||
->label('Coil Number')
|
->label('Coil Number')
|
||||||
@@ -525,131 +492,9 @@ class ProcessOrderResource extends Resource
|
|||||||
->sortable()
|
->sortable()
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
->toggleable(isToggledHiddenByDefault: true),
|
||||||
])
|
])
|
||||||
// ->filters([
|
|
||||||
// Tables\Filters\TrashedFilter::make(),
|
|
||||||
// ])
|
|
||||||
->filters([
|
->filters([
|
||||||
|
|
||||||
Tables\Filters\TrashedFilter::make(),
|
Tables\Filters\TrashedFilter::make(),
|
||||||
Filter::make('advanced_filters')
|
|
||||||
->label('Advanced Filters')
|
|
||||||
->form([
|
|
||||||
Select::make('Plant')
|
|
||||||
->label('Select Plant')
|
|
||||||
->nullable()
|
|
||||||
->options(function (callable $get) {
|
|
||||||
$userHas = Filament::auth()->user()->plant_id;
|
|
||||||
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
|
|
||||||
})
|
|
||||||
->reactive()
|
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
|
||||||
$set('Item', null);
|
|
||||||
}),
|
|
||||||
Select::make('Item')
|
|
||||||
->label('Item Code')
|
|
||||||
->nullable()
|
|
||||||
->options(function (callable $get) {
|
|
||||||
$plantId = $get('Plant');
|
|
||||||
|
|
||||||
return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
|
|
||||||
})
|
|
||||||
->reactive()
|
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
|
||||||
$set('process_order', null);
|
|
||||||
}),
|
|
||||||
TextInput::make('process_order')
|
|
||||||
->label('Process Order')
|
|
||||||
->placeholder('Enter Process Order'),
|
|
||||||
TextInput::make('sfg_number')
|
|
||||||
->label('Sfg Number')
|
|
||||||
->placeholder(placeholder: 'Enter Sfg Number'),
|
|
||||||
TextInput::make('machine_name')
|
|
||||||
->label('Machine Name')
|
|
||||||
->placeholder(placeholder: 'Enter Machine Name'),
|
|
||||||
DateTimePicker::make(name: 'created_from')
|
|
||||||
->label('Created From')
|
|
||||||
->placeholder(placeholder: 'Select From DateTime')
|
|
||||||
->reactive()
|
|
||||||
->native(false),
|
|
||||||
DateTimePicker::make('created_to')
|
|
||||||
->label('Created To')
|
|
||||||
->placeholder(placeholder: 'Select To DateTime')
|
|
||||||
->reactive()
|
|
||||||
->native(false),
|
|
||||||
])
|
])
|
||||||
->query(function ($query, array $data) {
|
|
||||||
// Hide all records initially if no filters are applied
|
|
||||||
if (empty($data['Plant']) && empty($data['Item']) && empty($data['process_order']) && empty($data['sfg_number']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['machine_name'])) {
|
|
||||||
return $query->whereRaw('1 = 0');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['Plant'])) {
|
|
||||||
$query->where('plant_id', $data['Plant']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['Item'])) {
|
|
||||||
$query->where('item_id', $data['Item']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['process_order'])) {
|
|
||||||
$query->where('process_order', $data['process_order']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['sfg_number'])) {
|
|
||||||
$query->where('sfg_number', $data['sfg_number']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['machine_name'])) {
|
|
||||||
// $query->where('machine_name', $data['machine_name']);
|
|
||||||
$query->where('machine_name', 'like', '%' . $data['machine_name'] . '%');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['created_from'])) {
|
|
||||||
$query->where('created_at', '>=', $data['created_from']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['created_to'])) {
|
|
||||||
$query->where('created_at', '<=', $data['created_to']);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//$query->orderBy('created_at', 'asc');
|
|
||||||
})
|
|
||||||
->indicateUsing(function (array $data) {
|
|
||||||
$indicators = [];
|
|
||||||
|
|
||||||
if (!empty($data['Plant'])) {
|
|
||||||
$indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['Item'])) {
|
|
||||||
$indicators[] = 'Item: ' . Item::where('id', $data['Item'])->value('code');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['process_order'])) {
|
|
||||||
$indicators[] = 'Process Order: ' . $data['process_order'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['sfg_number'])) {
|
|
||||||
$indicators[] = 'Sfg Number: ' . $data['sfg_number'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['machine_name'])) {
|
|
||||||
$indicators[] = 'Machine Name: ' . $data['machine_name'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['created_from'])) {
|
|
||||||
$indicators[] = 'From: ' . $data['created_from'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($data['created_to'])) {
|
|
||||||
$indicators[] = 'To: ' . $data['created_to'];
|
|
||||||
}
|
|
||||||
|
|
||||||
return $indicators;
|
|
||||||
})
|
|
||||||
])
|
|
||||||
->filtersFormMaxHeight('280px')
|
|
||||||
->actions([
|
->actions([
|
||||||
Tables\Actions\ViewAction::make(),
|
Tables\Actions\ViewAction::make(),
|
||||||
Tables\Actions\EditAction::make(),
|
Tables\Actions\EditAction::make(),
|
||||||
|
|||||||
@@ -1,364 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Filament\Resources;
|
|
||||||
|
|
||||||
use App\Filament\Exports\ProductCharacteristicsMasterExporter;
|
|
||||||
use App\Filament\Imports\ProductCharacteristicsMasterImporter;
|
|
||||||
use App\Filament\Resources\ProductCharacteristicsMasterResource\Pages;
|
|
||||||
use App\Filament\Resources\ProductCharacteristicsMasterResource\RelationManagers;
|
|
||||||
use App\Models\Line;
|
|
||||||
use App\Models\Machine;
|
|
||||||
use App\Models\Plant;
|
|
||||||
use App\Models\ProductCharacteristicsMaster;
|
|
||||||
use App\Models\WorkGroupMaster;
|
|
||||||
use Filament\Facades\Filament;
|
|
||||||
use Filament\Forms;
|
|
||||||
use Filament\Forms\Form;
|
|
||||||
use Filament\Forms\Get;
|
|
||||||
use Filament\Resources\Resource;
|
|
||||||
use Filament\Tables;
|
|
||||||
use Filament\Tables\Table;
|
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
|
||||||
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
|
||||||
use Filament\Tables\Actions\ImportAction;
|
|
||||||
use Filament\Tables\Actions\ExportAction;
|
|
||||||
|
|
||||||
class ProductCharacteristicsMasterResource extends Resource
|
|
||||||
{
|
|
||||||
protected static ?string $model = ProductCharacteristicsMaster::class;
|
|
||||||
|
|
||||||
protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
|
|
||||||
|
|
||||||
public static function form(Form $form): Form
|
|
||||||
{
|
|
||||||
return $form
|
|
||||||
->schema([
|
|
||||||
Forms\Components\Select::make('plant_id')
|
|
||||||
->label('Plant')
|
|
||||||
->relationship('plant', 'name')
|
|
||||||
->options(function (callable $get) {
|
|
||||||
$userHas = Filament::auth()->user()->plant_id;
|
|
||||||
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
|
|
||||||
})
|
|
||||||
->reactive()
|
|
||||||
->required(),
|
|
||||||
Forms\Components\Select::make('item_id')
|
|
||||||
->label('Item Code')
|
|
||||||
//->relationship('item', 'code')
|
|
||||||
->searchable()
|
|
||||||
->reactive()
|
|
||||||
->options(function (callable $get) {
|
|
||||||
$plantId = $get('plant_id');
|
|
||||||
if (empty($plantId)) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
return \App\Models\Item::where('plant_id', $plantId)->pluck('code', 'id');
|
|
||||||
})
|
|
||||||
->required(),
|
|
||||||
Forms\Components\Select::make('line_id')
|
|
||||||
->label('Line')
|
|
||||||
->reactive()
|
|
||||||
->options(function (callable $get) {
|
|
||||||
$plantId = $get('plant_id');
|
|
||||||
if (empty($plantId)) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
return Line::where('plant_id', $plantId)->pluck('name', 'id');
|
|
||||||
})
|
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
|
||||||
$set('machine_id', null);
|
|
||||||
|
|
||||||
if (!$get('work_group_master_id')) {
|
|
||||||
$set('machine_id', null);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
->required(),
|
|
||||||
// ->relationship('line', 'name'),
|
|
||||||
Forms\Components\Select::make('work_group_master_id')
|
|
||||||
->label('Group Work Center')
|
|
||||||
->required()
|
|
||||||
->reactive()
|
|
||||||
->options(function (callable $get) {
|
|
||||||
if (!$get('plant_id') || !$get('line_id')) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
$line = Line::find($get('line_id'));
|
|
||||||
$workGroupIds = [];
|
|
||||||
for ($i = 1; $i <= $line->no_of_operation; $i++) {
|
|
||||||
$column = "work_group{$i}_id";
|
|
||||||
if (!empty($line->$column)) {
|
|
||||||
$workGroupIds[] = $line->$column;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return WorkGroupMaster::where('plant_id', $get('plant_id'))->whereIn('id', $workGroupIds)->pluck('name', 'id')->toArray();
|
|
||||||
})
|
|
||||||
->disabled(fn (Get $get) => !empty($get('id')))
|
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
|
||||||
$lineId = $get('line_id');
|
|
||||||
if (!$lineId) {
|
|
||||||
$set('mGroupWorkError', 'Please select a line first.');
|
|
||||||
$set('machine_id', null);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// $grpWrkCnr = Line::find($lineId)->group_work_center;
|
|
||||||
// if (!$grpWrkCnr || Str::length($grpWrkCnr) < 1)
|
|
||||||
// {
|
|
||||||
// $set('mGroupWorkError', 'Please select a group work center line.');
|
|
||||||
// $set('line_id', null);
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
$set('mGroupWorkError', null);
|
|
||||||
$set('machine_id', null);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
->extraAttributes(fn ($get) => [
|
|
||||||
'class' => $get('mGroupWorkError') ? 'border-red-500' : '',
|
|
||||||
])
|
|
||||||
// ->dehydrateStateUsing(fn ($state) => null)
|
|
||||||
->hint(fn ($get) => $get('mGroupWorkError') ? $get('mGroupWorkError') : null)
|
|
||||||
->hintColor('danger'),
|
|
||||||
Forms\Components\Select::make('machine_id')
|
|
||||||
->label('Work Center')
|
|
||||||
//->relationship('machine', 'name'),
|
|
||||||
->searchable()
|
|
||||||
->reactive()
|
|
||||||
->options(function (callable $get) {
|
|
||||||
$plantId = $get('plant_id');
|
|
||||||
$lineId = $get('line_id');
|
|
||||||
$workGroupId = $get('work_group_master_id');
|
|
||||||
|
|
||||||
if (empty($plantId) || empty($lineId) || empty($workGroupId)) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
return Machine::where('plant_id', $plantId)
|
|
||||||
->where('line_id', $lineId)
|
|
||||||
->where('work_group_master_id', $workGroupId)
|
|
||||||
->pluck('work_center', 'id');
|
|
||||||
})
|
|
||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
|
||||||
if (!$get('plant_id') || !$get('line_id') || !$get('work_group_master_id')) {
|
|
||||||
$set('machine_id', null);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
->required(),
|
|
||||||
Forms\Components\Select::make('characteristics_type')
|
|
||||||
->label('Characteristics Type')
|
|
||||||
->options([
|
|
||||||
'Product' => 'Product',
|
|
||||||
'Process' => 'Process',
|
|
||||||
])
|
|
||||||
->reactive()
|
|
||||||
->required(),
|
|
||||||
Forms\Components\TextInput::make('name')
|
|
||||||
->label('Name'),
|
|
||||||
Forms\Components\Select::make('inspection_type')
|
|
||||||
->label('Inspection Type')
|
|
||||||
->options([
|
|
||||||
'Visual' => 'Visual',
|
|
||||||
'Value' => 'Value',
|
|
||||||
])
|
|
||||||
->reactive()
|
|
||||||
->required(),
|
|
||||||
// Forms\Components\Select::make('result')
|
|
||||||
// ->label('Visual Type')
|
|
||||||
// ->reactive()
|
|
||||||
// ->options(function (callable $get) {
|
|
||||||
// if ($get('inspection_type') == 'Visual') {
|
|
||||||
// return [
|
|
||||||
// 'Ok' => 'OK',
|
|
||||||
// 'NotOk' => 'Not Ok',
|
|
||||||
// ];
|
|
||||||
// }
|
|
||||||
// return []; //empty options if type ≠ Visual
|
|
||||||
// })
|
|
||||||
// ->afterStateUpdated(function ($state, $set) {
|
|
||||||
// $set('result', $state); // store in form state only
|
|
||||||
// session()->put('temp_result', $state);
|
|
||||||
// })
|
|
||||||
// ->hidden(fn (callable $get) => $get('inspection_type') != 'Visual'),
|
|
||||||
Forms\Components\TextInput::make('upper')
|
|
||||||
->label('Upper')
|
|
||||||
->numeric()
|
|
||||||
->default(0.0)
|
|
||||||
->visible(fn (callable $get) => $get('inspection_type') == 'Value'),
|
|
||||||
Forms\Components\TextInput::make('lower')
|
|
||||||
->label('Lower')
|
|
||||||
->numeric()
|
|
||||||
->default(0.0)
|
|
||||||
->visible(fn (callable $get) => $get('inspection_type') == 'Value'),
|
|
||||||
Forms\Components\TextInput::make('middle')
|
|
||||||
->label('Middle')
|
|
||||||
->numeric()
|
|
||||||
->visible(fn (callable $get) => $get('inspection_type') == 'Value')
|
|
||||||
->rule(function (callable $get) {
|
|
||||||
return function (string $attribute, $value, \Closure $fail) use ($get) {
|
|
||||||
$lower = $get('lower');
|
|
||||||
$upper = $get('upper');
|
|
||||||
$middle = $value;
|
|
||||||
|
|
||||||
if (!is_null($lower) && !is_null($upper) && !is_null($middle)) {
|
|
||||||
if (!($lower <= $middle && $middle <= $upper)) {
|
|
||||||
$fail("Middle must be between Lower and Upper (Lower ≤ Middle ≤ Upper).");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
Forms\Components\Hidden::make('created_by')
|
|
||||||
->label('Created By')
|
|
||||||
->default(Filament::auth()->user()?->name),
|
|
||||||
Forms\Components\Hidden::make('updated_by')
|
|
||||||
->label('Updated By'),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function table(Table $table): Table
|
|
||||||
{
|
|
||||||
return $table
|
|
||||||
->columns([
|
|
||||||
Tables\Columns\TextColumn::make('No.')
|
|
||||||
->label('No.')
|
|
||||||
->getStateUsing(function ($record, $livewire, $column, $rowLoop) {
|
|
||||||
$paginator = $livewire->getTableRecords();
|
|
||||||
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
|
|
||||||
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
|
|
||||||
return ($currentPage - 1) * $perPage + $rowLoop->iteration;
|
|
||||||
}),
|
|
||||||
Tables\Columns\TextColumn::make('plant.name')
|
|
||||||
->label('Plant')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('item.code')
|
|
||||||
->label('Item Code')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('line.name')
|
|
||||||
->label('Line')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('characteristics_type')
|
|
||||||
->label('Characteristics Type')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('workGroupMaster.name')
|
|
||||||
->label('Group Work Center')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('machine.work_center')
|
|
||||||
->label('Work Center')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('machine.work_center')
|
|
||||||
->label('Work Center')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('inspection_type')
|
|
||||||
->label('Inspection Type')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('upper')
|
|
||||||
->label('Upper')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('lower')
|
|
||||||
->label('Lower')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('middle')
|
|
||||||
->label('Middle')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('created_at')
|
|
||||||
->label('Created At')
|
|
||||||
->alignCenter()
|
|
||||||
->dateTime()
|
|
||||||
->sortable()
|
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
|
||||||
Tables\Columns\TextColumn::make('created_by')
|
|
||||||
->label('Created By')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('updated_at')
|
|
||||||
->label('Updated At')
|
|
||||||
->alignCenter()
|
|
||||||
->dateTime()
|
|
||||||
->sortable()
|
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
|
||||||
Tables\Columns\TextColumn::make('updated_by')
|
|
||||||
->label('Updated By')
|
|
||||||
->alignCenter()
|
|
||||||
->sortable()
|
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
|
||||||
Tables\Columns\TextColumn::make('deleted_at')
|
|
||||||
->label('Deleted At')
|
|
||||||
->alignCenter()
|
|
||||||
->dateTime()
|
|
||||||
->sortable()
|
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
|
||||||
])
|
|
||||||
->filters([
|
|
||||||
Tables\Filters\TrashedFilter::make(),
|
|
||||||
])
|
|
||||||
->actions([
|
|
||||||
Tables\Actions\ViewAction::make(),
|
|
||||||
Tables\Actions\EditAction::make(),
|
|
||||||
])
|
|
||||||
->bulkActions([
|
|
||||||
Tables\Actions\BulkActionGroup::make([
|
|
||||||
Tables\Actions\DeleteBulkAction::make(),
|
|
||||||
Tables\Actions\ForceDeleteBulkAction::make(),
|
|
||||||
Tables\Actions\RestoreBulkAction::make(),
|
|
||||||
]),
|
|
||||||
])
|
|
||||||
->headerActions([
|
|
||||||
ImportAction::make()
|
|
||||||
->label('Import Product Characteristics Masters')
|
|
||||||
->color('warning')
|
|
||||||
->importer(ProductCharacteristicsMasterImporter::class)
|
|
||||||
->visible(function() {
|
|
||||||
return Filament::auth()->user()->can('view import product characteristics master');
|
|
||||||
}),
|
|
||||||
ExportAction::make()
|
|
||||||
->label('Export Product Characteristics Masters')
|
|
||||||
->color('warning')
|
|
||||||
->exporter(ProductCharacteristicsMasterExporter::class)
|
|
||||||
->visible(function() {
|
|
||||||
return Filament::auth()->user()->can('view export product characteristics master');
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getRelations(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
//
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getPages(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'index' => Pages\ListProductCharacteristicsMasters::route('/'),
|
|
||||||
'create' => Pages\CreateProductCharacteristicsMaster::route('/create'),
|
|
||||||
'view' => Pages\ViewProductCharacteristicsMaster::route('/{record}'),
|
|
||||||
'edit' => Pages\EditProductCharacteristicsMaster::route('/{record}/edit'),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getNavigationLabel(): string
|
|
||||||
{
|
|
||||||
return 'Characteristics';
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getEloquentQuery(): Builder
|
|
||||||
{
|
|
||||||
return parent::getEloquentQuery()
|
|
||||||
->withoutGlobalScopes([
|
|
||||||
SoftDeletingScope::class,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Filament\Resources\ProductCharacteristicsMasterResource\Pages;
|
|
||||||
|
|
||||||
use App\Filament\Resources\ProductCharacteristicsMasterResource;
|
|
||||||
use Filament\Actions;
|
|
||||||
use Filament\Resources\Pages\CreateRecord;
|
|
||||||
|
|
||||||
class CreateProductCharacteristicsMaster extends CreateRecord
|
|
||||||
{
|
|
||||||
protected static string $resource = ProductCharacteristicsMasterResource::class;
|
|
||||||
|
|
||||||
public function getTitle(): string
|
|
||||||
{
|
|
||||||
return 'Create Characteristics'; // This will replace the "New product characteristics master"
|
|
||||||
}
|
|
||||||
|
|
||||||
// public function getHeading(): string
|
|
||||||
// {
|
|
||||||
// return 'Characteristics';
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Filament\Resources\ProductCharacteristicsMasterResource\Pages;
|
|
||||||
|
|
||||||
use App\Filament\Resources\ProductCharacteristicsMasterResource;
|
|
||||||
use Filament\Actions;
|
|
||||||
use Filament\Resources\Pages\EditRecord;
|
|
||||||
|
|
||||||
class EditProductCharacteristicsMaster extends EditRecord
|
|
||||||
{
|
|
||||||
protected static string $resource = ProductCharacteristicsMasterResource::class;
|
|
||||||
|
|
||||||
public function getTitle(): string
|
|
||||||
{
|
|
||||||
return 'Edit Characteristics'; // This will replace the "New product characteristics master"
|
|
||||||
}
|
|
||||||
|
|
||||||
public function mount(int|string $record): void
|
|
||||||
{
|
|
||||||
parent::mount($record);
|
|
||||||
|
|
||||||
$model = $this->getRecord(); // actual model instance
|
|
||||||
|
|
||||||
// Step 1: Fill the actual saved fields first
|
|
||||||
$this->form->fill([
|
|
||||||
'plant_id' => $model->plant_id,
|
|
||||||
'line_id' => $model->line_id,
|
|
||||||
'item_id' => $model->item_id,
|
|
||||||
'machine_id' => $model->machine_id,
|
|
||||||
'name' => $model->name,
|
|
||||||
'type' => $model->type,
|
|
||||||
'upper' => $model->upper,
|
|
||||||
'lower' => $model->lower,
|
|
||||||
'middle' => $model->middle,
|
|
||||||
'work_group_master_id' => optional($model->machine)->work_group_master_id,
|
|
||||||
]);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getHeaderActions(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
Actions\ViewAction::make(),
|
|
||||||
Actions\DeleteAction::make(),
|
|
||||||
Actions\ForceDeleteAction::make(),
|
|
||||||
Actions\RestoreAction::make(),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Filament\Resources\ProductCharacteristicsMasterResource\Pages;
|
|
||||||
|
|
||||||
use App\Filament\Resources\ProductCharacteristicsMasterResource;
|
|
||||||
use Filament\Actions;
|
|
||||||
use Filament\Resources\Pages\ListRecords;
|
|
||||||
|
|
||||||
class ListProductCharacteristicsMasters extends ListRecords
|
|
||||||
{
|
|
||||||
protected static string $resource = ProductCharacteristicsMasterResource::class;
|
|
||||||
|
|
||||||
public function getTitle(): string
|
|
||||||
{
|
|
||||||
return 'Characteristics'; // This will replace the "New product characteristics master"
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getHeaderActions(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
Actions\CreateAction::make(),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Filament\Resources\ProductCharacteristicsMasterResource\Pages;
|
|
||||||
|
|
||||||
use App\Filament\Resources\ProductCharacteristicsMasterResource;
|
|
||||||
use Filament\Actions;
|
|
||||||
use Filament\Resources\Pages\ViewRecord;
|
|
||||||
|
|
||||||
class ViewProductCharacteristicsMaster extends ViewRecord
|
|
||||||
{
|
|
||||||
protected static string $resource = ProductCharacteristicsMasterResource::class;
|
|
||||||
|
|
||||||
public function getTitle(): string
|
|
||||||
{
|
|
||||||
return 'View Characteristics';
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getHeaderActions(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
Actions\EditAction::make(),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -654,6 +654,7 @@ class QualityValidationResource extends Resource
|
|||||||
->label('Select Validation')
|
->label('Select Validation')
|
||||||
->reactive()
|
->reactive()
|
||||||
->options(fn (callable $get) => $get('part_validation_type_options') ?? [])
|
->options(fn (callable $get) => $get('part_validation_type_options') ?? [])
|
||||||
|
->required()
|
||||||
->afterStateUpdated(function ($state, callable $set) {
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
// when user selects something new, hide the image
|
// when user selects something new, hide the image
|
||||||
$set('show_validation_image', false);
|
$set('show_validation_image', false);
|
||||||
@@ -2249,15 +2250,9 @@ class QualityValidationResource extends Resource
|
|||||||
|
|
||||||
$mPlantId = $get('plant_id');
|
$mPlantId = $get('plant_id');
|
||||||
|
|
||||||
$mlineId = $get('line_id');
|
|
||||||
|
|
||||||
$plant = Plant::find($mPlantId);
|
$plant = Plant::find($mPlantId);
|
||||||
$plantCodePart1 = $plant?->code;
|
$plantCodePart1 = $plant?->code;
|
||||||
|
|
||||||
$mLine = Line::find($mlineId);
|
|
||||||
$mLinePart = $mLine?->name;
|
|
||||||
|
|
||||||
|
|
||||||
$stickerMasterId = $get('sticker_master_id');
|
$stickerMasterId = $get('sticker_master_id');
|
||||||
if (!$stickerMasterId) {
|
if (!$stickerMasterId) {
|
||||||
return;
|
return;
|
||||||
@@ -2289,13 +2284,12 @@ class QualityValidationResource extends Resource
|
|||||||
|
|
||||||
$mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
$emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
$mUserName = Filament::auth()->user()->name;
|
|
||||||
|
|
||||||
if (!empty($emails))
|
if (!empty($emails))
|
||||||
{
|
{
|
||||||
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
new InvalidQualityMail($state, $mPorder, $mPlantName, $mLinePart, $mUserName, 'InvalidPartNumber')
|
new InvalidQualityMail($state, $mPorder, $mPlantName, 'InvalidPartNumber')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2354,11 +2348,6 @@ class QualityValidationResource extends Resource
|
|||||||
$plant = Plant::find($mPlantId);
|
$plant = Plant::find($mPlantId);
|
||||||
$plantCodePart2 = $plant?->code;
|
$plantCodePart2 = $plant?->code;
|
||||||
|
|
||||||
$mlineId = $get('line_id');
|
|
||||||
|
|
||||||
$mLine = Line::find($mlineId);
|
|
||||||
$mLinePart = $mLine?->name;
|
|
||||||
|
|
||||||
$stickerMasterId = $get('sticker_master_id');
|
$stickerMasterId = $get('sticker_master_id');
|
||||||
if (!$stickerMasterId) {
|
if (!$stickerMasterId) {
|
||||||
return;
|
return;
|
||||||
@@ -2387,13 +2376,12 @@ class QualityValidationResource extends Resource
|
|||||||
|
|
||||||
$mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
$emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
$mUserName = Filament::auth()->user()->name;
|
|
||||||
|
|
||||||
if (!empty($emails))
|
if (!empty($emails))
|
||||||
{
|
{
|
||||||
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
new InvalidQualityMail($state, $mPorder, $mPlantName,$mLinePart, $mUserName, 'InvalidPartNumber2')
|
new InvalidQualityMail($state, $mPorder, $mPlantName, 'InvalidPartNumber2')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2453,12 +2441,6 @@ class QualityValidationResource extends Resource
|
|||||||
$plant = Plant::find($mPlantId);
|
$plant = Plant::find($mPlantId);
|
||||||
$plantCodePart3 = $plant?->code;
|
$plantCodePart3 = $plant?->code;
|
||||||
|
|
||||||
$mlineId = $get('line_id');
|
|
||||||
|
|
||||||
$mLine = Line::find($mlineId);
|
|
||||||
$mLinePart = $mLine?->name;
|
|
||||||
|
|
||||||
|
|
||||||
if (!$stickerMasterId) {
|
if (!$stickerMasterId) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -2487,13 +2469,12 @@ class QualityValidationResource extends Resource
|
|||||||
|
|
||||||
$mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
$emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
$mUserName = Filament::auth()->user()->name;
|
|
||||||
|
|
||||||
if (!empty($emails))
|
if (!empty($emails))
|
||||||
{
|
{
|
||||||
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
new InvalidQualityMail($state, $mPorder, $mPlantName,$mLinePart, $mUserName, 'InvalidPartNumber3')
|
new InvalidQualityMail($state, $mPorder, $mPlantName, 'InvalidPartNumber3')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2551,11 +2532,6 @@ class QualityValidationResource extends Resource
|
|||||||
$plant = Plant::find($mPlantId);
|
$plant = Plant::find($mPlantId);
|
||||||
$plantCodePart4 = $plant?->code;
|
$plantCodePart4 = $plant?->code;
|
||||||
|
|
||||||
$mlineId = $get('line_id');
|
|
||||||
|
|
||||||
$mLine = Line::find($mlineId);
|
|
||||||
$mLinePart = $mLine?->name;
|
|
||||||
|
|
||||||
if (!$stickerMasterId) {
|
if (!$stickerMasterId) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -2584,13 +2560,12 @@ class QualityValidationResource extends Resource
|
|||||||
|
|
||||||
$mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
$emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
$mUserName = Filament::auth()->user()->name;
|
|
||||||
|
|
||||||
if (!empty($emails))
|
if (!empty($emails))
|
||||||
{
|
{
|
||||||
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
new InvalidQualityMail($state, $mPorder, $mPlantName,$mLinePart, $mUserName, 'InvalidPartNumber4')
|
new InvalidQualityMail($state, $mPorder, $mPlantName, 'InvalidPartNumber4')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2704,22 +2679,22 @@ class QualityValidationResource extends Resource
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
$set('part_validation5_error', "Invalid input for part validation 5.");
|
$set('part_validation5_error', "Invalid input for part validation 5.");
|
||||||
// $mailData = \App\Filament\Resources\QualityValidationResource::getMailData($mPlantId);
|
$mailData = \App\Filament\Resources\QualityValidationResource::getMailData($mPlantId);
|
||||||
|
|
||||||
// $mPlantName = $mailData['plant_name'];
|
$mPlantName = $mailData['plant_name'];
|
||||||
// $emails = $mailData['emails'];
|
$emails = $mailData['emails'];
|
||||||
|
|
||||||
// if (!empty($emails))
|
if (!empty($emails))
|
||||||
// {
|
{
|
||||||
// //Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
//Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
|
||||||
// Mail::to($emails)->send(
|
Mail::to($emails)->send(
|
||||||
// new InvalidQualityMail($state, $mPorder, $mPlantName, 'InvalidPartNumber5')
|
new InvalidQualityMail($state, $mPorder, $mPlantName, 'InvalidPartNumber5')
|
||||||
// );
|
);
|
||||||
// }
|
}
|
||||||
// else
|
else
|
||||||
// {
|
{
|
||||||
// \Log::warning("No recipients found for plant {$mPlantName}, module Serial, rule invalid_serial.");
|
\Log::warning("No recipients found for plant {$mPlantName}, module Serial, rule invalid_serial.");
|
||||||
// }
|
}
|
||||||
$set('part_validation5', null);
|
$set('part_validation5', null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -2740,21 +2715,6 @@ class QualityValidationResource extends Resource
|
|||||||
public static function getMailData($plantId)
|
public static function getMailData($plantId)
|
||||||
{
|
{
|
||||||
|
|
||||||
$globalEmails = AlertMailRule::where('plant', 0)
|
|
||||||
->where('module', 'QualityValidation')
|
|
||||||
->where('rule_name', 'QualityMail')
|
|
||||||
->where(fn ($q) => $q->whereNull('schedule_type')->orWhere('schedule_type', ''))
|
|
||||||
->pluck('email')
|
|
||||||
->toArray();
|
|
||||||
|
|
||||||
if (!empty($globalEmails)) {
|
|
||||||
return [
|
|
||||||
'plant_id' => 0,
|
|
||||||
'plant_name' => 'All Plants',
|
|
||||||
'emails' => $globalEmails,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
$mPlantName = Plant::where('id', $plantId)->value('name');
|
$mPlantName = Plant::where('id', $plantId)->value('name');
|
||||||
|
|
||||||
$emails = AlertMailRule::where('plant', $plantId)
|
$emails = AlertMailRule::where('plant', $plantId)
|
||||||
|
|||||||
@@ -5,19 +5,21 @@ namespace App\Filament\Resources;
|
|||||||
use App\Filament\Exports\WorkGroupMasterExporter;
|
use App\Filament\Exports\WorkGroupMasterExporter;
|
||||||
use App\Filament\Imports\WorkGroupMasterImporter;
|
use App\Filament\Imports\WorkGroupMasterImporter;
|
||||||
use App\Filament\Resources\WorkGroupMasterResource\Pages;
|
use App\Filament\Resources\WorkGroupMasterResource\Pages;
|
||||||
|
use App\Filament\Resources\WorkGroupMasterResource\RelationManagers;
|
||||||
|
use App\Models\Line;
|
||||||
use App\Models\Plant;
|
use App\Models\Plant;
|
||||||
use App\Models\WorkGroupMaster;
|
use App\Models\WorkGroupMaster;
|
||||||
use Filament\Facades\Filament;
|
|
||||||
use Filament\Forms;
|
use Filament\Forms;
|
||||||
use Filament\Forms\Components\Section;
|
|
||||||
use Filament\Forms\Form;
|
use Filament\Forms\Form;
|
||||||
use Filament\Resources\Resource;
|
use Filament\Resources\Resource;
|
||||||
use Filament\Tables;
|
use Filament\Tables;
|
||||||
use Filament\Tables\Actions\ExportAction;
|
|
||||||
use Filament\Tables\Actions\ImportAction;
|
|
||||||
use Filament\Tables\Table;
|
use Filament\Tables\Table;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
||||||
|
use Filament\Forms\Components\Section;
|
||||||
|
use Filament\Facades\Filament;
|
||||||
|
use Filament\Tables\Actions\ImportAction;
|
||||||
|
use Filament\Tables\Actions\ExportAction;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
class WorkGroupMasterResource extends Resource
|
class WorkGroupMasterResource extends Resource
|
||||||
@@ -44,7 +46,6 @@ class WorkGroupMasterResource extends Resource
|
|||||||
->required()
|
->required()
|
||||||
->options(function (callable $get) {
|
->options(function (callable $get) {
|
||||||
$userHas = Filament::auth()->user()->plant_id;
|
$userHas = Filament::auth()->user()->plant_id;
|
||||||
|
|
||||||
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
|
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
|
||||||
})
|
})
|
||||||
->afterStateUpdated(function ($state, $set, callable $get) {
|
->afterStateUpdated(function ($state, $set, callable $get) {
|
||||||
@@ -55,7 +56,6 @@ class WorkGroupMasterResource extends Resource
|
|||||||
$set('name', null);
|
$set('name', null);
|
||||||
$set('description', null);
|
$set('description', null);
|
||||||
$set('operation_number', null);
|
$set('operation_number', null);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,12 +83,12 @@ class WorkGroupMasterResource extends Resource
|
|||||||
->numeric()
|
->numeric()
|
||||||
->columnSpan(1)
|
->columnSpan(1)
|
||||||
->reactive()
|
->reactive()
|
||||||
->required(),
|
->required()
|
||||||
// ->rule(function (callable $get) {
|
->rule(function (callable $get) {
|
||||||
// return Rule::unique('work_group_masters', 'operation_number')
|
return Rule::unique('work_group_masters', 'operation_number')
|
||||||
// ->where('plant_id', $get('plant_id'))
|
->where('plant_id', $get('plant_id'))
|
||||||
// ->ignore($get('id'));
|
->ignore($get('id'));
|
||||||
// }),
|
}),
|
||||||
Forms\Components\TextInput::make('description')
|
Forms\Components\TextInput::make('description')
|
||||||
->label('Description')
|
->label('Description')
|
||||||
->required()
|
->required()
|
||||||
@@ -112,7 +112,6 @@ class WorkGroupMasterResource extends Resource
|
|||||||
$paginator = $livewire->getTableRecords();
|
$paginator = $livewire->getTableRecords();
|
||||||
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
|
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
|
||||||
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
|
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
|
||||||
|
|
||||||
return ($currentPage - 1) * $perPage + $rowLoop->iteration;
|
return ($currentPage - 1) * $perPage + $rowLoop->iteration;
|
||||||
}),
|
}),
|
||||||
Tables\Columns\TextColumn::make('plant.name')
|
Tables\Columns\TextColumn::make('plant.name')
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -20,24 +20,17 @@ class InvalidQualityMail extends Mailable
|
|||||||
public $invoiceNumber;
|
public $invoiceNumber;
|
||||||
public $mplantName;
|
public $mplantName;
|
||||||
public $mProdOrder;
|
public $mProdOrder;
|
||||||
|
|
||||||
public $mUserName;
|
|
||||||
|
|
||||||
public $mPartNo;
|
public $mPartNo;
|
||||||
public $mailType;
|
public $mailType;
|
||||||
public $greeting;
|
public $greeting;
|
||||||
public $subjectLine;
|
public $subjectLine;
|
||||||
|
|
||||||
public $mLinePart;
|
|
||||||
|
|
||||||
public $itemCode;
|
public $itemCode;
|
||||||
public function __construct($parNo, $mProdOrder, $mplantName, $mLinePart, $mUserName, $mailType = 'InvalidPartNumber')
|
public function __construct($parNo, $mProdOrder, $mplantName, $mailType = 'InvalidPartNumber')
|
||||||
{
|
{
|
||||||
$this->mPartNo = $parNo;
|
$this->mPartNo = $parNo;
|
||||||
$this->mProdOrder = $mProdOrder;
|
$this->mProdOrder = $mProdOrder;
|
||||||
$this->mplantName = $mplantName;
|
$this->mplantName = $mplantName;
|
||||||
$this->mLinePart = $mLinePart;
|
|
||||||
$this->mUserName = $mUserName;
|
|
||||||
$this->mailType = $mailType;
|
$this->mailType = $mailType;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,10 +70,8 @@ class InvalidQualityMail extends Mailable
|
|||||||
Dear Sir/Madam,<br><br>
|
Dear Sir/Madam,<br><br>
|
||||||
Please note that the scanned part number appears to be incorrect.<br>
|
Please note that the scanned part number appears to be incorrect.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Line Name:</b> {$this->mLinePart}<br>
|
|
||||||
<b>Production Order:</b> {$this->mProdOrder}<br>
|
<b>Production Order:</b> {$this->mProdOrder}<br>
|
||||||
<b>Scanned Part Number 2:</b> {$this->mPartNo}<br>
|
<b>Scanned Part Number 2:</b> {$this->mPartNo}<br>
|
||||||
<b>Employee Code:</b> {$this->mUserName}<br>
|
|
||||||
";
|
";
|
||||||
break;
|
break;
|
||||||
case 'InvalidPartNumber3':
|
case 'InvalidPartNumber3':
|
||||||
@@ -88,10 +79,8 @@ class InvalidQualityMail extends Mailable
|
|||||||
Dear Sir/Madam,<br><br>
|
Dear Sir/Madam,<br><br>
|
||||||
Please note that the scanned part number appears to be incorrect.<br>
|
Please note that the scanned part number appears to be incorrect.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Line Name:</b> {$this->mLinePart}<br>
|
|
||||||
<b>Production Order:</b> {$this->mProdOrder}<br>
|
<b>Production Order:</b> {$this->mProdOrder}<br>
|
||||||
<b>Scanned Part Number 3:</b> {$this->mPartNo}<br>
|
<b>Scanned Part Number 3:</b> {$this->mPartNo}<br>
|
||||||
<b>Employee Code:</b> {$this->mUserName}<br>
|
|
||||||
";
|
";
|
||||||
break;
|
break;
|
||||||
case 'InvalidPartNumber4':
|
case 'InvalidPartNumber4':
|
||||||
@@ -99,10 +88,8 @@ class InvalidQualityMail extends Mailable
|
|||||||
Dear Sir/Madam,<br><br>
|
Dear Sir/Madam,<br><br>
|
||||||
Please note that the scanned part number appears to be incorrect.<br>
|
Please note that the scanned part number appears to be incorrect.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Line Name:</b> {$this->mLinePart}<br>
|
|
||||||
<b>Production Order:</b> {$this->mProdOrder}<br>
|
<b>Production Order:</b> {$this->mProdOrder}<br>
|
||||||
<b>Scanned Part Number 4:</b> {$this->mPartNo}<br>
|
<b>Scanned Part Number 4:</b> {$this->mPartNo}<br>
|
||||||
<b>Employee Code:</b> {$this->mUserName}<br>
|
|
||||||
";
|
";
|
||||||
break;
|
break;
|
||||||
case 'InvalidPartNumber5':
|
case 'InvalidPartNumber5':
|
||||||
@@ -110,10 +97,8 @@ class InvalidQualityMail extends Mailable
|
|||||||
Dear Sir/Madam,<br><br>
|
Dear Sir/Madam,<br><br>
|
||||||
Please note that the scanned part number appears to be incorrect.<br>
|
Please note that the scanned part number appears to be incorrect.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Line Name:</b> {$this->mLinePart}<br>
|
|
||||||
<b>Production Order:</b> {$this->mProdOrder}<br>
|
<b>Production Order:</b> {$this->mProdOrder}<br>
|
||||||
<b>Scanned Part Number 5:</b> {$this->mPartNo}<br>
|
<b>Scanned Part Number 5:</b> {$this->mPartNo}<br>
|
||||||
<b>Employee Code:</b> {$this->mUserName}<br>
|
|
||||||
";
|
";
|
||||||
break;
|
break;
|
||||||
case 'InvalidPartNumber':
|
case 'InvalidPartNumber':
|
||||||
@@ -122,10 +107,8 @@ class InvalidQualityMail extends Mailable
|
|||||||
Dear Sir/Madam,<br><br>
|
Dear Sir/Madam,<br><br>
|
||||||
Please note that the scanned part number appears to be incorrect.<br>
|
Please note that the scanned part number appears to be incorrect.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Line Name:</b> {$this->mLinePart}<br>
|
|
||||||
<b>Production Order:</b> {$this->mProdOrder}<br>
|
<b>Production Order:</b> {$this->mProdOrder}<br>
|
||||||
<b>Scanned Part Number 1:</b> {$this->mPartNo}<br>
|
<b>Scanned Part Number 1:</b> {$this->mPartNo}<br>
|
||||||
<b>Employee Code:</b> {$this->mUserName}<br>
|
|
||||||
";
|
";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,20 +104,57 @@ class InvalidSerialMail extends Mailable
|
|||||||
{
|
{
|
||||||
// dynamic subject based on mail type
|
// dynamic subject based on mail type
|
||||||
switch ($this->mailType) {
|
switch ($this->mailType) {
|
||||||
case 'NotFoundInvoice':
|
case 'NotFound':
|
||||||
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
|
$this->subjectLine = "Serial Number Not Found ({$this->mplantName})";
|
||||||
break;
|
break;
|
||||||
case 'DuplicateCapacitorQR':
|
case 'NotFoundInvoice':
|
||||||
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
|
$this->subjectLine = "Serial Number Not Found in Invoice ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'NotFoundItemS':
|
||||||
|
$this->subjectLine = "Item Code Not Found ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'NotValidPackage':
|
||||||
|
$this->subjectLine = "Not Valid Package ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'InvalidMaterialFormat':
|
||||||
|
$this->subjectLine = "Invalid Qr code format Found material ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'DuplicateMotorQR':
|
||||||
|
$this->subjectLine = "Duplicate Serial Number ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'NotMotorQR':
|
||||||
|
$this->subjectLine = "Item Code doesn't have Motor QR ({$this->mplantName})";
|
||||||
break;
|
break;
|
||||||
case 'CompletedSerialInvoice':
|
case 'CompletedSerialInvoice':
|
||||||
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
|
$this->subjectLine = "Completed Serial Invoice ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'NotPumpQR':
|
||||||
|
$this->subjectLine = "Item Code doesn't have Pump QR ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'DuplicatePumpQR':
|
||||||
|
$this->subjectLine = "Duplicate Serial Number ({$this->mplantName})";
|
||||||
break;
|
break;
|
||||||
case 'CSerialInvoice':
|
case 'CSerialInvoice':
|
||||||
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
|
$this->subjectLine = "Completed Serial Invoice ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'MissingPanelBox':
|
||||||
|
$this->subjectLine = "Missing Panel Box ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'DuplicateCapacitorQR':
|
||||||
|
$this->subjectLine = "Duplicate Capacitor QR ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'UnknownPumpsetQR':
|
||||||
|
$this->subjectLine = "Unknown PumpSet QR ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'DuplicatePumpsetQR':
|
||||||
|
$this->subjectLine = "Duplicate PumpSet QR ({$this->mplantName})";
|
||||||
break;
|
break;
|
||||||
case 'ComSerInv':
|
case 'ComSerInv':
|
||||||
$this->subjectLine = "Invoice - Second Scanning({$this->mplantName})";
|
$this->subjectLine = "Completed Serial Invoice ({$this->mplantName})";
|
||||||
|
break;
|
||||||
|
case 'InvalidFormat':
|
||||||
|
default:
|
||||||
|
$this->subjectLine = "Invalid Serial Format Found ({$this->mplantName})";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,20 +170,69 @@ class InvalidSerialMail extends Mailable
|
|||||||
{
|
{
|
||||||
// dynamic greeting/message body
|
// dynamic greeting/message body
|
||||||
switch ($this->mailType) {
|
switch ($this->mailType) {
|
||||||
|
case 'NotFound':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
The scanned Serial Number <b>{$this->serial}</b> was not found in the database
|
||||||
|
for the plant <b>{$this->mplantName}</b>.<br><br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br><br>
|
||||||
|
Please verify the serial number.
|
||||||
|
";
|
||||||
|
break;
|
||||||
case 'NotFoundInvoice':
|
case 'NotFoundInvoice':
|
||||||
$this->greeting = "
|
$this->greeting = "
|
||||||
Dear Sir/Madam,<br><br>
|
Dear Sir/Madam,<br><br>
|
||||||
The scanned serial number could not be found in the given invoice.<br><br>
|
The scanned Serial Number <b>'{$this->serial}'</b> was not found in the Invoice Number <b>'{$this->invoiceNumber}'</b>
|
||||||
|
for the plant <b>{$this->mplantName}</b>.<br><br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br><br>
|
||||||
|
Please verify the serial number.
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'NotFoundItemS':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Item Code <b>'{$this->itemCode}'</b> with Serial Number<b>'{$this->serial}'</b> not found in sticker master
|
||||||
|
for the plant <b>{$this->mplantName}</b>.<br><br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br><br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br><br>
|
||||||
|
Please verify the Item Code.
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'NotValidPackage':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned Item Code<b>'{$this->itemCode}'</b> doesn't have valid package type to proceed!
|
||||||
|
for the plant <b>{$this->mplantName}</b>.<br><br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br><br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br><br>
|
||||||
|
Please verify the Item Code.
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'InvalidMaterialFormat':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Please note that the scanned serial number format appears to be incorrect.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
<b>Scanned QR Code:</b> {$this->serial}<br>
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
";
|
";
|
||||||
break;
|
break;
|
||||||
case 'DuplicateCapacitorQR':
|
case 'DuplicateMotorQR':
|
||||||
$this->greeting = "
|
$this->greeting = "
|
||||||
Dear Sir/Madam,<br><br>
|
Dear Sir/Madam,<br><br>
|
||||||
The scanned <b>Capacitor</b> serial number has already completed the scanning process.<br><br>
|
Scanned 'Motor' serial number <b>{$this->serial}</b> already completed the scanning process.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'NotMotorQR':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned Item Code <b>{$this->itemCode}</b> doesn't have 'Motor' QR to proceed!<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
@@ -159,6 +245,25 @@ class InvalidSerialMail extends Mailable
|
|||||||
Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
|
Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'NotPumpQR':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned Item Code <b>'{$this->itemCode}'</b> doesn't have 'Pump' QR to proceed!<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'DuplicatePumpQR':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned 'Pump' serial number already completed the scanning process.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
<b>Scanned QR Code:</b> {$this->serial}<br>
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
";
|
";
|
||||||
@@ -169,6 +274,45 @@ class InvalidSerialMail extends Mailable
|
|||||||
Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
|
Serial invoice <b>'{$this->invoiceNumber}'</b> completed the scanning process.<br>
|
||||||
<b>Plant:</b> {$this->mplantName}<br>
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'MissingPanelBox':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned Item Code <b>'{$this->itemCode}'</b> doesn't have 'Panel Box Code' to proceed!<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'DuplicateCapacitorQR':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned 'Capacitor' serial number already completed the scanning process.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'UnknownPumpsetQR':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned Item Code <b>'{$this->itemCode}'</b> doesn't have 'Pump Set' QR to proceed!<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'DuplicatePumpsetQR':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Scanned 'Pump Set' serial number already completed the scanning process.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
<b>Scanned QR Code:</b> {$this->serial}<br>
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
";
|
";
|
||||||
@@ -183,6 +327,67 @@ class InvalidSerialMail extends Mailable
|
|||||||
<b>Scanned QR Code:</b> {$this->serial}<br>
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
";
|
";
|
||||||
break;
|
break;
|
||||||
|
case 'ItemNotFound':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Item code <b>'{$this->itemCode}'</b> not found in database.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'ItemNotFoundDB':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Item code <b>'{$this->itemCode}'</b> not found in database for choosed plant.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'ItemNotValidMaterialType':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Item code <b>'{$this->itemCode}'</b> doesn't have a valid material type.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'ItemNotInvoice':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Item code <b>'{$this->itemCode}'</b> doesn't exist in invoice.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'ItemNotInvoice':
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Item code <b>'{$this->itemCode}'</b> doesn't exist in invoice.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}<br>
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
|
case 'InvalidFormat':
|
||||||
|
default:
|
||||||
|
$this->greeting = "
|
||||||
|
Dear Sir/Madam,<br><br>
|
||||||
|
Please note that the scanned serial number format appears to be incorrect.<br>
|
||||||
|
<b>Plant:</b> {$this->mplantName}<br>
|
||||||
|
<b>Invoice Type:</b> {$this->mInvoiceType}
|
||||||
|
<b>Invoice Number:</b> {$this->invoiceNumber}<br>
|
||||||
|
<b>Scanned QR Code:</b> {$this->serial}<br>
|
||||||
|
";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Content(
|
return new Content(
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Models;
|
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|
||||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|
||||||
|
|
||||||
class ProductCharacteristicsMaster extends Model
|
|
||||||
{
|
|
||||||
use SoftDeletes;
|
|
||||||
|
|
||||||
protected $fillable = [
|
|
||||||
'plant_id',
|
|
||||||
'line_id',
|
|
||||||
'item_id',
|
|
||||||
'work_group_master_id',
|
|
||||||
'machine_id',
|
|
||||||
'name',
|
|
||||||
'inspection_type',
|
|
||||||
'characteristics_type',
|
|
||||||
'upper',
|
|
||||||
'lower',
|
|
||||||
'middle',
|
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
|
||||||
'created_by',
|
|
||||||
'updated_by',
|
|
||||||
];
|
|
||||||
|
|
||||||
public function plant(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Plant::class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function line(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Line::class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function workGroupMaster(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(WorkGroupMaster::class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function machine(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Machine::class);
|
|
||||||
}
|
|
||||||
// public function machine()
|
|
||||||
// {
|
|
||||||
// return $this->belongsTo(\App\Models\Machine::class, 'machine_id');
|
|
||||||
// }
|
|
||||||
|
|
||||||
public function item(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Item::class);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Policies;
|
|
||||||
|
|
||||||
use Illuminate\Auth\Access\Response;
|
|
||||||
use App\Models\ProductCharacteristicsMaster;
|
|
||||||
use App\Models\User;
|
|
||||||
|
|
||||||
class ProductCharacteristicsMasterPolicy
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine whether the user can view any models.
|
|
||||||
*/
|
|
||||||
public function viewAny(User $user): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('view-any ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can view the model.
|
|
||||||
*/
|
|
||||||
public function view(User $user, ProductCharacteristicsMaster $productcharacteristicsmaster): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('view ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can create models.
|
|
||||||
*/
|
|
||||||
public function create(User $user): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('create ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can update the model.
|
|
||||||
*/
|
|
||||||
public function update(User $user, ProductCharacteristicsMaster $productcharacteristicsmaster): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('update ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can delete the model.
|
|
||||||
*/
|
|
||||||
public function delete(User $user, ProductCharacteristicsMaster $productcharacteristicsmaster): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('delete ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can delete any models.
|
|
||||||
*/
|
|
||||||
public function deleteAny(User $user): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('delete-any ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can restore the model.
|
|
||||||
*/
|
|
||||||
public function restore(User $user, ProductCharacteristicsMaster $productcharacteristicsmaster): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('restore ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can restore any models.
|
|
||||||
*/
|
|
||||||
public function restoreAny(User $user): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('restore-any ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can replicate the model.
|
|
||||||
*/
|
|
||||||
public function replicate(User $user, ProductCharacteristicsMaster $productcharacteristicsmaster): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('replicate ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can reorder the models.
|
|
||||||
*/
|
|
||||||
public function reorder(User $user): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('reorder ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can permanently delete the model.
|
|
||||||
*/
|
|
||||||
public function forceDelete(User $user, ProductCharacteristicsMaster $productcharacteristicsmaster): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('force-delete ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine whether the user can permanently delete any models.
|
|
||||||
*/
|
|
||||||
public function forceDeleteAny(User $user): bool
|
|
||||||
{
|
|
||||||
return $user->checkPermissionTo('force-delete-any ProductCharacteristicsMaster');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
|
|
||||||
return new class extends Migration
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the migrations.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public function up(): void
|
|
||||||
{
|
|
||||||
$sql = <<<'SQL'
|
|
||||||
CREATE TABLE product_characteristics_masters(
|
|
||||||
id BIGINT GENERATED always AS IDENTITY PRIMARY KEY,
|
|
||||||
plant_id BIGINT NOT NULL,
|
|
||||||
item_id BIGINT NOT NULL,
|
|
||||||
line_id BIGINT DEFAULT NULL,
|
|
||||||
work_group_master_id BIGINT DEFAULT NULL,
|
|
||||||
machine_id BIGINT DEFAULT NULL,
|
|
||||||
name TEXT DEFAULT NULL,
|
|
||||||
inspection_type TEXT DEFAULT NULL,
|
|
||||||
characteristics_type TEXT DEFAULT NULL
|
|
||||||
upper DOUBLE PRECISION DEFAULT 0.0,
|
|
||||||
lower DOUBLE PRECISION DEFAULT 0.0,
|
|
||||||
middle DOUBLE PRECISION DEFAULT NULL,
|
|
||||||
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
|
||||||
created_by TEXT DEFAULT NULL,
|
|
||||||
updated_by TEXT DEFAULT NULL,
|
|
||||||
deleted_at TIMESTAMP,
|
|
||||||
|
|
||||||
FOREIGN KEY (plant_id) REFERENCES plants (id),
|
|
||||||
FOREIGN KEY (line_id) REFERENCES lines (id),
|
|
||||||
FOREIGN KEY (item_id) REFERENCES items(id),
|
|
||||||
FOREIGN KEY (work_group_master_id) REFERENCES work_group_masters(id),
|
|
||||||
FOREIGN KEY (machine_id) REFERENCES machines(id)
|
|
||||||
);
|
|
||||||
SQL;
|
|
||||||
DB::statement($sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reverse the migrations.
|
|
||||||
*/
|
|
||||||
public function down(): void
|
|
||||||
{
|
|
||||||
Schema::dropIfExists('product_characteristics_masters');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
|
|
||||||
return new class extends Migration
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the migrations.
|
|
||||||
*/
|
|
||||||
public function up(): void
|
|
||||||
{
|
|
||||||
$sql = <<<'SQL'
|
|
||||||
ALTER TABLE process_orders
|
|
||||||
ALTER COLUMN order_quantity TYPE NUMERIC
|
|
||||||
USING order_quantity::NUMERIC;
|
|
||||||
SQL;
|
|
||||||
|
|
||||||
DB::statement($sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reverse the migrations.
|
|
||||||
*/
|
|
||||||
public function down(): void
|
|
||||||
{
|
|
||||||
// Schema::table('process_orders', function (Blueprint $table) {
|
|
||||||
// //
|
|
||||||
// });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
|
|
||||||
return new class extends Migration
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the migrations.
|
|
||||||
*/
|
|
||||||
public function up(): void
|
|
||||||
{
|
|
||||||
Schema::table('work_group_masters', function (Blueprint $table) {
|
|
||||||
$table->dropUnique('work_group_masters_plant_id_operation_number_key');
|
|
||||||
});
|
|
||||||
|
|
||||||
// $sql = <<<'SQL'
|
|
||||||
// ALTER TABLE work_group_masters
|
|
||||||
// DROP INDEX work_group_masters_plant_id_operation_number_key;
|
|
||||||
// SQL;
|
|
||||||
|
|
||||||
// DB::statement($sql);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reverse the migrations.
|
|
||||||
*/
|
|
||||||
public function down(): void
|
|
||||||
{
|
|
||||||
Schema::table('work_group_masters', function (Blueprint $table) {
|
|
||||||
//
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
"concurrently": "^9.0.1",
|
"concurrently": "^9.0.1",
|
||||||
"laravel-vite-plugin": "^1.2.0",
|
"laravel-vite-plugin": "^1.2.0",
|
||||||
"postcss": "^8.4.47",
|
"postcss": "^8.4.47",
|
||||||
"tailwindcss": "^4.0.0",
|
"tailwindcss": "^3.4.13",
|
||||||
"vite": "^6.0.11"
|
"vite": "^6.0.11"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Http\Controllers\CharacteristicsController;
|
//use App\Http\Controllers\CharacteristicsController;
|
||||||
|
|
||||||
|
// use App\Http\Controllers\CharacteristicsController;
|
||||||
use App\Http\Controllers\EquipmentMasterController;
|
use App\Http\Controllers\EquipmentMasterController;
|
||||||
use App\Http\Controllers\InvoiceValidationController;
|
use App\Http\Controllers\InvoiceValidationController;
|
||||||
use App\Http\Controllers\MachineController;
|
use App\Http\Controllers\MachineController;
|
||||||
@@ -78,8 +80,6 @@ Route::get('/download-qr-pdf/{palletNo}', [PalletController::class, 'downloadQrP
|
|||||||
|
|
||||||
Route::get('/download-reprint-qr-pdf/{palletNo}', [PalletController::class, 'downloadReprintQrPdf'])->name('download-reprint-qr-pdf');
|
Route::get('/download-reprint-qr-pdf/{palletNo}', [PalletController::class, 'downloadReprintQrPdf'])->name('download-reprint-qr-pdf');
|
||||||
|
|
||||||
//Route::get('/download-reprint-process-pdf/{plant}/{item}/{process_order}/{coil_number}', [PalletController::class, 'downloadReprintProcess'])->name('download-reprint-process-pdf');
|
|
||||||
|
|
||||||
Route::get('/download-qr1-pdf/{palletNo}', [ProductionStickerReprintController::class, 'downloadQrPdf'])->name('download-qr1-pdf');
|
Route::get('/download-qr1-pdf/{palletNo}', [ProductionStickerReprintController::class, 'downloadQrPdf'])->name('download-qr1-pdf');
|
||||||
|
|
||||||
//Production Dashboard Controller
|
//Production Dashboard Controller
|
||||||
@@ -154,25 +154,26 @@ Route::get('process-order/details', [PdfController::class, 'getProcessOrderData'
|
|||||||
|
|
||||||
Route::post('process-order', [PdfController::class, 'storeProcessOrderData']);
|
Route::post('process-order', [PdfController::class, 'storeProcessOrderData']);
|
||||||
|
|
||||||
|
|
||||||
Route::get('sap/files', [SapFileController::class, 'readFiles']);
|
Route::get('sap/files', [SapFileController::class, 'readFiles']);
|
||||||
|
|
||||||
//..Laser Marking - Characteristics
|
//..Laser Marking - Characteristics
|
||||||
|
|
||||||
Route::get('laser/item/get-master-data', [StickerMasterController::class, 'get_master']);
|
Route::get('laser/item/get-master-data', [StickerMasterController::class, 'get_master']);
|
||||||
|
|
||||||
Route::post('laser/route/data', [CharacteristicsController::class, 'test']);//->withoutMiddleware(VerifyCsrfToken::class)
|
// Route::post('laser/route/data', [CharacteristicsController::class, 'test']);//->withoutMiddleware(VerifyCsrfToken::class)
|
||||||
|
|
||||||
// Route::get('get-characteristics/master-data', [CharacteristicsController::class, 'getCharacteristicsMaster']);
|
// Route::get('get-characteristics/master-data', [CharacteristicsController::class, 'getCharacteristicsMaster']);
|
||||||
|
|
||||||
// Route::get('laser/characteristics/get', [CharacteristicsController::class, 'getClassChar']);
|
// //..
|
||||||
|
|
||||||
// Route::get('laser/characteristics/check', [CharacteristicsController::class, 'checkClassChar']);
|
|
||||||
|
|
||||||
// Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
|
// Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
|
||||||
|
|
||||||
// Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
|
// Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
|
||||||
|
|
||||||
Route::get('characteristics/get/master', [CharacteristicsController::class, 'getCharMaster']);
|
// Route::get('laser/characteristics/get', [CharacteristicsController::class, 'getClassChar']);
|
||||||
|
|
||||||
|
// Route::get('laser/characteristics/check', [CharacteristicsController::class, 'checkClassChar']);
|
||||||
|
|
||||||
//GR Master PDF and Serial Number
|
//GR Master PDF and Serial Number
|
||||||
|
|
||||||
@@ -182,7 +183,7 @@ Route::get('grmaster-sno', [PdfController::class, 'getGRSerial']);
|
|||||||
|
|
||||||
Route::post('grmaster-sno-update', [PdfController::class, 'updateGR']);
|
Route::post('grmaster-sno-update', [PdfController::class, 'updateGR']);
|
||||||
|
|
||||||
Route::post('file/store', [SapFileController::class, 'store'])->name('file.store');
|
// Route::post('file/store', [SapFileController::class, 'store'])->name('file.store');
|
||||||
|
|
||||||
// Route::post('send-telegram', [TelegramController::class, 'sendMessage']);
|
// Route::post('send-telegram', [TelegramController::class, 'sendMessage']);
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
use Illuminate\Foundation\Inspiring;
|
use Illuminate\Foundation\Inspiring;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
|
use App\Models\AlertMailRule;
|
||||||
|
use Illuminate\Console\Scheduling\Schedule;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -9,93 +11,87 @@ Artisan::command('inspire', function () {
|
|||||||
$this->comment(Inspiring::quote());
|
$this->comment(Inspiring::quote());
|
||||||
})->purpose('Display an inspiring quote');
|
})->purpose('Display an inspiring quote');
|
||||||
|
|
||||||
|
|
||||||
Artisan::command('auto:scheduler', function () {
|
|
||||||
$this->call('custom:scheduler');
|
|
||||||
})->everyMinute();
|
|
||||||
|
|
||||||
|
|
||||||
// Schedule::command('send:invoice-report');
|
// Schedule::command('send:invoice-report');
|
||||||
// Schedule::command('send:production-report');
|
// Schedule::command('send:production-report');
|
||||||
|
|
||||||
// app()->booted(function () {
|
app()->booted(function () {
|
||||||
// $schedule = app(Schedule::class);
|
$schedule = app(Schedule::class);
|
||||||
|
|
||||||
// // $schedule->command('report:send-daily-production')->dailyAt('07:59');
|
// $schedule->command('report:send-daily-production')->dailyAt('07:59');
|
||||||
// // Production report scheduling
|
// Production report scheduling
|
||||||
// $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
|
$productionRules = AlertMailRule::where('module', 'ProductionQuantities')
|
||||||
// ->where('rule_name', 'ProductionMail')
|
->where('rule_name', 'ProductionMail')
|
||||||
// ->select('plant', 'schedule_type')
|
->select('plant', 'schedule_type')
|
||||||
// ->distinct()
|
->distinct()
|
||||||
// ->get();
|
->get();
|
||||||
|
|
||||||
// foreach ($productionRules as $rule) {
|
foreach ($productionRules as $rule) {
|
||||||
// $type = $rule->schedule_type;
|
$type = $rule->schedule_type;
|
||||||
// $plantId = $rule->plant;
|
$plantId = $rule->plant;
|
||||||
|
|
||||||
// $command = $schedule->command('send:production-report', [$type, $plantId]);
|
$command = $schedule->command('send:production-report', [$type, $plantId]);
|
||||||
// // ->appendOutputTo(storage_path('logs/scheduler.log'));
|
// ->appendOutputTo(storage_path('logs/scheduler.log'));
|
||||||
|
|
||||||
// switch ($type) {
|
switch ($type) {
|
||||||
// case 'Live':
|
case 'Live':
|
||||||
// $command->everyMinute();
|
$command->everyMinute();
|
||||||
// break;
|
break;
|
||||||
// case 'Hourly':
|
case 'Hourly':
|
||||||
// $command->hourly();
|
$command->hourly();
|
||||||
// break;
|
break;
|
||||||
// case 'Daily':
|
case 'Daily':
|
||||||
// $command->dailyAt('07:59');
|
$command->dailyAt('07:59');
|
||||||
// break;
|
break;
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// // Invoice report scheduling
|
// Invoice report scheduling
|
||||||
// $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
|
$invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
|
||||||
// ->select('plant', 'schedule_type')
|
->select('plant', 'schedule_type')
|
||||||
// ->distinct()
|
->distinct()
|
||||||
// ->get();
|
->get();
|
||||||
|
|
||||||
// foreach ($invoiceRules as $rule) {
|
foreach ($invoiceRules as $rule) {
|
||||||
// $type = $rule->schedule_type;
|
$type = $rule->schedule_type;
|
||||||
// $plantId = $rule->plant;
|
$plantId = $rule->plant;
|
||||||
|
|
||||||
// $command = $schedule->command('send:invoice-report', [$type, $plantId]);
|
$command = $schedule->command('send:invoice-report', [$type, $plantId]);
|
||||||
|
|
||||||
// switch ($type) {
|
switch ($type) {
|
||||||
// case 'Live':
|
case 'Live':
|
||||||
// $command->everyMinute();
|
$command->everyMinute();
|
||||||
// break;
|
break;
|
||||||
// case 'Hourly':
|
case 'Hourly':
|
||||||
// $command->hourly();
|
$command->hourly();
|
||||||
// break;
|
break;
|
||||||
// case 'Daily':
|
case 'Daily':
|
||||||
// $command->dailyAt('07:59');
|
$command->dailyAt('07:59');
|
||||||
// break;
|
break;
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// // Invoice Data Report Scheduling
|
// Invoice Data Report Scheduling
|
||||||
// $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
|
$invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
|
||||||
// ->select('plant', 'schedule_type')
|
->select('plant', 'schedule_type')
|
||||||
// ->distinct()
|
->distinct()
|
||||||
// ->get();
|
->get();
|
||||||
|
|
||||||
// foreach ($invoiceDataRules as $rule) {
|
foreach ($invoiceDataRules as $rule) {
|
||||||
// $type = $rule->schedule_type;
|
$type = $rule->schedule_type;
|
||||||
// $plantId = $rule->plant;
|
$plantId = $rule->plant;
|
||||||
|
|
||||||
// $command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
|
$command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
|
||||||
|
|
||||||
// switch ($type) {
|
switch ($type) {
|
||||||
// case 'Live':
|
case 'Live':
|
||||||
// $command->everyMinute();
|
$command->everyMinute();
|
||||||
// break;
|
break;
|
||||||
// case 'Hourly':
|
case 'Hourly':
|
||||||
// $command->hourly();
|
$command->hourly();
|
||||||
// break;
|
break;
|
||||||
// case 'Daily':
|
case 'Daily':
|
||||||
// $command->dailyAt('10:00');
|
$command->dailyAt('10:00');
|
||||||
// break;
|
break;
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// });
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user