Changed logic in process order importer
Some checks failed
Gemini PR Review / Gemini PR Review (pull_request) Waiting to run
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Waiting to run
Laravel Larastan / larastan (pull_request) Waiting to run
Laravel Pint / pint (pull_request) Waiting to run
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

This commit is contained in:
dhanabalan
2026-02-20 15:32:42 +05:30
parent 4abdd1b81e
commit 8fedc01efd

View File

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