Merge pull request 'ranjith-dev' (#690) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

Reviewed-on: #690
This commit was merged in pull request #690.
This commit is contained in:
2026-06-01 13:19:12 +00:00
10 changed files with 96 additions and 0 deletions

View File

@@ -298,6 +298,8 @@ class ClassCharacteristicExporter extends Exporter
->label('ZMM MOTOR SPEED'),
ExportColumn::make('zqmm_qty')
->label('ZQMM QTY'),
ExportColumn::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE'),
ExportColumn::make('mark_status')
->label('MARKED STATUS'),
ExportColumn::make('marked_datetime')

View File

@@ -297,6 +297,8 @@ class TempClassCharacteristicExporter extends Exporter
->label('ZMM MOTOR SPEED'),
ExportColumn::make('zqmm_qty')
->label('ZQMM QTY'),
ExportColumn::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE'),
ExportColumn::make('winded_serial_number')
->label('WINDED SERIAL NUMBER'),
ExportColumn::make('model_type')

View File

@@ -575,6 +575,10 @@ class ClassCharacteristicImporter extends Importer
->label('ZQMM QTY')
->exampleHeader('ZQMM QTY')
->example(''),
ImportColumn::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE')
->exampleHeader('ZMM OPERATING TEMPERATURE')
->example(''),
ImportColumn::make('mark_status')
->label('MARKED STATUS')
->exampleHeader('MARKED STATUS')

View File

@@ -575,6 +575,10 @@ class TempClassCharacteristicImporter extends Importer
->label('ZQMM QTY')
->exampleHeader('ZQMM QTY')
->example(''),
ImportColumn::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE')
->exampleHeader('ZMM OPERATING TEMPERATURE')
->example(''),
ImportColumn::make('winded_serial_number')
->label('WINDed SERIAL NUMBER')
->exampleHeader('WINDED SERIAL NUMBER')

View File

@@ -968,6 +968,12 @@ class ClassCharacteristicResource extends Resource
->afterStateUpdated(function (callable $set) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE')
->reactive()
->afterStateUpdated(function (callable $set) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('mark_status')
->label('MARKED STATUS')
->reactive()
@@ -1804,6 +1810,10 @@ class ClassCharacteristicResource extends Resource
->label('ZQMM QTY')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('mark_status')
->label('MARKED STATUS')
->alignCenter()

View File

@@ -967,6 +967,12 @@ class TempClassCharacteristicResource extends Resource
->afterStateUpdated(function (callable $set) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE')
->reactive()
->afterStateUpdated(function (callable $set) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('winded_serial_number')
->label('WINDED SERIAL NUMBER')
->reactive()
@@ -1574,6 +1580,10 @@ class TempClassCharacteristicResource extends Resource
->label('ZQMM QTY')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('zmm_operating_temperature')
->label('ZMM OPERATING TEMPERATURE')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('winded_serial_number')
->label('WINDED SERIAL NUMBER')
->alignCenter()

View File

@@ -152,6 +152,7 @@ class ClassCharacteristic extends Model
'zmm_motor_heading',
'zmm_motor_speed',
'zqmm_qty',
'zmm_operating_temperature',
'mark_status',
'marked_datetime',
'marked_physical_count',

View File

@@ -149,6 +149,7 @@ class TempClassCharacteristic extends Model
'zmm_motor_heading',
'zmm_motor_speed',
'zqmm_qty',
'zmm_operating_temperature',
'winded_serial_number',
'model_type',
'has_work_flow_id',

View File

@@ -0,0 +1,31 @@
<?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
{
$sql1 = <<<'SQL'
ALTER TABLE class_characteristics
ADD COLUMN zmm_operating_temperature TEXT DEFAULT NULL
SQL;
DB::statement($sql1);
}
/**
* Reverse the migrations.
*/
public function down(): void
{
// Schema::table('class_characteristics', function (Blueprint $table) {
// //
// });
}
};

View File

@@ -0,0 +1,31 @@
<?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
{
$sql1 = <<<'SQL'
ALTER TABLE temp_class_characteristics
ADD COLUMN zmm_operating_temperature TEXT DEFAULT NULL
SQL;
DB::statement($sql1);
}
/**
* Reverse the migrations.
*/
public function down(): void
{
// Schema::table('temp_class_characteristics', function (Blueprint $table) {
// //
// });
}
};