Compare commits
2 Commits
bfbb9f98ea
...
01f2180fa9
| Author | SHA1 | Date | |
|---|---|---|---|
|
01f2180fa9 | ||
|
|
569290658d |
@@ -58,14 +58,13 @@ class WeightValidationResource extends Resource
|
||||
Forms\Components\TextInput::make('batch_number')
|
||||
->label('Batch Number')
|
||||
->required(),
|
||||
Forms\Components\TextInput::make('heat_number')
|
||||
->label('Heat Number')
|
||||
->required(),
|
||||
Forms\Components\TextInput::make('obd_weight')
|
||||
->label('OBD Weight')
|
||||
->label('Actual Weight')
|
||||
->required(),
|
||||
Forms\Components\TextInput::make('vehicle_number')
|
||||
->label('Vehicle Number'),
|
||||
Forms\Components\TextInput::make('heat_number')
|
||||
->label('Heat Number'),
|
||||
Forms\Components\TextInput::make('bundle_number')
|
||||
->label('Bundle Number'),
|
||||
Forms\Components\TextInput::make('picked_weight')
|
||||
@@ -110,9 +109,6 @@ class WeightValidationResource extends Resource
|
||||
Tables\Columns\TextColumn::make('batch_number')
|
||||
->label('Batch Number')
|
||||
->alignCenter(),
|
||||
Tables\Columns\TextColumn::make('heat_number')
|
||||
->label('Heat Number')
|
||||
->alignCenter(),
|
||||
Tables\Columns\TextColumn::make('obd_weight')
|
||||
->label('Actual Weight')
|
||||
->alignCenter(),
|
||||
@@ -120,6 +116,9 @@ class WeightValidationResource extends Resource
|
||||
->label('Vehicle Number')
|
||||
->alignCenter()
|
||||
->searchable(),
|
||||
Tables\Columns\TextColumn::make('heat_number')
|
||||
->label('Heat Number')
|
||||
->alignCenter(),
|
||||
Tables\Columns\TextColumn::make('bundle_number')
|
||||
->label('Bundle Number')
|
||||
->alignCenter(),
|
||||
@@ -259,7 +258,7 @@ class WeightValidationResource extends Resource
|
||||
$invalidLines = [];
|
||||
$duplicateLines = [];
|
||||
$invalidBatch = [];
|
||||
$invalidHeat = [];
|
||||
// $invalidHeat = [];
|
||||
$invalidWeight = [];
|
||||
$materialCodes = [];
|
||||
$lineNumbers = [];
|
||||
@@ -272,8 +271,8 @@ class WeightValidationResource extends Resource
|
||||
$materialCode = trim($row[0]);
|
||||
$lineNumber = trim($row[1]);
|
||||
$batchNumber = trim($row[2]);
|
||||
$heatNumber = trim($row[3]);
|
||||
$actualWeight = trim($row[4]);
|
||||
// $heatNumber = trim($row[3]);
|
||||
$actualWeight = trim($row[3]);
|
||||
|
||||
if (empty($materialCode)) {
|
||||
continue;
|
||||
@@ -308,11 +307,11 @@ class WeightValidationResource extends Resource
|
||||
$validData = false;
|
||||
$invalidBatch[] = $materialCode;
|
||||
}
|
||||
if(Str::length($heatNumber) < 4)
|
||||
{
|
||||
$validData = false;
|
||||
$invalidHeat[] = $materialCode;
|
||||
}
|
||||
// if(Str::length($heatNumber) < 4)
|
||||
// {
|
||||
// $validData = false;
|
||||
// $invalidHeat[] = $materialCode;
|
||||
// }
|
||||
if(Str::length($actualWeight) < 1 || !is_numeric($actualWeight))//ctype_alnum
|
||||
{
|
||||
$validData = false;
|
||||
@@ -391,20 +390,20 @@ class WeightValidationResource extends Resource
|
||||
return;
|
||||
}
|
||||
|
||||
$uniqueInvalidHeat = array_unique($invalidHeat);
|
||||
if (!empty($uniqueInvalidHeat)) {
|
||||
Notification::make()
|
||||
->title('Invalid: Heat Numbers')
|
||||
->body('Heat number should contain minimum 4 characters!<br>Following item codes has invalid heat number:<br>' . implode(', ', $uniqueInvalidHeat))
|
||||
->danger()
|
||||
->seconds(2)
|
||||
->send();
|
||||
// $uniqueInvalidHeat = array_unique($invalidHeat);
|
||||
// if (!empty($uniqueInvalidHeat)) {
|
||||
// Notification::make()
|
||||
// ->title('Invalid: Heat Numbers')
|
||||
// ->body('Heat number should contain minimum 4 characters!<br>Following item codes has invalid heat number:<br>' . implode(', ', $uniqueInvalidHeat))
|
||||
// ->danger()
|
||||
// ->seconds(2)
|
||||
// ->send();
|
||||
|
||||
if ($disk->exists($path)) {
|
||||
$disk->delete($path);
|
||||
}
|
||||
return;
|
||||
}
|
||||
// if ($disk->exists($path)) {
|
||||
// $disk->delete($path);
|
||||
// }
|
||||
// return;
|
||||
// }
|
||||
|
||||
$uniqueInvalidWeight = array_unique($invalidWeight);
|
||||
if (!empty($uniqueInvalidWeight)) {
|
||||
@@ -520,8 +519,8 @@ class WeightValidationResource extends Resource
|
||||
$materialCode = trim($row[0]);
|
||||
$lineNumber = trim($row[1]);
|
||||
$batchNumber = trim($row[2]);
|
||||
$heatNumber = trim($row[3]);
|
||||
$actualWeight = trim($row[4]);
|
||||
// $heatNumber = trim($row[3]);
|
||||
$actualWeight = trim($row[3]);
|
||||
|
||||
if (empty($materialCode) || Str::length($materialCode) < 6) {
|
||||
continue;
|
||||
@@ -543,7 +542,7 @@ class WeightValidationResource extends Resource
|
||||
$recordExist->update([
|
||||
'item_id' => $masItem->id,
|
||||
'batch_number' => $batchNumber,
|
||||
'heat_number' => $heatNumber,
|
||||
//'heat_number' => $heatNumber,
|
||||
'obd_weight' => $actualWeight,
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
@@ -559,7 +558,7 @@ class WeightValidationResource extends Resource
|
||||
'obd_number' => $originalNameOnly,
|
||||
'line_number' => $lineNumber,
|
||||
'batch_number' => $batchNumber,
|
||||
'heat_number' => $heatNumber,
|
||||
//'heat_number' => $heatNumber,
|
||||
'obd_weight' => $actualWeight,
|
||||
]);
|
||||
if (in_array($lineNumber, $availLines))
|
||||
|
||||
@@ -3,5 +3,11 @@
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::get('/', function () {
|
||||
return view('welcome');
|
||||
return redirect('/admin');
|
||||
});
|
||||
|
||||
// Route::get('/test_mail', function () {
|
||||
// Mail::to('jothikumar.padmanaban@cripumps.com')->send(
|
||||
// new test()
|
||||
// );
|
||||
// });
|
||||
|
||||
Reference in New Issue
Block a user