Merge pull request 'ordered column in item characteristic exporter' (#1479) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

Reviewed-on: #1479
This commit was merged in pull request #1479.
This commit is contained in:
2026-11-19 06:36:50 +00:00

View File

@@ -22,8 +22,8 @@ class ItemCharacteristicExporter extends Exporter
// Increment and return the row number // Increment and return the row number
return ++$rowNumber; return ++$rowNumber;
}), }),
ExportColumn::make('plant.name') ExportColumn::make('plant.code')
->label('PLANT'), ->label('PLANT CODE'),
ExportColumn::make('item.code') ExportColumn::make('item.code')
->label('ITEM CODE'), ->label('ITEM CODE'),
ExportColumn::make('class') ExportColumn::make('class')
@@ -31,7 +31,7 @@ class ItemCharacteristicExporter extends Exporter
ExportColumn::make('arbid') ExportColumn::make('arbid')
->label('ARBID'), ->label('ARBID'),
ExportColumn::make('zz1_cn_bill_ord') ExportColumn::make('zz1_cn_bill_ord')
->label('ZZ1 CN BILL ORDER'), ->label('ZZ1 CN BILL ORD'),
ExportColumn::make('zmm_amps') ExportColumn::make('zmm_amps')
->label('ZMM AMPS'), ->label('ZMM AMPS'),
ExportColumn::make('zmm_brand') ExportColumn::make('zmm_brand')
@@ -41,7 +41,7 @@ class ItemCharacteristicExporter extends Exporter
ExportColumn::make('zmm_delivery') ExportColumn::make('zmm_delivery')
->label('ZMM DELIVERY'), ->label('ZMM DELIVERY'),
ExportColumn::make('zmm_dir_rot') ExportColumn::make('zmm_dir_rot')
->label('ZMM DIRECTION OF ROTATION'), ->label('ZMM DIR ROT'),
ExportColumn::make('zmm_discharge') ExportColumn::make('zmm_discharge')
->label('ZMM DISCHARGE'), ->label('ZMM DISCHARGE'),
ExportColumn::make('zmm_discharge_max') ExportColumn::make('zmm_discharge_max')
@@ -196,20 +196,24 @@ class ItemCharacteristicExporter extends Exporter
->label('ZMM YEAR'), ->label('ZMM YEAR'),
ExportColumn::make('zmm_laser_name') ExportColumn::make('zmm_laser_name')
->label('ZMM LASER NAME'), ->label('ZMM LASER NAME'),
ExportColumn::make('zmm_logo_cp')
->label('ZMM LOGO CP'),
ExportColumn::make('zmm_logo_ce')
->label('ZMM LOGO CE'),
ExportColumn::make('zmm_logo_nsf')
->label('ZMM LOGO NSF'),
ExportColumn::make('zmm_logo_eac')
->label('ZMM LOGO EAC'),
ExportColumn::make('zmm_beenote') ExportColumn::make('zmm_beenote')
->label('ZMM BEENOTE'), ->label('ZMM BEENOTE'),
ExportColumn::make('zmm_beenumber') ExportColumn::make('zmm_beenumber')
->label('ZMM BEENUMBER'), ->label('ZMM BEENUMBER'),
ExportColumn::make('zmm_beestar') ExportColumn::make('zmm_beestar')
->label('ZMM BEESTAR'), ->label('ZMM BEESTAR'),
ExportColumn::make('zmm_logo_ce')
->label('ZMM LOGO CE'),
ExportColumn::make('zmm_codeclass') ExportColumn::make('zmm_codeclass')
->label('ZMM CODECLASS'), ->label('ZMM CODECLASS'),
ExportColumn::make('zmm_colour') ExportColumn::make('zmm_colour')
->label('ZMM COLOUR'), ->label('ZMM COLOUR'),
ExportColumn::make('zmm_logo_cp')
->label('ZMM LOGO CP'),
ExportColumn::make('zmm_grade') ExportColumn::make('zmm_grade')
->label('ZMM GRADE'), ->label('ZMM GRADE'),
ExportColumn::make('zmm_grwt_pset') ExportColumn::make('zmm_grwt_pset')
@@ -248,10 +252,6 @@ class ItemCharacteristicExporter extends Exporter
->label('ZMM NEWT PF'), ->label('ZMM NEWT PF'),
ExportColumn::make('zmm_newt_pump') ExportColumn::make('zmm_newt_pump')
->label('ZMM NEWT PUMP'), ->label('ZMM NEWT PUMP'),
ExportColumn::make('zmm_logo_nsf')
->label('ZMM LOGO NSF'),
ExportColumn::make('zmm_logo_eac')
->label('ZMM LOGO EAC'),
ExportColumn::make('zmm_packtype') ExportColumn::make('zmm_packtype')
->label('ZMM PACKTYPE'), ->label('ZMM PACKTYPE'),
ExportColumn::make('zmm_panel') ExportColumn::make('zmm_panel')
@@ -294,59 +294,16 @@ class ItemCharacteristicExporter extends Exporter
->label('ZMM AXIAL FORCE'), ->label('ZMM AXIAL FORCE'),
ExportColumn::make('zmm_mrp') ExportColumn::make('zmm_mrp')
->label('ZMM MRP'), ->label('ZMM MRP'),
ExportColumn::make('zmm_1')
->label('ZMM 1')
->enabledByDefault(false),
ExportColumn::make('zmm_2')
->label('ZMM 2')
->enabledByDefault(false),
ExportColumn::make('zmm_3')
->label('ZMM 3')
->enabledByDefault(false),
ExportColumn::make('zmm_4')
->label('ZMM 4')
->enabledByDefault(false),
ExportColumn::make('zmm_5')
->label('ZMM 5')
->enabledByDefault(false),
ExportColumn::make('zmm_6')
->label('ZMM 6')
->enabledByDefault(false),
ExportColumn::make('zmm_7')
->label('ZMM 7')
->enabledByDefault(false),
ExportColumn::make('zmm_8')
->label('ZMM 8')
->enabledByDefault(false),
ExportColumn::make('zmm_9')
->label('ZMM 9')
->enabledByDefault(false),
ExportColumn::make('zmm_10')
->label('ZMM 10')
->enabledByDefault(false),
ExportColumn::make('zmm_11')
->label('ZMM 11')
->enabledByDefault(false),
ExportColumn::make('zmm_12')
->label('ZMM 12')
->enabledByDefault(false),
ExportColumn::make('zmm_13')
->label('ZMM 13')
->enabledByDefault(false),
ExportColumn::make('zmm_14')
->label('ZMM 14')
->enabledByDefault(false),
ExportColumn::make('zmm_15')
->label('ZMM 15')
->enabledByDefault(false),
ExportColumn::make('created_at') ExportColumn::make('created_at')
->label('CREATED AT'), ->label('CREATED AT'),
ExportColumn::make('updated_at')
->label('UPDATED AT'),
ExportColumn::make('created_by') ExportColumn::make('created_by')
->label('CREATED BY'), ->label('CREATED BY'),
ExportColumn::make('updated_at')
->label('UPDATED AT')
->enabledByDefault(true),
ExportColumn::make('updated_by') ExportColumn::make('updated_by')
->label('UPDATED BY'), ->label('UPDATED BY')
->enabledByDefault(true),
ExportColumn::make('deleted_at') ExportColumn::make('deleted_at')
->label('DELETED AT') ->label('DELETED AT')
->enabledByDefault(false), ->enabledByDefault(false),