diff --git a/app/Http/Controllers/ProductionOrderController.php b/app/Http/Controllers/ProductionOrderController.php index ded5c1f..732f71f 100644 --- a/app/Http/Controllers/ProductionOrderController.php +++ b/app/Http/Controllers/ProductionOrderController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\Plant; use App\Models\ProductionOrder; use Carbon\Carbon; use Illuminate\Http\Request; @@ -68,8 +69,27 @@ class ProductionOrderController extends Controller } public function printpanel($production_order, $plantCode){ + + \Log::info('Print Panel Started', [ + 'production_order' => $production_order, + 'plantCode' => $plantCode, + ]); + $order = ProductionOrder::where('production_order', $production_order)->first(); + $wareHouseNo = Plant::where('code', $plantCode)->first(); + + $wareNo = $wareHouseNo->warehouse_number; + + \Log::info('Plant Data', [ + 'plant' => $wareHouseNo ? $wareHouseNo->toArray() : null, + ]); + + \Log::info('Warehouse Number', [ + 'warehouse_number' => $wareNo, + 'final_code' => $plantCode . $wareNo, + ]); + if (!$order) { abort(404, 'Production Order not found'); } @@ -90,10 +110,9 @@ class ProductionOrderController extends Controller $serial = str_pad($i, 6, '0', STR_PAD_LEFT); $serialCount = substr(str_pad($i, 6, '0', STR_PAD_LEFT), -6); - $qrData = $plantCode . '/' . $itemCode . '/' . $year.$month . '/' . $serialCount; - - $panel = $plantCode . '/' . $itemCode . '/' . $year.$month . '/' . $serialCount; + $qrData = $plantCode . $wareNo . '/' . $itemCode . '/' . $year.$month . '/' . $serialCount; + $panel = $plantCode . $wareNo . '/' . $itemCode . '/' . $year.$month . '/' . $serialCount; $qrCode = new QrCode($qrData); $output = new Output\Png; diff --git a/routes/api.php b/routes/api.php index e855e25..e3597b0 100644 --- a/routes/api.php +++ b/routes/api.php @@ -62,14 +62,21 @@ use Illuminate\Support\Facades\Route; // 'data' => $request->all() // ]); // }); + +// OBD + Route::get('obd/get-test-datas', [ObdController::class, 'get_test']); Route::get('obd/get-data', [ObdController::class, 'get_obd']); Route::post('obd/store-data', [ObdController::class, 'store_obd']); +// Plant + Route::get('plant/get-all-data', [PlantController::class, 'get_all_data']); +// Sticker Master Model Type + Route::get('sticker/get-master-type-data', [StickerMasterController::class, 'get_master_type']); Route::get('/download-qr-pdf/{palletNo}', [PalletController::class, 'downloadQrPdf'])->name('download-qr-pdf');