From b04a26c5b2d15c389b4ea4c8593fa9c9a4e1234f Mon Sep 17 00:00:00 2001 From: Gunawan19621 Date: Thu, 1 Aug 2024 05:15:22 +0700 Subject: [PATCH] update tambah peti reset packing no --- app/Http/Controllers/PetiController.php | 17 ++++++++++---- database/seeders/CustomerSeeder.php | 2 +- database/seeders/DatabaseSeeder.php | 12 ++++------ database/seeders/Kondisi_PetiSeeder.php | 2 +- database/seeders/PetiSeeder.php | 4 ++-- database/seeders/RoleSeeder.php | 9 -------- database/seeders/TipePetiSeeder.php | 2 +- database/seeders/UserSeeder.php | 30 ++++--------------------- database/seeders/WarehouseSeeder.php | 11 --------- 9 files changed, 26 insertions(+), 63 deletions(-) diff --git a/app/Http/Controllers/PetiController.php b/app/Http/Controllers/PetiController.php index 69b8349..65f143d 100644 --- a/app/Http/Controllers/PetiController.php +++ b/app/Http/Controllers/PetiController.php @@ -29,7 +29,7 @@ class PetiController extends Controller $perPage = $request->input('perPage', 5); $query = Peti::with(['customer', 'warehouse', 'tipe_peti', 'kondisipeti', 'transfer', 'assetStatuses']) - ->orderBy('created_at', 'desc'); + ->orderBy('id', 'desc'); // Tambahkan logika pencarian $search = $request->input('search') ?? ''; if ($search) { @@ -118,9 +118,18 @@ class PetiController extends Controller for ($i = 0; $i < $request->jumlah; $i++) { $validatedData = $request->except('_token'); - // Ambil nomor urutan otomatis untuk packing_no - $latestPackingNo = Peti::max('packing_no'); - $nextPackingNo = $latestPackingNo + 1; + $customerId = $validatedData['customer_id']; + + // Get the latest packing_no for the specific customer + $latestPackingNo = Peti::where('customer_id', $customerId)->max('packing_no'); + if ($latestPackingNo) { + $latestPackingNo = ltrim($latestPackingNo, '0'); // Remove leading zeros + $nextPackingNo = intval($latestPackingNo) + 1; // Increment the latest packing_no + } else { + $nextPackingNo = 1; // Start from 1 if no packing_no exists for the customer + } + + // Generate packing_no with leading zero $validatedData['packing_no'] = '0' . $nextPackingNo; $code_customer = Customer::where('id', $validatedData['customer_id'])->first()->code_customer; diff --git a/database/seeders/CustomerSeeder.php b/database/seeders/CustomerSeeder.php index 2ad7c6c..a41dda1 100644 --- a/database/seeders/CustomerSeeder.php +++ b/database/seeders/CustomerSeeder.php @@ -34,7 +34,7 @@ class CustomerSeeder extends Seeder 'updated_by' => 'Seeder', ]); - for ($i = 3; $i <= 100; $i++) { + for ($i = 3; $i <= 10; $i++) { Customer::create([ 'name' => 'Customer ' . $i, 'code_customer' => 'Code ' . $i, // Adjust the length as needed diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 175687e..a36d0d7 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -34,14 +34,10 @@ class DatabaseSeeder extends Seeder RoleSeeder::class, WarehouseSeeder::class, UserSeeder::class, - //batas ke bawah tidak terlalu penting - // TipePetiSeeder::class, - // CustomerSeeder::class, - // Kondisi_PetiSeeder::class, - // PetiSeeder::class, - // DisposalSeeder::class, - // TransferSeeder::class, - // AssetStatusSeeder::class, + CustomerSeeder::class, + TipePetiSeeder::class, + Kondisi_PetiSeeder::class, + PetiSeeder::class, ]); } } \ No newline at end of file diff --git a/database/seeders/Kondisi_PetiSeeder.php b/database/seeders/Kondisi_PetiSeeder.php index d6666af..d630c64 100644 --- a/database/seeders/Kondisi_PetiSeeder.php +++ b/database/seeders/Kondisi_PetiSeeder.php @@ -28,7 +28,7 @@ class Kondisi_PetiSeeder extends Seeder 'updated_by' => 'Seeder', ]); - for ($i = 3; $i <= 100; $i++) { + for ($i = 3; $i <= 5; $i++) { Kondisi_Peti::create([ 'nama_kondisi' => 'Kondisi ' . $i, 'deskripsi_kondisi' => 'Description for Kondisi ' . $i, diff --git a/database/seeders/PetiSeeder.php b/database/seeders/PetiSeeder.php index 15e9ad8..9ddf5ba 100644 --- a/database/seeders/PetiSeeder.php +++ b/database/seeders/PetiSeeder.php @@ -12,11 +12,11 @@ class PetiSeeder extends Seeder */ public function run() { - for ($i = 1; $i <= 100; $i++) { + for ($i = 1; $i <= 4; $i++) { Peti::create([ 'tipe_peti_id' => $i, 'warna' => 'Warna ' . $i, - 'fix_lot' => 'Dummy Fix Lot ' . $i, + 'fix_lot' => 'Dy Fix Lot ' . $i, 'packing_no' => $i, 'customer_id' => $i, 'jumlah' => $i, diff --git a/database/seeders/RoleSeeder.php b/database/seeders/RoleSeeder.php index af6779a..4cfc0a3 100644 --- a/database/seeders/RoleSeeder.php +++ b/database/seeders/RoleSeeder.php @@ -27,14 +27,5 @@ class RoleSeeder extends Seeder 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); - - // for ($i = 3; $i <= 100; $i++) { - // m_role::create([ - // 'name' => 'Role ' . $i, - // 'description' => 'Description ' . $i, - // 'created_by' => 'Seeder', - // 'updated_by' => 'Seeder', - // ]); - // } } } \ No newline at end of file diff --git a/database/seeders/TipePetiSeeder.php b/database/seeders/TipePetiSeeder.php index d79c90d..4fd9e4b 100644 --- a/database/seeders/TipePetiSeeder.php +++ b/database/seeders/TipePetiSeeder.php @@ -27,7 +27,7 @@ class TipePetiSeeder extends Seeder 'updated_by' => 'Seeder', ]); - for ($i = 3; $i <= 100; $i++) { + for ($i = 3; $i <= 5; $i++) { Type_peti::create([ 'type' => 'Type ' . $i, 'size_peti' => $this->generateSize(), diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index 1c1c119..4fec8ae 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -17,7 +17,7 @@ class UserSeeder extends Seeder 'username' => 'admin', 'fullname' => 'Admin System', 'nip' => '1234567890123456', - 'email' => 'admin@gmail.com', + 'email' => 'admin@admin.com', 'no_hp' => '085159079010', 'divisi' => 'Admin Division', 'tgl_lahir' => '1990-01-01', @@ -28,7 +28,7 @@ class UserSeeder extends Seeder 'warehouse_id' => 1, // Menghasilkan UUID versi 4 'address' => 'Jalan Ciwatu', 'email_verified_at' => now(), - 'password' => bcrypt('admin'), + 'password' => bcrypt('password'), 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); @@ -38,7 +38,7 @@ class UserSeeder extends Seeder 'username' => 'Operator', 'fullname' => 'Operator System', 'nip' => '6543210987654321', - 'email' => 'operator@gmail.com', + 'email' => 'operator@operator.com', 'no_hp' => '087779767603', 'divisi' => 'Operator Gudang', 'tgl_lahir' => '1985-05-15', @@ -49,31 +49,9 @@ class UserSeeder extends Seeder 'warehouse_id' => 2, // Menghasilkan UUID versi 4 'address' => 'Jalan Gelarmendala', 'email_verified_at' => now(), - 'password' => bcrypt('operator'), + 'password' => bcrypt('password'), 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); - - // for ($i = 3; $i <= 100; $i++) { - // User::create([ - // 'username' => 'user' . $i, - // 'fullname' => 'User ' . $i, - // 'nip' => '1234567890123' . $i, - // 'email' => 'user' . $i . '@example.com', - // 'no_hp' => '1234567890' . $i, - // 'divisi' => 'Division ' . $i, - // 'tgl_lahir' => now(), - // 'jenis_kelamin' => ($i % 2 == 0) ? 'Laki-laki' : 'Perempuan', - // 'agama' => ($i % 2 == 0) ? 'Islam' : 'Kristen', - // 'foto' => '', // Ganti dengan nama berkas foto jika diperlukan - // 'role_id' => $i, - // 'warehouse_id' => $i, - // 'address' => 'Address ' . $i, - // 'email_verified_at' => now(), - // 'password' => bcrypt('password'), - // 'created_by' => 'Seeder', - // 'updated_by' => 'Seeder', - // ]); - // } } } \ No newline at end of file diff --git a/database/seeders/WarehouseSeeder.php b/database/seeders/WarehouseSeeder.php index b02a0d1..ad66dee 100644 --- a/database/seeders/WarehouseSeeder.php +++ b/database/seeders/WarehouseSeeder.php @@ -48,16 +48,5 @@ class WarehouseSeeder extends Seeder 'created_by' => 'Seeder', 'updated_by' => 'Seeder', ]); - - // Use a loop to add 1000 warehouses - // for ($i = 5; $i <= 100; $i++) { - // m_warehouse::create([ - // 'name' => 'Warehouse ' . $i, - // 'description' => 'Description for Warehouse ' . $i, - // 'address' => 'Address for Warehouse ' . $i, - // 'created_by' => 'Seeder', - // 'updated_by' => 'Seeder', - // ]); - // } } } \ No newline at end of file