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

Changed logic in process order importer #358

Merged
jothi merged 1 commits from ranjith-dev into master 2026-02-20 10:02:56 +00:00
Conversation 0 Commits 1 Files Changed 1 +50 -35
1 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/Filament/Imports/ProcessOrderImporter.php
View File

@@ -68,8 +68,7 @@ class ProcessOrderImporter extends Importer
ImportColumn::make('machine_name') ImportColumn::make('machine_name')
->exampleHeader('MACHINE NAME') ->exampleHeader('MACHINE NAME')
->example('WMIWRM13 - 2-L2') ->example('WMIWRM13 - 2-L2')
->label('MACHINE NAME') ->label('MACHINE NAME'),
->rules(['required']),
ImportColumn::make('scrap_quantity') ImportColumn::make('scrap_quantity')
->exampleHeader('SCRAP QUANTITY') ->exampleHeader('SCRAP QUANTITY')
->example('0') ->example('0')
@@ -77,8 +76,7 @@ class ProcessOrderImporter extends Importer
ImportColumn::make('rework_status') ImportColumn::make('rework_status')
->exampleHeader('REWORK STATUS') ->exampleHeader('REWORK STATUS')
->example('0') ->example('0')
->label('REWORK STATUS') ->label('REWORK STATUS'),
->rules(['required']),
ImportColumn::make('created_at') ImportColumn::make('created_at')
->exampleHeader('CREATED AT') ->exampleHeader('CREATED AT')
->example('2026-02-20 13:00:00') ->example('2026-02-20 13:00:00')
@@ -143,7 +141,7 @@ class ProcessOrderImporter extends Importer
$warnMsg[] = 'Process Order cannot be empty'; $warnMsg[] = 'Process Order cannot be empty';
} }
if($lineName != null || $lineName != ''){ if($lineName != null && $lineName != ''){
$lineAgaPlant = Line::where('plant_id', $plant->id)->where('name', $lineName)->first(); $lineAgaPlant = Line::where('plant_id', $plant->id)->where('name', $lineName)->first();
if(! $lineAgaPlant){ if(! $lineAgaPlant){
@@ -154,6 +152,10 @@ class ProcessOrderImporter extends Importer
} }
} }
if($scrapQuan == null || $scrapQuan == ''){
$scrapQuan = 0;
}
// $user = User::where('name', $this->data['created_by'])->first(); // $user = User::where('name', $this->data['created_by'])->first();
// if (! $user) { // if (! $user) {
// $warnMsg[] = 'User not found'; // $warnMsg[] = 'User not found';
@@ -189,7 +191,7 @@ class ProcessOrderImporter extends Importer
// 'created_by' => $createdBy, // 'created_by' => $createdBy,
// ]); // ]);
if($lineName != null || $lineName != ''){ if($lineName != null && $lineName != ''){
$existingCoil = ProcessOrder::where('plant_id', $plant->id) $existingCoil = ProcessOrder::where('plant_id', $plant->id)
->where('process_order', $processOrder) ->where('process_order', $processOrder)
@@ -199,7 +201,7 @@ class ProcessOrderImporter extends Importer
if (! $existingCoil) if (! $existingCoil)
{ {
$record = ProcessOrder::Create( ProcessOrder::Create(
[ [
'plant_id' => $plant->id, 'plant_id' => $plant->id,
'line_id' => $lineId, 'line_id' => $lineId,
@@ -208,7 +210,7 @@ class ProcessOrderImporter extends Importer
'coil_number' => $coilNo, 'coil_number' => $coilNo,
'order_quantity' => $orderQuan, 'order_quantity' => $orderQuan,
'received_quantity' => $recQuan, 'received_quantity' => $recQuan,
'scrap_quantity' => empty(trim($scrapQuan)) ? 0 : $scrapQuan, 'scrap_quantity' => $scrapQuan,
'sfg_number' => $sfgNo, 'sfg_number' => $sfgNo,
'machine_name' => $machineName, 'machine_name' => $machineName,
'rework_status' => $reworkStatus, 'rework_status' => $reworkStatus,
@@ -218,10 +220,25 @@ class ProcessOrderImporter extends Importer
'updated_by' => $updatedBy, 'updated_by' => $updatedBy,
] ]
); );
return $record;
} }
return $existingCoil; else
{
ProcessOrder::where('plant_id', $plant->id)
->where('process_order', $processOrder)
->where('line_id', $lineId)
->where('coil_number', $coilNo)
->update([
// 'order_quantity' => $orderQty,
'received_quantity' => $recQuan,
'scrap_quantity' => $scrapQuan,
// 'sfg_number' => $sfgNo,
// 'machine_name' => $machineId,
'rework_status' => 1,
'updated_by' => $updatedBy,
'updated_at' => $updatedAt,
]);
}
} }
else if($lineName == null || $lineName == ''){ else if($lineName == null || $lineName == ''){
$existing = ProcessOrder::where('plant_id', $plant->id) $existing = ProcessOrder::where('plant_id', $plant->id)
@@ -230,16 +247,16 @@ class ProcessOrderImporter extends Importer
->first(); ->first();
if(!$existing){ if(!$existing){
$record = ProcessOrder::Create( ProcessOrder::Create(
[ [
'plant_id' => $plant->id, 'plant_id' => $plant->id,
'line_id' => '', 'line_id' => null,
'process_order' => $processOrder, 'process_order' => $processOrder,
'item_id' => $itemCode->id, 'item_id' => $itemCode->id,
'coil_number' => $coilNo, 'coil_number' => $coilNo,
'order_quantity' => $orderQuan, 'order_quantity' => $orderQuan,
'received_quantity' => $recQuan, 'received_quantity' => $recQuan,
'scrap_quantity' => empty(trim($scrapQuan)) ? 0 : $scrapQuan, 'scrap_quantity' => $scrapQuan ?? 0,
'sfg_number' => $sfgNo, 'sfg_number' => $sfgNo,
'machine_name' => $machineName, 'machine_name' => $machineName,
'rework_status' => $reworkStatus, 'rework_status' => $reworkStatus,
@@ -249,30 +266,28 @@ class ProcessOrderImporter extends Importer
'updated_by' => $updatedBy, 'updated_by' => $updatedBy,
] ]
); );
return $record;
} }
return $existing; else
} {
else ProcessOrder::where('plant_id', $plant->id)
{ ->where('process_order', $processOrder)
$updated = ProcessOrder::where('plant_id', $plant->id) ->where('line_id', $lineId)
->where('process_order', $processOrder) ->where('coil_number', $coilNo)
->where('line_id', $lineId) ->update([
->where('coil_number', $coilNo) // 'order_quantity' => $orderQty,
->update([ 'received_quantity' => $recQuan,
// 'order_quantity' => $orderQty, 'scrap_quantity' => $scrapQuan,
'received_quantity' => $recQuan, // 'sfg_number' => $sfgNo,
'scrap_quantity' => $scrapQuan == '' ? 0 : $scrapQuan, // 'machine_name' => $machineId,
// 'sfg_number' => $sfgNo, 'rework_status' => 1,
// 'machine_name' => $machineId, 'updated_by' => $updatedBy,
'rework_status' => 1, 'updated_at' => $updatedAt,
'updated_by' => $updatedBy, ]);
'updated_at' => $updatedAt, }
]);
return $updated;
} }
return null;
// return new ProcessOrder(); // return new ProcessOrder();
} }