ranjith-dev #322

Merged
jothi merged 4 commits from ranjith-dev into master 2026-02-10 06:15:46 +00:00
Showing only changes of commit e8e75cfac4 - Show all commits

View File

@@ -163,12 +163,23 @@ class StickerMasterImporter extends Importer
public function resolveRecord(): ?StickerMaster public function resolveRecord(): ?StickerMaster
{ {
$warnMsg = []; $warnMsg = [];
$plantCod = $this->data['plant']; $plantCod = trim($this->data['plant']);
$itemCod = $this->data['item']; $itemCod = trim($this->data['item']);
$panelCod = trim($this->data['panel_box_code']);
$plant = null; $plant = null;
$item = null; $item = null;
$plantId = null; $plantId = null;
$itemId = null; $itemId = null;
$parts = null;
$validParts = null;
$part1 = trim($this->data['part_validation1']);
$part2 = trim($this->data['part_validation2']);
$part3 = trim($this->data['part_validation3']);
$part4 = trim($this->data['part_validation4']);
$part5 = trim($this->data['part_validation5']);
$laserPart1 = trim($this->data['laser_part_validation1']);
$laserPart2 = trim($this->data['laser_part_validation2']);
$createdBy = Filament::auth()->user()->name; $createdBy = Filament::auth()->user()->name;
$updatedBy = Filament::auth()->user()->name; $updatedBy = Filament::auth()->user()->name;
if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) { if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
@@ -194,6 +205,23 @@ class StickerMasterImporter extends Importer
} else { } else {
$itemId = $item->id; $itemId = $item->id;
if (! $laserPart1) {
$laserPart1 = $laserPart2;
$laserPart2 = null;
}
if (Str::length($panelCod) > 0 && (Str::length($panelCod) < 6 || ! ctype_alnum($panelCod))) {
$warnMsg[] = 'Invalid panel box code found';
} elseif ($panelCod) {
$parts = [$part1, $part2, $part3, $part4];
$validParts = array_values(array_filter($parts, fn ($p) => ! empty($p)));
[$part1, $part2, $part3, $part4] = array_pad($validParts, 4, '');
} else {
$parts = [$part1, $part2, $part3, $part4, $part5];
$validParts = array_values(array_filter($parts, fn ($p) => ! empty($p)));
[$part1, $part2, $part3, $part4, $part5] = array_pad($validParts, 5, '');
}
if (Str::length($this->data['serial_number_motor']) > 0 && $this->data['serial_number_motor'] != '1') { if (Str::length($this->data['serial_number_motor']) > 0 && $this->data['serial_number_motor'] != '1') {
$warnMsg[] = 'Serial number motor must be 1 or empty'; $warnMsg[] = 'Serial number motor must be 1 or empty';
} }
@@ -233,9 +261,6 @@ class StickerMasterImporter extends Importer
if (Str::length($this->data['warranty_card']) > 0 && $this->data['warranty_card'] != '1') { if (Str::length($this->data['warranty_card']) > 0 && $this->data['warranty_card'] != '1') {
$warnMsg[] = 'Warranty card must be 1 or empty'; $warnMsg[] = 'Warranty card must be 1 or empty';
} }
if (Str::length($this->data['panel_box_code']) > 0 && (Str::length($this->data['panel_box_code']) < 6 || ! ctype_alnum($this->data['panel_box_code']))) {
$warnMsg[] = 'Invalid panel box code found';
}
if (Str::length($this->data['load_rate']) < 0 || ! is_numeric($this->data['load_rate']) || $this->data['load_rate'] < 0) { if (Str::length($this->data['load_rate']) < 0 || ! is_numeric($this->data['load_rate']) || $this->data['load_rate'] < 0) {
$warnMsg[] = 'Load rate must be greater than or equal to 0'; $warnMsg[] = 'Load rate must be greater than or equal to 0';
} }
@@ -280,13 +305,13 @@ class StickerMasterImporter extends Importer
'tube_sticker_pump' => $this->data['tube_sticker_pump'], 'tube_sticker_pump' => $this->data['tube_sticker_pump'],
'tube_sticker_pumpset' => $this->data['tube_sticker_pumpset'], 'tube_sticker_pumpset' => $this->data['tube_sticker_pumpset'],
'warranty_card' => $this->data['warranty_card'], 'warranty_card' => $this->data['warranty_card'],
'part_validation1' => $this->data['part_validation1'], 'part_validation1' => $part1,
'part_validation2' => $this->data['part_validation2'], 'part_validation2' => $part2,
'part_validation3' => $this->data['part_validation3'], 'part_validation3' => $part3,
'part_validation4' => $this->data['part_validation4'], 'part_validation4' => $part4,
'part_validation5' => $this->data['part_validation5'], 'part_validation5' => $part5,
'laser_part_validation1' => $this->data['laser_part_validation1'], 'laser_part_validation1' => $laserPart1,
'laser_part_validation2' => $this->data['laser_part_validation2'], 'laser_part_validation2' => $laserPart2,
'panel_box_code' => $this->data['panel_box_code'], 'panel_box_code' => $this->data['panel_box_code'],
'load_rate' => $this->data['load_rate'], 'load_rate' => $this->data['load_rate'],
'bundle_quantity' => $this->data['bundle_quantity'], 'bundle_quantity' => $this->data['bundle_quantity'],