Compare commits
454 Commits
ranjith-de
...
10eff34cc9
| Author | SHA1 | Date | |
|---|---|---|---|
| 10eff34cc9 | |||
| 1a37dd5e49 | |||
| 6bdabe3e1f | |||
| 1dba08f5da | |||
| 80d24b7448 | |||
| db43960f43 | |||
| c633d78d7e | |||
| 31f96dd11e | |||
| 4044af92c4 | |||
| 2ccf1a38e2 | |||
| 084c041f6d | |||
| b3d39d416a | |||
| dbaadd27e3 | |||
| 313edfed0b | |||
| a5d4c12348 | |||
| 23cdc04a09 | |||
| fb5f69df5f | |||
| 7ec3e5e9f7 | |||
| c7239b02f2 | |||
| f61e452f33 | |||
| 54f5a3b386 | |||
| ebc4ba672a | |||
| 68a75b2677 | |||
| 2f28cf28e1 | |||
| 592818c743 | |||
| 0dd6e5796b | |||
| c317eec67e | |||
| 9895297570 | |||
| e5f92b1348 | |||
| a960752ba6 | |||
| e84d0c7f00 | |||
| c5bd6cd995 | |||
| cf534af204 | |||
| 875ea7ac2d | |||
| bd93f3e86e | |||
| ad6d56b944 | |||
| 71f1b14757 | |||
| a0a1812a57 | |||
| d6b7b6a1af | |||
| 9091e7d080 | |||
| 957eb3cb58 | |||
| 9889f7b664 | |||
| 25ec7666ae | |||
| 87de4243aa | |||
| d1bf69fe68 | |||
| abd97d6bfb | |||
| 412b50c6c0 | |||
| 1bf85da54d | |||
| 7bfd534781 | |||
| f4f470a98a | |||
| 09cb02046f | |||
| a1eb635fe0 | |||
| 57ab4137a5 | |||
| 705d3416d7 | |||
| 77277cd4e8 | |||
| 3adfe42e95 | |||
| 9a2c8712a7 | |||
| f6bfa6ca13 | |||
| 9d3256a3a9 | |||
| 24d76f59a7 | |||
| 292e809a7f | |||
| 82c100162d | |||
| 417b6f4dea | |||
| 0379858239 | |||
| d7147084f9 | |||
| a3c37a16d2 | |||
| ab6925a896 | |||
| 8e7b8e52b7 | |||
| f1175ff5bc | |||
| bd0d9ba979 | |||
| 8038eabeda | |||
| afb045ca4c | |||
| bf977c08bd | |||
| db05e9e738 | |||
| 3c5c18cea4 | |||
| b9d1dcb1c1 | |||
| b105d38bfe | |||
| 1cc8403f2a | |||
| eb3ed2b8f1 | |||
| 6ff007e3a1 | |||
| 60cfab3b89 | |||
| 67ee3ce0f2 | |||
| 57c56fffeb | |||
| 88b6fb4256 | |||
| 9a514a758e | |||
| 6d01112c4d | |||
| b74095713b | |||
| d027156614 | |||
| 27ea356e8f | |||
| 435f46fae4 | |||
| b5be827bc3 | |||
| 8ba03cf2b9 | |||
| 0dcf34d713 | |||
| 4025fcf783 | |||
| 3363498fb6 | |||
| a6b8a5c0cc | |||
| c6714b195e | |||
| d392fe9c78 | |||
| eccc6342c0 | |||
| dbc9a02669 | |||
| 837b936b51 | |||
| 528914e2d0 | |||
| bb94206a1e | |||
| d7f758b584 | |||
| 85bfb99273 | |||
| 2f2faa3019 | |||
| d72f4c89fd | |||
| 4c07abe394 | |||
| 8a0e7d6878 | |||
| d1031d8a6e | |||
| fa06c2c6cb | |||
| e06a458fc0 | |||
| 36dd07817b | |||
| 51a20219db | |||
| dc564f9c28 | |||
| bab5b879e6 | |||
| a09264a053 | |||
| 82f776ef41 | |||
| 952b9a01a5 | |||
| 2b8a3a2838 | |||
| 4acb66c464 | |||
| ea64aea9ce | |||
| 72e6621cc0 | |||
| 2c49e6b272 | |||
| d6ec50c20e | |||
| 19382d0644 | |||
| 408e426545 | |||
| 62b338be22 | |||
| c407f9c6c2 | |||
| a09adf0ea5 | |||
| b864bda85e | |||
| 734ab9dfdc | |||
| 6907083ec0 | |||
| bd7e0422e6 | |||
| 53f14711b2 | |||
| a39a10d104 | |||
| 17bca76d06 | |||
| 500a2ae3ca | |||
| 0adb82afcf | |||
| cc7fd5b16d | |||
| 70d38c7a7b | |||
| efba8af539 | |||
| caac5ad7eb | |||
| 7e799d507a | |||
| 358d31cb71 | |||
| 4ffc2d7a92 | |||
| be5d02bc50 | |||
| eff0da491c | |||
| 2e0ccd7c34 | |||
| 2a2bf8db4c | |||
| c2c50eb451 | |||
| 75ba355252 | |||
| b40a7e3ae7 | |||
| b50493f2f2 | |||
| 7bc70341d6 | |||
| 9c869e9726 | |||
| b5fe0018df | |||
| 76216bd304 | |||
| 8b12d7612f | |||
| 717cfcaa53 | |||
| 1426f868cb | |||
| e6c103b56a | |||
| 8ab8e465b9 | |||
| 920a217613 | |||
| 780f00f11a | |||
| f631fcd43c | |||
| 444ec30b34 | |||
| d1b487aadb | |||
| c89574f070 | |||
| 2e52499aba | |||
| 8b08a54f04 | |||
| dda77f4ac7 | |||
| 5ebd5cfa47 | |||
| bddcc95c21 | |||
| 956c34a5da | |||
| 88046d7a2a | |||
| c60eae50a1 | |||
| 4289fb3ef1 | |||
| b032f14deb | |||
| 0653a69d8d | |||
| 3ce5867615 | |||
| 82aa723d52 | |||
| 72e1df1329 | |||
| 077872d418 | |||
| caeb0a5afd | |||
| e4fdd9521e | |||
| 3d26ad29ef | |||
| ce5393f858 | |||
| 12c9e55d45 | |||
| a1c9a1083c | |||
| b5ed826213 | |||
| f11b95e44e | |||
| 908ea3fb21 | |||
| 78987f1430 | |||
| a16ae0ca16 | |||
| 5ee964b5f7 | |||
| de1bf16ace | |||
| a1f5fa0457 | |||
| b7b6ab6c77 | |||
| 32b86b4289 | |||
| c33db6b934 | |||
| 4807c572eb | |||
| 252014bd51 | |||
| e1d5793922 | |||
| 56152816e2 | |||
| 8b2d4c4faf | |||
| 0430d605e7 | |||
| 0decbc6e29 | |||
| 9aa727cc36 | |||
| 22ece583b7 | |||
| 8c90d1fc03 | |||
| 5e68debd87 | |||
| 855e9f91c8 | |||
| 6d088471bf | |||
| f167b732c0 | |||
| 4264c5493c | |||
| 61774d240a | |||
| ae01370107 | |||
| f3389399eb | |||
| c18a07853e | |||
| 555f810c0f | |||
| 2e5d185be1 | |||
| 0ece1d0dd6 | |||
| e145560920 | |||
| e02052e536 | |||
| 39e40e011f | |||
| 7184eda58c | |||
| 3c4b419078 | |||
| 7ba5375386 | |||
| c3324caa08 | |||
| ace14124f3 | |||
| c68a45ef8d | |||
| 3edd8fafc6 | |||
| 2c66f2e6bd | |||
| e791176500 | |||
| 1eddecc660 | |||
| 379e8fc8f9 | |||
| b018ef48d7 | |||
| e45c166345 | |||
| d53d3dedbb | |||
| 18e74f4a52 | |||
| 16c525773b | |||
| 501cd541b9 | |||
| 62e14fb3c3 | |||
| 78f4929e27 | |||
| b674966886 | |||
| 103515a387 | |||
| dd182c6504 | |||
| 1fed559feb | |||
| 312de66a1c | |||
| 7d8a891f95 | |||
| 557c367f4c | |||
| cef3e17dc7 | |||
| f89ad49eff | |||
| c9006ee0a1 | |||
| 2fa58b587e | |||
| bb0a684366 | |||
| 16b1802412 | |||
| 079ed2eba6 | |||
| f1f6b596a4 | |||
| b2aa572994 | |||
| 44bdcba615 | |||
| 76a5379c02 | |||
| eeeec722ee | |||
| d8a4ddf6e9 | |||
| 9493bf5edf | |||
| feab063017 | |||
| b2f5194ef9 | |||
| 3a3322ccc4 | |||
| 7a9dac239d | |||
| 77d98b16fb | |||
| a2554fb4a9 | |||
| 353774b184 | |||
| 29fecaea3d | |||
| a35185e4b1 | |||
| f07ba9dd00 | |||
| 2a7f48cc75 | |||
| c7f4f49669 | |||
| 2e9a52a890 | |||
| 3c34495048 | |||
| b70907cb9f | |||
| 9ee4fe5c7e | |||
| 6f06319752 | |||
| 785be70629 | |||
| e5cb7f3d88 | |||
| 1dbbd53fc9 | |||
| 04d0c2dc82 | |||
| 048977a44b | |||
| 8395599d9d | |||
| 9a7b42dea5 | |||
| 0ce59ebe22 | |||
| c032cdc58d | |||
| 4074374614 | |||
| 15712c44b6 | |||
| 99f7450e5e | |||
| f6f6f0924e | |||
| 3bab0310a1 | |||
| 6924990ace | |||
| ba0b2c2709 | |||
| 51416cdf37 | |||
| a8ff5b5120 | |||
| 4ca965ccb1 | |||
| 22cbb6c4d3 | |||
| 6db07e1825 | |||
| 1bc0a4b01d | |||
| dc77a51c3c | |||
| b07a9596e5 | |||
| b96a54aae5 | |||
| fe0e1e139e | |||
| a95766fd45 | |||
| d5d5a6d193 | |||
| 25125cfead | |||
| d6c6cf0c69 | |||
| 99a95dc150 | |||
| 6d26307c4a | |||
| 8703aec73e | |||
| f8691500cf | |||
| 12f9cb683f | |||
| 73c26a649a | |||
| 80f6aeb3d6 | |||
| f633285a57 | |||
| 841922a4b3 | |||
| 3a819737cb | |||
| 18f60ec336 | |||
| 4ab7be97bb | |||
| a643bce1c2 | |||
| 45392419cd | |||
| 7b300f63d2 | |||
| 650314a435 | |||
| eaefffd51b | |||
| 084d9b04f1 | |||
| 75a3a8641c | |||
| f7f1d3a855 | |||
| f00fc8b4d7 | |||
| 73eb79a8d0 | |||
| 5856fe64c1 | |||
| 4615e45c74 | |||
| 486b94bb79 | |||
| 71eda460bd | |||
| 938f9b9fdf | |||
| 648551c619 | |||
| 308e68b79a | |||
| 5b9cb33a63 | |||
| 8b57518408 | |||
| 4b68133bf1 | |||
| a52fc9580a | |||
| 94819ccc4f | |||
| 6e51b9fba8 | |||
| 0a66526a63 | |||
| 0398cd5262 | |||
| cca6fbe428 | |||
| 633c8c89ca | |||
| 543ab7f44f | |||
| 09aeff2b96 | |||
| 2f3973f6af | |||
| 7f76a604a3 | |||
| 837ac47120 | |||
| e6fb2c1bae | |||
| a687b8af3b | |||
| cd45e6658a | |||
| 0b221c5eae | |||
| 8c062505c9 | |||
| 9411d0b33b | |||
| ab3a2047bb | |||
| f0ef2dda8e | |||
| 968d67d808 | |||
| 2342c6003d | |||
| 290d218a0d | |||
| c455c76715 | |||
| a1abe537c3 | |||
| c65265e68e | |||
| 3da016ae49 | |||
| ea17636670 | |||
| 31b56ae9b2 | |||
| 9517b38f9b | |||
| 2c1caa40a3 | |||
| c3fef2f3a0 | |||
| 904e18e63a | |||
| 27dc2690ca | |||
| 8e1c4f46e8 | |||
| d699c043d4 | |||
| 1806f32a7b | |||
| eb2ae19641 | |||
| 2dbcc8b859 | |||
| 79e3427cdb | |||
| 81a5fa16c4 | |||
| 6520c3ca87 | |||
| 2e167c75b0 | |||
| aca5d6c957 | |||
| 9edbaf3d43 | |||
| a46aaa72a2 | |||
| d917aa530d | |||
| 45944c5c25 | |||
| fda672948b | |||
| f15e6451ca | |||
| c8aac9116d | |||
| bcd107a8bc | |||
| 458e143b9a | |||
| de2dda0dc5 | |||
| 7543f8a416 | |||
| f76316ec91 | |||
| acea7b14a6 | |||
| 87f49e8491 | |||
| f612551288 | |||
| 4f84735eaf | |||
| 45b8c1fbb4 | |||
| 6015968043 | |||
| 2bc8584e7a | |||
| d126e931c8 | |||
| 62bf68ad2e | |||
| c6c63dcb35 | |||
| d1663ae58a | |||
| deb46cdda2 | |||
| 002bdc597d | |||
| a406d1b58a | |||
| 58d0b9f0ae | |||
| c0d8ca7b1e | |||
| f31ab62ec0 | |||
| 4285a31f94 | |||
| 0c9228bfec | |||
| 58b45c849d | |||
| 61a2e7ffad | |||
| 3779cf3e3b | |||
| acf955dd94 | |||
| 0de49f14ce | |||
| 0473ca33cf | |||
| 8a01033459 | |||
| 0555f9faff | |||
| 8cbbaa4845 | |||
| cb6b201648 | |||
| c3089a147c | |||
| 45f0e39f73 | |||
| fe1e1b9918 | |||
| e20915ca82 | |||
| 58e6cbfac0 | |||
| 1ace049687 | |||
| e5e85a8eea | |||
| 555802ab35 | |||
| 587b743f12 | |||
| 42555d4a81 | |||
| fd1e554076 | |||
| 022654f192 | |||
| 55f1088fda | |||
| f9233f44d8 | |||
| e0fec6b07c | |||
| 6bda9c1459 | |||
| 39bdd3df57 | |||
| 5bcf0703d9 | |||
| 80e522b7e6 | |||
| ee101f80ea | |||
| 37a99d03c1 | |||
| 5fdced003a | |||
| 0b0bb90efb | |||
| 32ce6da2c1 |
@@ -36,8 +36,6 @@ class ProcessOrderExporter extends Exporter
|
|||||||
->label('COIL NUMBER'),
|
->label('COIL NUMBER'),
|
||||||
ExportColumn::make('order_quantity')
|
ExportColumn::make('order_quantity')
|
||||||
->label('ORDER QUANTITY'),
|
->label('ORDER QUANTITY'),
|
||||||
ExportColumn::make('updated_order_quantity')
|
|
||||||
->label('UPDATED ORDER QUANTITY'),
|
|
||||||
ExportColumn::make('received_quantity')
|
ExportColumn::make('received_quantity')
|
||||||
->label('RECEIVED QUANTITY'),
|
->label('RECEIVED QUANTITY'),
|
||||||
ExportColumn::make('sfg_number')
|
ExportColumn::make('sfg_number')
|
||||||
|
|||||||
@@ -52,9 +52,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
->example('1000')
|
->example('1000')
|
||||||
->label('ORDER QUANTITY')
|
->label('ORDER QUANTITY')
|
||||||
->rules(['required']),
|
->rules(['required']),
|
||||||
ImportColumn::make('updated_order_quantity')
|
|
||||||
->exampleHeader('UPDATED ORDER QUANTITY')
|
|
||||||
->label('UPDATED ORDER QUANTITY'),
|
|
||||||
ImportColumn::make('coil_number')
|
ImportColumn::make('coil_number')
|
||||||
->exampleHeader('COIL NUMBER')
|
->exampleHeader('COIL NUMBER')
|
||||||
// ->example('01')
|
// ->example('01')
|
||||||
@@ -113,7 +110,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
$sfgNo = trim($this->data['sfg_number'] ?? '');
|
$sfgNo = trim($this->data['sfg_number'] ?? '');
|
||||||
$machineName = trim($this->data['machine_name'] ?? '');
|
$machineName = trim($this->data['machine_name'] ?? '');
|
||||||
$orderQuan = trim($this->data['order_quantity'] ?? '');
|
$orderQuan = trim($this->data['order_quantity'] ?? '');
|
||||||
$updatedOrderQuan = trim($this->data['updated_order_quantity'] ?? '');
|
|
||||||
$scrapQuan = trim($this->data['scrap_quantity'] ?? '');
|
$scrapQuan = trim($this->data['scrap_quantity'] ?? '');
|
||||||
$reworkStatus = trim($this->data['rework_status'] ?? '');
|
$reworkStatus = trim($this->data['rework_status'] ?? '');
|
||||||
$recQuan = trim($this->data['received_quantity'] ?? '');
|
$recQuan = trim($this->data['received_quantity'] ?? '');
|
||||||
@@ -132,10 +128,7 @@ class ProcessOrderImporter extends Importer
|
|||||||
if ($iCode == null || $iCode == '') {
|
if ($iCode == null || $iCode == '') {
|
||||||
$warnMsg[] = "Item code can't be empty!";
|
$warnMsg[] = "Item code can't be empty!";
|
||||||
} elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
|
} elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
|
||||||
$warnMsg[] = 'Invalid item code found!';
|
$warnMsg[] = 'Invalid item code found';
|
||||||
}
|
|
||||||
if ($machineName != null && $machineName != '' && Str::length($machineName) > 18) {
|
|
||||||
$warnMsg[] = 'Invalid machine name found!';
|
|
||||||
}
|
}
|
||||||
if ($processOrder == null || $processOrder == '') {
|
if ($processOrder == null || $processOrder == '') {
|
||||||
$warnMsg[] = "Process order can't be empty!";
|
$warnMsg[] = "Process order can't be empty!";
|
||||||
@@ -152,12 +145,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
} elseif (Str::length($orderQuan) >= 1 && ! is_numeric($orderQuan)) {
|
} elseif (Str::length($orderQuan) >= 1 && ! is_numeric($orderQuan)) {
|
||||||
$warnMsg[] = 'Invalid order quantity found!';
|
$warnMsg[] = 'Invalid order quantity found!';
|
||||||
}
|
}
|
||||||
if ($updatedOrderQuan == null || $updatedOrderQuan == '' || $updatedOrderQuan == 0 || $updatedOrderQuan == '0') {
|
|
||||||
$updatedOrderQuan = $orderQuan;
|
|
||||||
} elseif (Str::length($updatedOrderQuan) >= 1 && ! is_numeric($updatedOrderQuan)) {
|
|
||||||
$warnMsg[] = 'Invalid Updated order quantity found!';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($coilNo == null || $coilNo == '') {
|
if ($coilNo == null || $coilNo == '') {
|
||||||
$coilNo = '0';
|
$coilNo = '0';
|
||||||
}
|
}
|
||||||
@@ -172,7 +159,7 @@ class ProcessOrderImporter extends Importer
|
|||||||
} elseif ($reworkStatus == 1 || $reworkStatus = '1') {
|
} elseif ($reworkStatus == 1 || $reworkStatus = '1') {
|
||||||
$reworkStatus = 1;
|
$reworkStatus = 1;
|
||||||
} else {
|
} else {
|
||||||
$warnMsg[] = 'Invalid rework status found!';
|
$warnMsg[] = 'Invalid rework status found';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($warnMsg)) {
|
if (! empty($warnMsg)) {
|
||||||
@@ -236,7 +223,7 @@ class ProcessOrderImporter extends Importer
|
|||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($existingOrder && $existingOrder->item_id !== ($itemId ?? null)) {
|
if ($existingOrder && $existingOrder->item_id !== ($itemId ?? null)) {
|
||||||
$warnMsg[] = 'Same Process Order already exists for this Plant with a different Item Code!';
|
$warnMsg[] = 'Same Process Order already exists for this Plant with a different Item Code';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -256,39 +243,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
throw new RowImportFailedException(implode(', ', $warnMsg));
|
throw new RowImportFailedException(implode(', ', $warnMsg));
|
||||||
}
|
}
|
||||||
|
|
||||||
$existing = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
// ->where('coil_number', $coilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
$receivedQty = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->sum('received_quantity');
|
|
||||||
|
|
||||||
if ($existing) {
|
|
||||||
$liveOrdQuan = (float) $existing->order_quantity;
|
|
||||||
$liveUpdatedOrdQuan = (float) $existing->updated_order_quantity;
|
|
||||||
|
|
||||||
$allowedIncrease = $liveOrdQuan * 0.10;
|
|
||||||
|
|
||||||
$maxAllowedQty = $liveOrdQuan + $allowedIncrease;
|
|
||||||
$minAllowedQty = $liveOrdQuan - $allowedIncrease;
|
|
||||||
|
|
||||||
if ($liveUpdatedOrdQuan > $maxAllowedQty) {
|
|
||||||
throw new RowImportFailedException(
|
|
||||||
"Updated order quantity cannot exceed 10% of existing order quantity. Max allowed: {$maxAllowedQty}!"
|
|
||||||
);
|
|
||||||
} elseif ($liveUpdatedOrdQuan < $minAllowedQty) {
|
|
||||||
throw new RowImportFailedException(
|
|
||||||
"Updated order quantity cannot decrease -10% of existing order quantity. Min allowed: {$minAllowedQty}!"
|
|
||||||
);
|
|
||||||
} elseif ($liveUpdatedOrdQuan < $receivedQty) {
|
|
||||||
throw new RowImportFailedException(
|
|
||||||
"Updated order quantity cannot decrease below its received quantity {$receivedQty}!"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($coilNo != null && $coilNo != '' && $scrapQuan && $reworkStatus && $recQuan && $createdAt && $createdBy && $updatedAt && $updatedBy && Filament::auth()->user()->hasRole('Super Admin')) {
|
if ($coilNo != null && $coilNo != '' && $scrapQuan && $reworkStatus && $recQuan && $createdAt && $createdBy && $updatedAt && $updatedBy && Filament::auth()->user()->hasRole('Super Admin')) {
|
||||||
$existingCoil = ProcessOrder::where('plant_id', $plantId)
|
$existingCoil = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
@@ -296,17 +250,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
->where('coil_number', $coilNo)
|
->where('coil_number', $coilNo)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
// $existingProcess = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
// ->where('process_order', $processOrder)
|
|
||||||
// ->where('line_id', $lineId)
|
|
||||||
// ->first();
|
|
||||||
|
|
||||||
if ($existing) {
|
|
||||||
$existUpdateOrdQuan = $existing->updated_order_quantity;
|
|
||||||
} else {
|
|
||||||
$existUpdateOrdQuan = $updatedOrderQuan;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $existingCoil) {
|
if (! $existingCoil) {
|
||||||
ProcessOrder::Create(
|
ProcessOrder::Create(
|
||||||
[
|
[
|
||||||
@@ -316,7 +259,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
'item_id' => $itemId,
|
'item_id' => $itemId,
|
||||||
'coil_number' => $coilNo,
|
'coil_number' => $coilNo,
|
||||||
'order_quantity' => $orderQuan,
|
'order_quantity' => $orderQuan,
|
||||||
'updated_order_quantity' => $existUpdateOrdQuan,
|
|
||||||
'received_quantity' => $recQuan,
|
'received_quantity' => $recQuan,
|
||||||
'scrap_quantity' => $scrapQuan,
|
'scrap_quantity' => $scrapQuan,
|
||||||
'sfg_number' => $sfgNo,
|
'sfg_number' => $sfgNo,
|
||||||
@@ -346,16 +288,10 @@ class ProcessOrderImporter extends Importer
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$coilNo = '0';
|
$coilNo = '0';
|
||||||
// $existing = ProcessOrder::where('plant_id', $plantId)
|
$existing = ProcessOrder::where('plant_id', $plantId)
|
||||||
// ->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
// // ->where('coil_number', $coilNo)
|
// ->where('coil_number', $coilNo)
|
||||||
// ->first();
|
->first();
|
||||||
|
|
||||||
if ($existing) {
|
|
||||||
$existUpdateOrdQuan = $existing->updated_order_quantity;
|
|
||||||
} else {
|
|
||||||
$existUpdateOrdQuan = $updatedOrderQuan;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $existing && ($coilNo == '0' || $coilNo == 0)) {
|
if (! $existing && ($coilNo == '0' || $coilNo == 0)) {
|
||||||
ProcessOrder::create([
|
ProcessOrder::create([
|
||||||
@@ -365,7 +301,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
'process_order' => $processOrder,
|
'process_order' => $processOrder,
|
||||||
'coil_number' => '0',
|
'coil_number' => '0',
|
||||||
'order_quantity' => $orderQuan,
|
'order_quantity' => $orderQuan,
|
||||||
'updated_order_quantity' => $existUpdateOrdQuan,
|
|
||||||
'received_quantity' => 0,
|
'received_quantity' => 0,
|
||||||
'scrap_quantity' => 0,
|
'scrap_quantity' => 0,
|
||||||
'created_by' => $createdBy,
|
'created_by' => $createdBy,
|
||||||
@@ -380,7 +315,6 @@ class ProcessOrderImporter extends Importer
|
|||||||
'process_order' => $processOrder,
|
'process_order' => $processOrder,
|
||||||
'coil_number' => $coilNo,
|
'coil_number' => $coilNo,
|
||||||
'order_quantity' => $orderQuan,
|
'order_quantity' => $orderQuan,
|
||||||
'updated_order_quantity' => $existUpdateOrdQuan,
|
|
||||||
'received_quantity' => $recQuan,
|
'received_quantity' => $recQuan,
|
||||||
'scrap_quantity' => $scrapQuan ?? 0,
|
'scrap_quantity' => $scrapQuan ?? 0,
|
||||||
'sfg_number' => $sfgNo,
|
'sfg_number' => $sfgNo,
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ class CycleCount extends Page
|
|||||||
Notification::make()
|
Notification::make()
|
||||||
->danger()
|
->danger()
|
||||||
->title('Invalid QR Format')
|
->title('Invalid QR Format')
|
||||||
->body('Scan the valid QR code to proceed either FG or Non-FG!')
|
->body('Scan the valid QR code to proceed either SFG or FG!')
|
||||||
->seconds(3)
|
->seconds(3)
|
||||||
->send();
|
->send();
|
||||||
|
|
||||||
@@ -357,7 +357,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Unknown Location')
|
->title('Unknown Location')
|
||||||
->body("Location '$location' not found for the type Non-FG.")
|
->body("Location '$location' not found for the type SFG.")
|
||||||
->danger()
|
->danger()
|
||||||
->persistent()
|
->persistent()
|
||||||
->actions([
|
->actions([
|
||||||
@@ -416,7 +416,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Unknown Location')
|
->title('Unknown Location')
|
||||||
->body("Location '$location' not found for the type Non-FG against plant code '$plantCode'.")
|
->body("Location '$location' not found for the type SFG against plant code '$plantCode'.")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm_update')
|
\Filament\Notifications\Actions\Action::make('confirm_update')
|
||||||
@@ -475,7 +475,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Item Not Found in Location')
|
->title('Item Not Found in Location')
|
||||||
->body("Item Code '$this->itemCode' is not available in location '$location' (Type: Non-FG) for Plant Code '$plantCode'.")
|
->body("Item Code '$this->itemCode' is not available in location '$location' (Type: SFG) for Plant Code '$plantCode'.")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm_update')
|
\Filament\Notifications\Actions\Action::make('confirm_update')
|
||||||
@@ -626,7 +626,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Duplicate Serial Number')
|
->title('Duplicate Serial Number')
|
||||||
->body("Serial number '$this->sNo' has already been scanned in stock data master for the type Non-FG against plant code '$plantCode'.<br>Do you want to update in duplicate stock table?")
|
->body("Serial number '$this->sNo' has already been scanned in stock data master for the type SFG against plant code '$plantCode'.<br>Do you want to update in duplicate stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm')
|
\Filament\Notifications\Actions\Action::make('confirm')
|
||||||
@@ -678,7 +678,6 @@ class CycleCount extends Page
|
|||||||
$stock->update([
|
$stock->update([
|
||||||
'bin' => $bin,
|
'bin' => $bin,
|
||||||
'batch' => $this->batch,
|
'batch' => $this->batch,
|
||||||
// 'doc_no' =>$this->docNo,
|
|
||||||
'scanned_quantity' => $newScannedQty,
|
'scanned_quantity' => $newScannedQty,
|
||||||
'scanned_status' => $status,
|
'scanned_status' => $status,
|
||||||
]);
|
]);
|
||||||
@@ -915,7 +914,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Unknown Location')
|
->title('Unknown Location')
|
||||||
->body("location '$location' not found in stock data master for the type Non-FG.<br>Do you want to update in not in stock table?")
|
->body("location '$location' not found in stock data master for the type SFG.<br>Do you want to update in not in stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm')
|
\Filament\Notifications\Actions\Action::make('confirm')
|
||||||
@@ -974,7 +973,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Unknown Location')
|
->title('Unknown Location')
|
||||||
->body("location '$location' not found in stock data master for the type Non-FG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
->body("location '$location' not found in stock data master for the type SFG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm')
|
\Filament\Notifications\Actions\Action::make('confirm')
|
||||||
@@ -1047,7 +1046,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Unknown Serial Number')
|
->title('Unknown Serial Number')
|
||||||
->body('Scanned serial number not found in stock data master for the type Non-FG.<br>Do you want to update in not in stock table?')
|
->body('Scanned serial number not found in stock data master for the type SFG.<br>Do you want to update in not in stock table?')
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm')
|
\Filament\Notifications\Actions\Action::make('confirm')
|
||||||
@@ -1103,7 +1102,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Unknown Serial Number')
|
->title('Unknown Serial Number')
|
||||||
->body("Scanned serial number not found in stock data master for the type Non-FG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
->body("Scanned serial number not found in stock data master for the type SFG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm_update')
|
\Filament\Notifications\Actions\Action::make('confirm_update')
|
||||||
@@ -1157,7 +1156,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Invalid Location')
|
->title('Invalid Location')
|
||||||
->body("Serial number '$this->sNo' does not belong to location '$location' for the type Non-FG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
->body("Serial number '$this->sNo' does not belong to location '$location' for the type SFG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm_update')
|
\Filament\Notifications\Actions\Action::make('confirm_update')
|
||||||
@@ -1211,7 +1210,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Invalid Item Code')
|
->title('Invalid Item Code')
|
||||||
->body("Serial number '$this->sNo' does not belong to item code '$this->itemCode' for the type Non-FG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
->body("Serial number '$this->sNo' does not belong to item code '$this->itemCode' for the type SFG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm_update')
|
\Filament\Notifications\Actions\Action::make('confirm_update')
|
||||||
@@ -1267,7 +1266,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Invalid Batch')
|
->title('Invalid Batch')
|
||||||
->body("Serial number '$this->sNo' does not belong to batch '$this->batch' for the type Non-FG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
->body("Serial number '$this->sNo' does not belong to batch '$this->batch' for the type SFG against plant code '$plantCode'.<br>Do you want to update in not in stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm_update')
|
\Filament\Notifications\Actions\Action::make('confirm_update')
|
||||||
@@ -1303,13 +1302,13 @@ class CycleCount extends Page
|
|||||||
// Notification::make()
|
// Notification::make()
|
||||||
// ->danger()
|
// ->danger()
|
||||||
// ->title('Invalid Bin')
|
// ->title('Invalid Bin')
|
||||||
// ->body("Serial number '$this->sNo' does not belong to bin '$bin' for the type Non-FG against plant code '$plantCode'.")
|
// ->body("Serial number '$this->sNo' does not belong to bin '$bin' for the type SFG against plant code '$plantCode'.")
|
||||||
// ->seconds(3)
|
// ->seconds(3)
|
||||||
// ->send();
|
// ->send();
|
||||||
|
|
||||||
// Notification::make()
|
// Notification::make()
|
||||||
// ->title('Invalid Bin')
|
// ->title('Invalid Bin')
|
||||||
// ->body("Serial number '$this->sNo' does not belong to bin '$bin' for the type Non-FG against plant code '$plantCode'.")
|
// ->body("Serial number '$this->sNo' does not belong to bin '$bin' for the type SFG against plant code '$plantCode'.")
|
||||||
// ->danger()
|
// ->danger()
|
||||||
// ->actions([
|
// ->actions([
|
||||||
// \Filament\Notifications\Actions\Action::make('confirm_update')
|
// \Filament\Notifications\Actions\Action::make('confirm_update')
|
||||||
@@ -1348,7 +1347,7 @@ class CycleCount extends Page
|
|||||||
Notification::make()
|
Notification::make()
|
||||||
->warning()
|
->warning()
|
||||||
->title('Unknown Quantity')
|
->title('Unknown Quantity')
|
||||||
->body("Quantity is missing for serial number '$this->sNo' (Type: Non-FG) in Plant Code '$plantCode'. Please update it in Stock Data Master.")
|
->body("Quantity is missing for serial number '$this->sNo' (Type: SFG) in Plant Code '$plantCode'. Please update it in Stock Data Master.")
|
||||||
->seconds(3)
|
->seconds(3)
|
||||||
->send();
|
->send();
|
||||||
|
|
||||||
@@ -1364,7 +1363,7 @@ class CycleCount extends Page
|
|||||||
Notification::make()
|
Notification::make()
|
||||||
->warning()
|
->warning()
|
||||||
->title('Invalid Quantity')
|
->title('Invalid Quantity')
|
||||||
->body("Quantity should be '1' against '$this->sNo' for the type Non-FG against plant code '$plantCode'!Please update quantity in stock data master.")
|
->body("Quantity should be '1' against '$this->sNo' for the type SFG against plant code '$plantCode'!Please update quantity in stock data master.")
|
||||||
->seconds(3)
|
->seconds(3)
|
||||||
->send();
|
->send();
|
||||||
|
|
||||||
@@ -1384,7 +1383,7 @@ class CycleCount extends Page
|
|||||||
|
|
||||||
Notification::make()
|
Notification::make()
|
||||||
->title('Duplicate Serial Number')
|
->title('Duplicate Serial Number')
|
||||||
->body("Serial number '$this->sNo' has already been scanned in stock data master for the type Non-FG against plant code '$plantCode'.<br>Do you want to update in duplicate stock table?")
|
->body("Serial number '$this->sNo' has already been scanned in stock data master for the type SFG against plant code '$plantCode'.<br>Do you want to update in duplicate stock table?")
|
||||||
->danger()
|
->danger()
|
||||||
->actions([
|
->actions([
|
||||||
\Filament\Notifications\Actions\Action::make('confirm')
|
\Filament\Notifications\Actions\Action::make('confirm')
|
||||||
@@ -1575,7 +1574,7 @@ class CycleCount extends Page
|
|||||||
\Filament\Notifications\Actions\Action::make('confirm')
|
\Filament\Notifications\Actions\Action::make('confirm')
|
||||||
->label('Yes, Update')
|
->label('Yes, Update')
|
||||||
->button()
|
->button()
|
||||||
->dispatch('confirmSerialFGUpdate', [
|
->dispatch('confirmSerialUpdate', [
|
||||||
'plantId' => $plantId,
|
'plantId' => $plantId,
|
||||||
'location' => $location,
|
'location' => $location,
|
||||||
'bin' => $bin,
|
'bin' => $bin,
|
||||||
@@ -1634,7 +1633,7 @@ class CycleCount extends Page
|
|||||||
\Filament\Notifications\Actions\Action::make('confirm')
|
\Filament\Notifications\Actions\Action::make('confirm')
|
||||||
->label('Yes, Update')
|
->label('Yes, Update')
|
||||||
->button()
|
->button()
|
||||||
->dispatch('confirmSerialFGUpdate', [
|
->dispatch('confirmSerialUpdate', [
|
||||||
'plantId' => $plantId,
|
'plantId' => $plantId,
|
||||||
'location' => $location,
|
'location' => $location,
|
||||||
'bin' => $bin,
|
'bin' => $bin,
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
namespace App\Filament\Pages;
|
namespace App\Filament\Pages;
|
||||||
|
|
||||||
use App\Filament\Widgets\CumulativeChart;
|
use App\Filament\Widgets\CumulativeChart;
|
||||||
use App\Filament\Widgets\ProductionQuantityStat;
|
|
||||||
use Filament\Forms\Components\Select;
|
use Filament\Forms\Components\Select;
|
||||||
use Filament\Forms\Components\TextInput;
|
use Filament\Forms\Components\TextInput;
|
||||||
use Filament\Forms\Form;
|
use Filament\Forms\Form;
|
||||||
@@ -10,117 +9,64 @@ use Filament\Pages\Dashboard\Concerns\HasFiltersForm;
|
|||||||
use Filament\Tables\Filters\SelectFilter;
|
use Filament\Tables\Filters\SelectFilter;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use App\Models\Plant;
|
use App\Models\Plant;
|
||||||
use Filament\Facades\Filament;
|
|
||||||
use Filament\Forms\Components\DatePicker;
|
|
||||||
use Filament\Widgets\Widget;
|
use Filament\Widgets\Widget;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|
||||||
class Dashboard extends \Filament\Pages\Dashboard
|
class Dashboard extends \Filament\Pages\Dashboard
|
||||||
{
|
{
|
||||||
use HasFiltersForm;
|
use HasFiltersForm;
|
||||||
|
|
||||||
protected static ?string $navigationIcon = 'heroicon-s-gift';
|
protected static ?string $navigationGroup = 'Production DashBoard';
|
||||||
|
|
||||||
protected static string $view = 'filament.pages.dashboard';
|
public function mount(): void
|
||||||
|
{
|
||||||
|
session()->forget(['selected_plant']);
|
||||||
|
$this->filtersForm->fill([
|
||||||
|
'plant' => null
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
// public function mount(): void
|
public function filtersForm(Form $form): Form
|
||||||
// {
|
{
|
||||||
// session()->forget(['selected_plant']);
|
return $form
|
||||||
// session()->forget(['from_date']);
|
->statePath('filters') // Store form state in 'filters'
|
||||||
// session()->forget(['to_date']);
|
->schema([
|
||||||
// $this->filtersForm->fill([
|
Select::make('plant')
|
||||||
// 'plant' => null,
|
->options(Plant::pluck('name', 'id'))
|
||||||
// 'from_date' => null,
|
->label('Select Plant')
|
||||||
// 'to_date' => null,
|
->reactive()
|
||||||
// // 'success_status' => null
|
->afterStateUpdated(function ($state) {
|
||||||
// ]);
|
session(['selected_plant' => $state]); // fixed typo
|
||||||
// }
|
//$this->dispatch('cumulativeChart'); // custom Livewire event
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
// public function filtersForm(Form $form): Form
|
}
|
||||||
// {
|
|
||||||
// return $form
|
|
||||||
// ->statePath('filters') // Store form state in 'filters'
|
|
||||||
// ->schema([
|
|
||||||
// Select::make('plant')
|
|
||||||
// ->label('Select Plant')
|
|
||||||
// ->reactive()
|
|
||||||
// // ->options(Plant::pluck('name', 'id'))
|
|
||||||
// ->options(function (callable $get) {
|
|
||||||
// $userHas = Filament::auth()->user()->plant_id;
|
|
||||||
// return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
|
|
||||||
// })
|
|
||||||
// ->afterStateUpdated(function ($state,callable $set) {
|
|
||||||
// session(['selected_plant' => $state]); // fixed typo
|
|
||||||
// //$this->dispatch('cumulativeChart'); // custom Livewire event
|
|
||||||
// // Reset success_status whenever plant changes
|
|
||||||
// $set('success_status', null);
|
|
||||||
// session()->forget('success_status');
|
|
||||||
// }),
|
|
||||||
|
|
||||||
// // Select::make('success_status')
|
|
||||||
// // ->label('Select Status')
|
|
||||||
// // ->options([
|
|
||||||
// // 'Ok' => 'Ok',
|
|
||||||
// // 'Not Ok' => 'Not Ok',
|
|
||||||
// // ])
|
|
||||||
// // ->reactive()
|
|
||||||
// // ->afterStateUpdated(function ($state) {
|
|
||||||
// // session(['success_status' => $state]);
|
|
||||||
// // }),
|
|
||||||
|
|
||||||
// DatePicker::make('created_from')
|
|
||||||
// ->label('Created From')
|
|
||||||
// ->reactive()
|
|
||||||
// ->afterStateUpdated(function ($state,callable $set) {
|
|
||||||
// session(['from_date' => $state]);
|
|
||||||
// }),
|
|
||||||
|
|
||||||
// DatePicker::make('created_to')
|
|
||||||
// ->label('Created To')
|
|
||||||
// ->reactive()
|
|
||||||
// ->afterStateUpdated(function ($state,callable $set) {
|
|
||||||
// session(['to_date' => $state]);
|
|
||||||
// }),
|
|
||||||
|
|
||||||
// ]);
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
// public static function getNavigationLabel(): string
|
|
||||||
// {
|
|
||||||
// return 'Production Line Count';
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public function getHeading(): string
|
|
||||||
// {
|
|
||||||
// return 'Production Line Count';
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public function getWidgets(): array
|
|
||||||
// {
|
|
||||||
// $widgets = [];
|
|
||||||
|
|
||||||
// if (CumulativeChart::canView()) {
|
|
||||||
// $widgets[] = CumulativeChart::class;
|
|
||||||
|
|
||||||
// }
|
|
||||||
// return $widgets;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public static function canAccess(): bool
|
|
||||||
// {
|
|
||||||
// return Auth::check() && Auth::user()->can('view production line count dashboard');
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
public function getHeading(): string
|
|
||||||
{
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getNavigationLabel(): string
|
public static function getNavigationLabel(): string
|
||||||
{
|
{
|
||||||
return 'Welcome';
|
return 'Production Line Count';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getHeading(): string
|
||||||
|
{
|
||||||
|
return 'Production Line Count';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getWidgets(): array
|
||||||
|
{
|
||||||
|
$widgets = [];
|
||||||
|
|
||||||
|
if (CumulativeChart::canView()) {
|
||||||
|
$widgets[] = CumulativeChart::class;
|
||||||
|
}
|
||||||
|
return $widgets;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function canAccess(): bool
|
||||||
|
{
|
||||||
|
return Auth::check() && Auth::user()->can('view production line count dashboard');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,124 +1,23 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Filament\Pages;
|
namespace App\Filament\Pages;
|
||||||
|
|
||||||
use App\Filament\Widgets\CumulativeChart;
|
|
||||||
use App\Filament\Widgets\ProductionQuantityStat;
|
|
||||||
use Filament\Forms\Components\Select;
|
|
||||||
use Filament\Forms\Components\TextInput;
|
|
||||||
use Filament\Forms\Form;
|
|
||||||
use Filament\Pages\Dashboard\Concerns\HasFiltersForm;
|
|
||||||
use Filament\Tables\Filters\SelectFilter;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use App\Models\Plant;
|
|
||||||
use Filament\Facades\Filament;
|
|
||||||
use Filament\Forms\Components\DatePicker;
|
|
||||||
use Filament\Widgets\Widget;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Filament\Pages\Page;
|
use Filament\Pages\Page;
|
||||||
use Filament\Forms\Concerns\InteractsWithForms;
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|
||||||
class Welcome extends Page
|
class Welcome extends Page
|
||||||
{
|
{
|
||||||
|
protected static ?string $navigationIcon = 'heroicon-s-gift'; // 'heroicon-o-document-text';
|
||||||
|
|
||||||
protected static string $view = 'filament.pages.welcome';
|
protected static string $view = 'filament.pages.welcome';
|
||||||
|
|
||||||
protected static ?string $navigationIcon = 'heroicon-o-document-text';
|
|
||||||
|
|
||||||
use HasFiltersForm;
|
|
||||||
|
|
||||||
use InteractsWithForms;
|
|
||||||
|
|
||||||
protected static ?string $navigationGroup = 'Production DashBoard';
|
|
||||||
|
|
||||||
protected static ?string $slug = 'production-line-count';
|
|
||||||
|
|
||||||
public function mount(): void
|
|
||||||
{
|
|
||||||
session()->forget(['selected_plant']);
|
|
||||||
// session()->forget(['from_date']);
|
|
||||||
// session()->forget(['to_date']);
|
|
||||||
$this->filtersForm->fill([
|
|
||||||
'plant' => null,
|
|
||||||
// 'from_date' => null,
|
|
||||||
// 'to_date' => null,
|
|
||||||
// 'success_status' => null
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function filtersForm(Form $form): Form
|
|
||||||
{
|
|
||||||
return $form
|
|
||||||
->statePath('filters')
|
|
||||||
->schema([
|
|
||||||
Select::make('plant')
|
|
||||||
->label('Select Plant')
|
|
||||||
->reactive()
|
|
||||||
// ->options(Plant::pluck('name', 'id'))
|
|
||||||
->options(function (callable $get) {
|
|
||||||
$userHas = Filament::auth()->user()->plant_id;
|
|
||||||
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
|
|
||||||
})
|
|
||||||
->afterStateUpdated(function ($state,callable $set) {
|
|
||||||
session(['selected_plant' => $state]);
|
|
||||||
//$this->dispatch('cumulativeChart'); // custom Livewire event
|
|
||||||
// Reset success_status whenever plant changes
|
|
||||||
// $set('success_status', null);
|
|
||||||
// session()->forget('success_status');
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Select::make('success_status')
|
|
||||||
// ->label('Select Status')
|
|
||||||
// ->options([
|
|
||||||
// 'Ok' => 'Ok',
|
|
||||||
// 'Not Ok' => 'Not Ok',
|
|
||||||
// ])
|
|
||||||
// ->reactive()
|
|
||||||
// ->afterStateUpdated(function ($state) {
|
|
||||||
// session(['success_status' => $state]);
|
|
||||||
// }),
|
|
||||||
|
|
||||||
// DatePicker::make('created_from')
|
|
||||||
// ->label('Created From')
|
|
||||||
// ->reactive()
|
|
||||||
// ->afterStateUpdated(function ($state,callable $set) {
|
|
||||||
// session(['from_date' => $state]);
|
|
||||||
// }),
|
|
||||||
|
|
||||||
// DatePicker::make('created_to')
|
|
||||||
// ->label('Created To')
|
|
||||||
// ->reactive()
|
|
||||||
// ->afterStateUpdated(function ($state,callable $set) {
|
|
||||||
// session(['to_date' => $state]);
|
|
||||||
// }),
|
|
||||||
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static function getNavigationLabel(): string
|
|
||||||
{
|
|
||||||
return 'Production Line Count';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getHeading(): string
|
public function getHeading(): string
|
||||||
{
|
{
|
||||||
return 'Production Line Count';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// public function getWidgets(): array
|
// public static function canAccess(): bool
|
||||||
// {
|
// {
|
||||||
// $widgets = [];
|
// return Auth::check() && Auth::user()->can('view welcome page');
|
||||||
|
|
||||||
// if (CumulativeChart::canView()) {
|
|
||||||
// $widgets[] = CumulativeChart::class;
|
|
||||||
|
|
||||||
// }
|
|
||||||
// return $widgets;
|
|
||||||
// }
|
// }
|
||||||
|
|
||||||
public static function canAccess(): bool
|
|
||||||
{
|
|
||||||
return Auth::check() && Auth::user()->can('view production line count dashboard');
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Filament\Resources;
|
namespace App\Filament\Resources;
|
||||||
|
|
||||||
use App\Filament\Exports\NotInStockExporter;
|
|
||||||
use App\Filament\Imports\NotInStockImporter;
|
|
||||||
use App\Filament\Resources\NotInStockResource\Pages;
|
use App\Filament\Resources\NotInStockResource\Pages;
|
||||||
use App\Models\NotInStock;
|
use App\Models\NotInStock;
|
||||||
use App\Models\StickerMaster;
|
use App\Models\StickerMaster;
|
||||||
@@ -15,9 +13,6 @@ use Filament\Tables;
|
|||||||
use Filament\Tables\Table;
|
use Filament\Tables\Table;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
||||||
use Filament\Tables\Actions\ExportAction;
|
|
||||||
use Filament\Tables\Actions\ImportAction;
|
|
||||||
|
|
||||||
|
|
||||||
class NotInStockResource extends Resource
|
class NotInStockResource extends Resource
|
||||||
{
|
{
|
||||||
@@ -237,22 +232,6 @@ class NotInStockResource extends Resource
|
|||||||
Tables\Actions\ForceDeleteBulkAction::make(),
|
Tables\Actions\ForceDeleteBulkAction::make(),
|
||||||
Tables\Actions\RestoreBulkAction::make(),
|
Tables\Actions\RestoreBulkAction::make(),
|
||||||
]),
|
]),
|
||||||
])
|
|
||||||
->headerActions([
|
|
||||||
ImportAction::make()
|
|
||||||
->label('Import Not In Stock')
|
|
||||||
->color('warning')
|
|
||||||
->importer(NotInStockImporter::class)
|
|
||||||
->visible(function () {
|
|
||||||
return Filament::auth()->user()->can('view import not in stock');
|
|
||||||
}),
|
|
||||||
ExportAction::make()
|
|
||||||
->label('Export Not In Stock')
|
|
||||||
->color('warning')
|
|
||||||
->exporter(NotInStockExporter::class)
|
|
||||||
->visible(function () {
|
|
||||||
return Filament::auth()->user()->can('view export not in stock');
|
|
||||||
}),
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -273,7 +252,6 @@ class NotInStockResource extends Resource
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static function getEloquentQuery(): Builder
|
public static function getEloquentQuery(): Builder
|
||||||
{
|
{
|
||||||
return parent::getEloquentQuery()
|
return parent::getEloquentQuery()
|
||||||
|
|||||||
@@ -74,7 +74,6 @@ class ProcessOrderResource extends Resource
|
|||||||
$set('process_order', null);
|
$set('process_order', null);
|
||||||
$set('coil_number', '0');
|
$set('coil_number', '0');
|
||||||
$set('order_quantity', '0');
|
$set('order_quantity', '0');
|
||||||
$set('updated_order_quantity', '0');
|
|
||||||
$set('received_quantity', '0');
|
$set('received_quantity', '0');
|
||||||
$set('scrap_quantity', '0');
|
$set('scrap_quantity', '0');
|
||||||
$set('sfg_number', null);
|
$set('sfg_number', null);
|
||||||
@@ -114,7 +113,6 @@ class ProcessOrderResource extends Resource
|
|||||||
$set('process_order', null);
|
$set('process_order', null);
|
||||||
$set('coil_number', '0');
|
$set('coil_number', '0');
|
||||||
$set('order_quantity', '0');
|
$set('order_quantity', '0');
|
||||||
$set('updated_order_quantity', '0');
|
|
||||||
$set('received_quantity', '0');
|
$set('received_quantity', '0');
|
||||||
$set('scrap_quantity', '0');
|
$set('scrap_quantity', '0');
|
||||||
$set('sfg_number', null);
|
$set('sfg_number', null);
|
||||||
@@ -143,7 +141,6 @@ class ProcessOrderResource extends Resource
|
|||||||
$set('process_order', null);
|
$set('process_order', null);
|
||||||
$set('coil_number', '0');
|
$set('coil_number', '0');
|
||||||
$set('order_quantity', '0');
|
$set('order_quantity', '0');
|
||||||
$set('updated_order_quantity', '0');
|
|
||||||
$set('received_quantity', '0');
|
$set('received_quantity', '0');
|
||||||
$set('scrap_quantity', '0');
|
$set('scrap_quantity', '0');
|
||||||
$set('sfg_number', null);
|
$set('sfg_number', null);
|
||||||
@@ -220,7 +217,6 @@ class ProcessOrderResource extends Resource
|
|||||||
$plantId = $get('plant_id');
|
$plantId = $get('plant_id');
|
||||||
$set('coil_number', '0');
|
$set('coil_number', '0');
|
||||||
$set('order_quantity', '0');
|
$set('order_quantity', '0');
|
||||||
$set('updated_order_quantity', '0');
|
|
||||||
$set('received_quantity', '0');
|
$set('received_quantity', '0');
|
||||||
$set('scrap_quantity', '0');
|
$set('scrap_quantity', '0');
|
||||||
$set('sfg_number', null);
|
$set('sfg_number', null);
|
||||||
@@ -284,10 +280,10 @@ class ProcessOrderResource extends Resource
|
|||||||
->required()
|
->required()
|
||||||
->reactive()
|
->reactive()
|
||||||
->numeric()
|
->numeric()
|
||||||
->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
|
->readOnly(fn ($get) => ($get('process_order') == null))
|
||||||
->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
|
->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
|
||||||
$plantId = $get('plant_id');
|
$plantId = $get('plant_id');
|
||||||
$processOrder = trim($get('process_order'));
|
$processOrder = $get('process_order');
|
||||||
// $coilNo = $get('coil_number');
|
// $coilNo = $get('coil_number');
|
||||||
if (! $plantId) {
|
if (! $plantId) {
|
||||||
$set('poPlantError', 'Please select a plant first.');
|
$set('poPlantError', 'Please select a plant first.');
|
||||||
@@ -323,29 +319,14 @@ class ProcessOrderResource extends Resource
|
|||||||
function (callable $get) {
|
function (callable $get) {
|
||||||
return Rule::unique('process_orders', 'coil_number')
|
return Rule::unique('process_orders', 'coil_number')
|
||||||
->where('plant_id', $get('plant_id'))
|
->where('plant_id', $get('plant_id'))
|
||||||
->where('process_order', trim($get('process_order')))
|
->where('process_order', $get('process_order'))
|
||||||
->ignore($get('id'));
|
->ignore($get('id'));
|
||||||
},
|
},
|
||||||
function (callable $get): Closure {
|
function (callable $get): Closure {
|
||||||
return function (string $attribute, $value, Closure $fail) use ($get) {
|
return function (string $attribute, $value, Closure $fail) use ($get) {
|
||||||
$rework = $get('rework_status');
|
$rework = $get('rework_status');
|
||||||
$plantId = $get('plant_id');
|
if ($value && Str::contains($value, '.') && $rework == 0) {
|
||||||
$processOrder = trim($get('process_order'));
|
$fail("Rework status should be 'Yes' for rework coil number '{$value}'!");
|
||||||
|
|
||||||
if ($value && Str::contains($value, '.')) {
|
|
||||||
if ($rework == 0) {
|
|
||||||
$fail("Rework status should be 'Yes' for rework coil number '{$value}'!");
|
|
||||||
}
|
|
||||||
} elseif ($value > 1) {
|
|
||||||
$prevCoilNo = (string) ($value - 1);
|
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('coil_number', $prevCoilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if (! $existPrevCoil) {
|
|
||||||
$fail("Previous coil number '{$prevCoilNo}' not exist against plant and process order!");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -353,7 +334,7 @@ class ProcessOrderResource extends Resource
|
|||||||
// ->rule(function (callable $get) {
|
// ->rule(function (callable $get) {
|
||||||
// return Rule::unique('process_orders', 'coil_number')
|
// return Rule::unique('process_orders', 'coil_number')
|
||||||
// ->where('plant_id', $get('plant_id'))
|
// ->where('plant_id', $get('plant_id'))
|
||||||
// ->where('process_order', trim($get('process_order')))
|
// ->where('process_order', $get('process_order'))
|
||||||
// ->ignore($get('id'));
|
// ->ignore($get('id'));
|
||||||
// })
|
// })
|
||||||
->extraAttributes(fn ($get) => [
|
->extraAttributes(fn ($get) => [
|
||||||
@@ -367,17 +348,15 @@ class ProcessOrderResource extends Resource
|
|||||||
->required()
|
->required()
|
||||||
->reactive()
|
->reactive()
|
||||||
->numeric()
|
->numeric()
|
||||||
->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
|
->readOnly(fn ($get) => ($get('process_order') == null))
|
||||||
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
||||||
$plantId = $get('plant_id');
|
$plantId = $get('plant_id');
|
||||||
$itemId = $get('item_id');
|
$itemId = $get('item_id');
|
||||||
$processOrder = trim($get('process_order'));
|
$processOrder = trim($get('process_order'));
|
||||||
$set('received_quantity', '0');
|
$set('received_quantity', '0');
|
||||||
// $set('updated_order_quantity', $state);
|
|
||||||
$set('scrap_quantity', '0');
|
$set('scrap_quantity', '0');
|
||||||
if (! $plantId || ! $itemId || ! $processOrder) {
|
if (! $plantId || ! $itemId || ! $processOrder) {
|
||||||
$set('order_quantity', '0');
|
$set('order_quantity', '0');
|
||||||
$set('updated_order_quantity', '0');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = ProcessOrder::where('plant_id', $plantId)
|
$query = ProcessOrder::where('plant_id', $plantId)
|
||||||
@@ -393,175 +372,13 @@ class ProcessOrderResource extends Resource
|
|||||||
}
|
}
|
||||||
$set('updated_by', Filament::auth()->user()?->name);
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
}),
|
}),
|
||||||
Forms\Components\TextInput::make('updated_order_quantity')
|
|
||||||
->label('Updated Order Quantity')
|
|
||||||
->required()
|
|
||||||
->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == '' || trim($get('order_quantity')) == '' || trim($get('order_quantity')) == null))
|
|
||||||
->reactive()
|
|
||||||
->rules([
|
|
||||||
function (callable $get): Closure {
|
|
||||||
return function (string $attribute, $value, Closure $fail) use ($get) {
|
|
||||||
$plantId = $get('plant_id');
|
|
||||||
$processOrder = trim($get('process_order'));
|
|
||||||
$receivedQty = $get('received_quantity');
|
|
||||||
|
|
||||||
$currentId = $get('id');
|
|
||||||
|
|
||||||
$orderQty = (float) $get('order_quantity');
|
|
||||||
$updatedQty = (float) $value;
|
|
||||||
|
|
||||||
$allowedVariance = $orderQty * 0.10;
|
|
||||||
|
|
||||||
$maxAllowed = $orderQty + $allowedVariance;
|
|
||||||
$minAllowed = $orderQty - $allowedVariance;
|
|
||||||
|
|
||||||
if ($updatedQty > $maxAllowed || $updatedQty < $minAllowed) {
|
|
||||||
$fail('Quantity can vary by ±10% of the order quantity.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$otherReceivedQty = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->when($currentId, fn ($q) => $q->where('id', '!=', $currentId))
|
|
||||||
->sum('received_quantity');
|
|
||||||
|
|
||||||
$currentReceivedQty = (float) $get('received_quantity');
|
|
||||||
|
|
||||||
$totalReceivedQty = $otherReceivedQty + $currentReceivedQty;
|
|
||||||
|
|
||||||
if ($updatedQty < $totalReceivedQty) {
|
|
||||||
$fail("You cannot set quantity below received quantity ({$totalReceivedQty}).");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
},
|
|
||||||
]),
|
|
||||||
Forms\Components\TextInput::make('received_quantity')
|
Forms\Components\TextInput::make('received_quantity')
|
||||||
->label('Received Quantity')
|
->label('Received Quantity')
|
||||||
->default('0.000')
|
->default('0.000')
|
||||||
->required()
|
->required()
|
||||||
->reactive()
|
->reactive()
|
||||||
->numeric()
|
->numeric()
|
||||||
->maxValue(fn (Get $get) => $get('order_quantity') ?? PHP_INT_MAX)
|
->readOnly(fn ($get) => ($get('process_order') == null))
|
||||||
->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
|
|
||||||
->rule(function (callable $get) {
|
|
||||||
return function (string $attribute, $value, Closure $fail) use ($get) {
|
|
||||||
$rework = $get('rework_status');
|
|
||||||
$plantId = $get('plant_id');
|
|
||||||
$lineId = $get('line_id');
|
|
||||||
$itemId = $get('item_id');
|
|
||||||
$processOrder = trim($get('process_order'));
|
|
||||||
$coilNo = trim($get('coil_number'));
|
|
||||||
|
|
||||||
$orderExist = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('item_id', $itemId)->latest()->first();
|
|
||||||
|
|
||||||
if ($orderExist) {
|
|
||||||
// $orderQty = $orderExist->order_quantity ?? 0;
|
|
||||||
$orderQty = $orderExist->updated_order_quantity ?? 0;
|
|
||||||
|
|
||||||
$alreadyReceived = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('item_id', $itemId)
|
|
||||||
->sum('received_quantity');
|
|
||||||
|
|
||||||
$total = $alreadyReceived + $value;
|
|
||||||
|
|
||||||
if ($rework == 1) {
|
|
||||||
if ($coilNo && Str::contains($coilNo, '.')) {
|
|
||||||
$coilMain = explode('.', $coilNo)[0];
|
|
||||||
|
|
||||||
$existingCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('line_id', $lineId)
|
|
||||||
->where('coil_number', $coilMain)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('item_id', $itemId)
|
|
||||||
->where('coil_number', $coilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if ($existPrevCoil && $existPrevCoil->received_quantity < $value) {
|
|
||||||
$fail('Rework received quantity should not exceed exist received quantity!');
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($existingCoil && $existingCoil->rework_status == 1 && $total > $orderQty) {
|
|
||||||
$fail("Rework received quantity should not exceed exist order quantity! Already Exist Total Received Qty = '{$alreadyReceived}'.");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if ($coilNo > 1) {
|
|
||||||
$prevCoilNo = (string) ($coilNo - 1);
|
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('coil_number', $prevCoilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if (! $existPrevCoil) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$existingCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('line_id', $lineId)
|
|
||||||
->where('coil_number', $coilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if (! $existingCoil) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('item_id', $itemId)
|
|
||||||
->where('coil_number', $coilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if ($existPrevCoil && $existPrevCoil->received_quantity < $value) {
|
|
||||||
$fail('Rework received quantity should not exceed exist received quantity!');
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if ($coilNo && Str::contains($coilNo, '.')) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$existing = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('coil_number', $coilNo)
|
|
||||||
->first();
|
|
||||||
if ($existing) {
|
|
||||||
if ($existing->received_quantity < $value) {
|
|
||||||
$fail('Received quantity should not exceed exist received quantity!'); // Exist Received Qty = '{$existing->received_quantity}'.
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($coilNo > 1) {
|
|
||||||
$prevCoilNo = (string) ($coilNo - 1);
|
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('coil_number', $prevCoilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if (! $existPrevCoil) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($total > $orderQty) {
|
|
||||||
$fail("Received quantity should not exceed exist order quantity! Already Exist Total Received Qty = '{$alreadyReceived}'.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
})
|
|
||||||
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
||||||
$set('scrap_quantity', '0');
|
$set('scrap_quantity', '0');
|
||||||
$set('updated_by', Filament::auth()->user()?->name);
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
@@ -570,7 +387,7 @@ class ProcessOrderResource extends Resource
|
|||||||
->label('Scrap Quantity')
|
->label('Scrap Quantity')
|
||||||
->default('0.000')
|
->default('0.000')
|
||||||
->required()
|
->required()
|
||||||
->readOnly(fn ($get) => ($get('rework_status') == 0 || trim($get('process_order')) == null || trim($get('process_order')) == ''))
|
->readOnly(fn ($get) => ($get('rework_status') == 0 || $get('process_order') == null))
|
||||||
->reactive()
|
->reactive()
|
||||||
->numeric()
|
->numeric()
|
||||||
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
||||||
@@ -597,7 +414,7 @@ class ProcessOrderResource extends Resource
|
|||||||
Forms\Components\TextInput::make('sfg_number')
|
Forms\Components\TextInput::make('sfg_number')
|
||||||
->label('SFG Number')
|
->label('SFG Number')
|
||||||
->reactive()
|
->reactive()
|
||||||
->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
|
->readOnly(fn ($get) => ($get('process_order') == null))
|
||||||
->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
|
->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
|
||||||
$plantId = $get('plant_id');
|
$plantId = $get('plant_id');
|
||||||
$sfgNo = $get('sfg_number');
|
$sfgNo = $get('sfg_number');
|
||||||
@@ -631,8 +448,7 @@ class ProcessOrderResource extends Resource
|
|||||||
Forms\Components\TextInput::make('machine_name')
|
Forms\Components\TextInput::make('machine_name')
|
||||||
->label('Machine Name')
|
->label('Machine Name')
|
||||||
->reactive()
|
->reactive()
|
||||||
->maxLength(18)
|
->readOnly(fn ($get) => ($get('process_order') == null))
|
||||||
->readOnly(fn ($get) => (trim($get('process_order')) == null || trim($get('process_order')) == ''))
|
|
||||||
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
->afterStateUpdated(function (callable $set, callable $get, ?string $state) {
|
||||||
$set('updated_by', Filament::auth()->user()?->name);
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
}),
|
}),
|
||||||
@@ -760,7 +576,7 @@ class ProcessOrderResource extends Resource
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get the value of process_order field
|
// Get the value of process_order field
|
||||||
$processOrder = trim($get('process_order'));
|
$processOrder = $get('process_order');
|
||||||
|
|
||||||
if ($batchId != $processOrder) {
|
if ($batchId != $processOrder) {
|
||||||
Notification::make()
|
Notification::make()
|
||||||
@@ -805,7 +621,7 @@ class ProcessOrderResource extends Resource
|
|||||||
return Filament::auth()->user()->can('view process order packing slip');
|
return Filament::auth()->user()->can('view process order packing slip');
|
||||||
})
|
})
|
||||||
->action(function ($get, callable $set) {
|
->action(function ($get, callable $set) {
|
||||||
$equipmentNumber = trim($get('process_order'));
|
$equipmentNumber = $get('process_order');
|
||||||
$set('updated_by', Filament::auth()->user()?->name);
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
|
||||||
if (! $equipmentNumber) {
|
if (! $equipmentNumber) {
|
||||||
@@ -904,11 +720,6 @@ class ProcessOrderResource extends Resource
|
|||||||
->alignCenter()
|
->alignCenter()
|
||||||
->searchable()
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('updated_order_quantity')
|
|
||||||
->label('Updated Order Quantity')
|
|
||||||
->alignCenter()
|
|
||||||
->searchable()
|
|
||||||
->sortable(),
|
|
||||||
Tables\Columns\TextColumn::make('received_quantity')
|
Tables\Columns\TextColumn::make('received_quantity')
|
||||||
->label('Received Quantity')
|
->label('Received Quantity')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
@@ -1253,7 +1064,7 @@ class ProcessOrderResource extends Resource
|
|||||||
->options(function (callable $get) {
|
->options(function (callable $get) {
|
||||||
$plantId = $get('plant');
|
$plantId = $get('plant');
|
||||||
$itemId = $get('Item');
|
$itemId = $get('Item');
|
||||||
$processOrder = trim($get('process_order'));
|
$processOrder = $get('process_order');
|
||||||
|
|
||||||
if (empty($plantId) || empty($itemId) || empty($processOrder)) {
|
if (empty($plantId) || empty($itemId) || empty($processOrder)) {
|
||||||
return [];
|
return [];
|
||||||
@@ -1270,7 +1081,7 @@ class ProcessOrderResource extends Resource
|
|||||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||||
$plantId = $get('plant');
|
$plantId = $get('plant');
|
||||||
$itemId = $get('Item');
|
$itemId = $get('Item');
|
||||||
$processOrder = trim($get('process_order'));
|
$processOrder = $get('process_order');
|
||||||
|
|
||||||
if (! $plantId || ! $itemId || ! $processOrder || ! $state) {
|
if (! $plantId || ! $itemId || ! $processOrder || ! $state) {
|
||||||
$set('received_quantity', null);
|
$set('received_quantity', null);
|
||||||
|
|||||||
@@ -3,28 +3,10 @@
|
|||||||
namespace App\Filament\Resources\ProcessOrderResource\Pages;
|
namespace App\Filament\Resources\ProcessOrderResource\Pages;
|
||||||
|
|
||||||
use App\Filament\Resources\ProcessOrderResource;
|
use App\Filament\Resources\ProcessOrderResource;
|
||||||
use App\Models\ProcessOrder;
|
|
||||||
use Filament\Actions;
|
use Filament\Actions;
|
||||||
use Filament\Facades\Filament;
|
|
||||||
use Filament\Notifications\Notification;
|
|
||||||
use Filament\Resources\Pages\CreateRecord;
|
use Filament\Resources\Pages\CreateRecord;
|
||||||
|
|
||||||
class CreateProcessOrder extends CreateRecord
|
class CreateProcessOrder extends CreateRecord
|
||||||
{
|
{
|
||||||
protected static string $resource = ProcessOrderResource::class;
|
protected static string $resource = ProcessOrderResource::class;
|
||||||
|
|
||||||
protected function afterCreate(): void
|
|
||||||
{
|
|
||||||
$plantId = $this->data['plant_id'];
|
|
||||||
$processOrder = $this->data['process_order'];
|
|
||||||
$updatedQty = (float) $this->data['updated_order_quantity'];
|
|
||||||
|
|
||||||
ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->update([
|
|
||||||
'updated_order_quantity' => $updatedQty,
|
|
||||||
'updated_by' => Filament::auth()->user()->name,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,78 +3,13 @@
|
|||||||
namespace App\Filament\Resources\ProcessOrderResource\Pages;
|
namespace App\Filament\Resources\ProcessOrderResource\Pages;
|
||||||
|
|
||||||
use App\Filament\Resources\ProcessOrderResource;
|
use App\Filament\Resources\ProcessOrderResource;
|
||||||
use App\Models\ProcessOrder;
|
|
||||||
use Filament\Actions;
|
use Filament\Actions;
|
||||||
use Filament\Facades\Filament;
|
|
||||||
use Filament\Notifications\Notification;
|
|
||||||
use Filament\Resources\Pages\EditRecord;
|
use Filament\Resources\Pages\EditRecord;
|
||||||
|
|
||||||
class EditProcessOrder extends EditRecord
|
class EditProcessOrder extends EditRecord
|
||||||
{
|
{
|
||||||
protected static string $resource = ProcessOrderResource::class;
|
protected static string $resource = ProcessOrderResource::class;
|
||||||
|
|
||||||
protected function beforeSave(): void
|
|
||||||
{
|
|
||||||
$plantId = $this->data['plant_id'] ?? null;
|
|
||||||
$processOrder = $this->data['process_order'] ?? null;
|
|
||||||
$extraQty = (float) ($this->data['updated_order_quantity'] ?? 0);
|
|
||||||
$extraQtyRaw = $this->data['updated_order_quantity'] ?? '';
|
|
||||||
|
|
||||||
if (!preg_match('/^\d+(\.\d{1,3})?$/', $extraQtyRaw)) {
|
|
||||||
Notification::make()
|
|
||||||
->title('Invalid Quantity')
|
|
||||||
->body('Only positive numbers with up to 3 decimal places are allowed.')
|
|
||||||
->danger()
|
|
||||||
->send();
|
|
||||||
|
|
||||||
$this->halt(); // stop save
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($extraQty < 0)
|
|
||||||
{
|
|
||||||
Notification::make()
|
|
||||||
->title('Invalid Quantity')
|
|
||||||
->body('Negative values are not allowed.')
|
|
||||||
->danger()
|
|
||||||
->send();
|
|
||||||
|
|
||||||
$this->halt();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($extraQty > 0) {
|
|
||||||
|
|
||||||
$order = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if ($order) {
|
|
||||||
|
|
||||||
$baseQty = (float) $order->order_quantity;
|
|
||||||
$maxAllowed = $baseQty * 0.10;
|
|
||||||
|
|
||||||
$maxFinalQty = $baseQty + $maxAllowed;
|
|
||||||
|
|
||||||
if ($extraQty > $maxFinalQty) {
|
|
||||||
Notification::make()
|
|
||||||
->title('Limit Exceeded')
|
|
||||||
->body("You can only increase the order by 10% (Max allowed: {$maxFinalQty}).")
|
|
||||||
->danger()
|
|
||||||
->send();
|
|
||||||
|
|
||||||
$this->halt(); // stops save
|
|
||||||
}
|
|
||||||
|
|
||||||
ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->update([
|
|
||||||
'updated_order_quantity' => $extraQty,
|
|
||||||
'updated_by' => Filament::auth()->user()?->name,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
protected function getHeaderActions(): array
|
protected function getHeaderActions(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -627,7 +627,7 @@ class PdfController extends Controller
|
|||||||
// 'coil_number' => $proOrdAgPlant->coil_number ?? "",
|
// 'coil_number' => $proOrdAgPlant->coil_number ?? "",
|
||||||
// 'order_quantity' => (string)$proOrdAgPlant->order_quantity ?? "",
|
// 'order_quantity' => (string)$proOrdAgPlant->order_quantity ?? "",
|
||||||
'coil_number' => $currentCoil,
|
'coil_number' => $currentCoil,
|
||||||
'order_quantity' => (string) $lastRecord->updated_order_quantity ?? '0.000',
|
'order_quantity' => (string) $lastRecord->order_quantity ?? '0.000',
|
||||||
'ok_quantity' => (string) $okQty ?? '0',
|
'ok_quantity' => (string) $okQty ?? '0',
|
||||||
'not_ok_quantity' => (string) $notOkQty ?? '0',
|
'not_ok_quantity' => (string) $notOkQty ?? '0',
|
||||||
'received_quantity' => (string) (($totalReceivedQty == 0) ? '0.000' : $totalReceivedQty) ?? '0.000',
|
'received_quantity' => (string) (($totalReceivedQty == 0) ? '0.000' : $totalReceivedQty) ?? '0.000',
|
||||||
@@ -686,7 +686,7 @@ class PdfController extends Controller
|
|||||||
$itemCode = $data['item_code'] ?? '';
|
$itemCode = $data['item_code'] ?? '';
|
||||||
$lineName = $data['line_name'] ?? '';
|
$lineName = $data['line_name'] ?? '';
|
||||||
$coilNo = $data['coil_number'] ?? '';
|
$coilNo = $data['coil_number'] ?? '';
|
||||||
$updatedOrderQty = $data['order_quantity'] ?? 0;
|
$orderQty = $data['order_quantity'] ?? 0;
|
||||||
$receivedQty = $data['received_quantity'] ?? 0;
|
$receivedQty = $data['received_quantity'] ?? 0;
|
||||||
$scrapQty = $data['scrap_quantity'] ?? 0;
|
$scrapQty = $data['scrap_quantity'] ?? 0;
|
||||||
$sfgNo = $data['sfg_number'] ?? '';
|
$sfgNo = $data['sfg_number'] ?? '';
|
||||||
@@ -728,17 +728,6 @@ class PdfController extends Controller
|
|||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($scrapQty == null || $scrapQty == '') {
|
|
||||||
$scrapQty = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($rework == null || $rework == '' || ! $rework) {
|
|
||||||
return response()->json([
|
|
||||||
'status_code' => 'ERROR',
|
|
||||||
'status_description' => "Rework value can't be empty!",
|
|
||||||
], 404);
|
|
||||||
}
|
|
||||||
|
|
||||||
$line = Line::where('name', $lineName)->first();
|
$line = Line::where('name', $lineName)->first();
|
||||||
|
|
||||||
if (! $line) {
|
if (! $line) {
|
||||||
@@ -872,8 +861,7 @@ class PdfController extends Controller
|
|||||||
->where('item_id', $itemId)
|
->where('item_id', $itemId)
|
||||||
->sum('received_quantity');
|
->sum('received_quantity');
|
||||||
|
|
||||||
$orderQty = 0;
|
if ($orderQty == 0) {
|
||||||
if ($updatedOrderQty == 0) {
|
|
||||||
$orderExist = ProcessOrder::where('plant_id', $plantId)
|
$orderExist = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
->where('item_id', $itemId)->latest()->first();
|
->where('item_id', $itemId)->latest()->first();
|
||||||
@@ -881,7 +869,6 @@ class PdfController extends Controller
|
|||||||
|
|
||||||
if ($orderExist) {
|
if ($orderExist) {
|
||||||
$orderQty = $orderExist->order_quantity ?? 0;
|
$orderQty = $orderExist->order_quantity ?? 0;
|
||||||
$updatedOrderQty = $orderExist->updated_order_quantity ?? 0;
|
|
||||||
} else {
|
} else {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
@@ -895,11 +882,9 @@ class PdfController extends Controller
|
|||||||
// ->value('order_quantity') ?? 0;
|
// ->value('order_quantity') ?? 0;
|
||||||
|
|
||||||
if ($orderExist) {
|
if ($orderExist) {
|
||||||
// $existOrderQty = $orderExist->updated_order_quantity ?? 0;
|
$existOrderQty = $orderExist->order_quantity ?? 0;
|
||||||
$orderQty = $orderExist->order_quantity ?? 0;
|
|
||||||
$existUpdatedOrdQuan = $orderExist->updated_order_quantity ?? 0;
|
|
||||||
|
|
||||||
if ($existUpdatedOrdQuan != $updatedOrderQty) {
|
if ($existOrderQty != $orderQty) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Order quantity doesn't equal to exist process order '{$processOrder}'",
|
'status_description' => "Order quantity doesn't equal to exist process order '{$processOrder}'",
|
||||||
@@ -910,6 +895,20 @@ class PdfController extends Controller
|
|||||||
|
|
||||||
$total = $alreadyReceived + $receivedQty;
|
$total = $alreadyReceived + $receivedQty;
|
||||||
|
|
||||||
|
if ($total > $orderQty) {
|
||||||
|
return response()->json([
|
||||||
|
'status_code' => 'ERROR',
|
||||||
|
'status_description' => "Received quantity should not exceed order quantity! Order Qty = {$orderQty}, Already Received Qty = {$alreadyReceived}, Trying to Insert Qty = {$receivedQty}",
|
||||||
|
], 404);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($rework == null || $rework == '' || ! $rework) {
|
||||||
|
return response()->json([
|
||||||
|
'status_code' => 'ERROR',
|
||||||
|
'status_description' => "Rework value can't be empty!",
|
||||||
|
], 404);
|
||||||
|
}
|
||||||
|
|
||||||
if ($rework != 'Yes' && $rework != 'No') {
|
if ($rework != 'Yes' && $rework != 'No') {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
@@ -950,13 +949,6 @@ class PdfController extends Controller
|
|||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($total > $updatedOrderQty) {
|
|
||||||
return response()->json([
|
|
||||||
'status_code' => 'ERROR',
|
|
||||||
'status_description' => "Rework received quantity should not exceed exist order quantity! Exist Order Qty = '{$updatedOrderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Rework Received Qty = '{$receivedQty}'",
|
|
||||||
], 404);
|
|
||||||
}
|
|
||||||
|
|
||||||
$existingCoil = ProcessOrder::where('plant_id', $plantId)
|
$existingCoil = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
->where('line_id', $lineNamePlantId)
|
->where('line_id', $lineNamePlantId)
|
||||||
@@ -972,7 +964,6 @@ class PdfController extends Controller
|
|||||||
'item_id' => $itemId,
|
'item_id' => $itemId,
|
||||||
'coil_number' => $coilNo,
|
'coil_number' => $coilNo,
|
||||||
'order_quantity' => $orderQty,
|
'order_quantity' => $orderQty,
|
||||||
'updated_order_quantity' => $updatedOrderQty,
|
|
||||||
'received_quantity' => $receivedQty,
|
'received_quantity' => $receivedQty,
|
||||||
'scrap_quantity' => $scrapQty,
|
'scrap_quantity' => $scrapQty,
|
||||||
'sfg_number' => $sfgNo,
|
'sfg_number' => $sfgNo,
|
||||||
@@ -1003,7 +994,7 @@ class PdfController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ($coilNo > 1) {
|
if ($coilNo >= 1) {
|
||||||
$prevCoilNo = (string) ($coilNo - 1);
|
$prevCoilNo = (string) ($coilNo - 1);
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
@@ -1013,7 +1004,7 @@ class PdfController extends Controller
|
|||||||
if (! $existPrevCoil) {
|
if (! $existPrevCoil) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Previous coil number '{$prevCoilNo}' not exist against plant code '{$plantCode}' and process order '{$processOrder}'!",
|
'status_description' => "Previouse coil number '{$prevCoilNo}' not exist against plant code '{$plantCode}' and process order '{$processOrder}'!",
|
||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1031,19 +1022,6 @@ class PdfController extends Controller
|
|||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
|
||||||
->where('process_order', $processOrder)
|
|
||||||
->where('item_id', $itemId)
|
|
||||||
->where('coil_number', $coilNo)
|
|
||||||
->first();
|
|
||||||
|
|
||||||
if ($existPrevCoil->received_quantity < $receivedQty) {
|
|
||||||
return response()->json([
|
|
||||||
'status_code' => 'ERROR',
|
|
||||||
'status_description' => "Rework received quantity should not exceed exist received quantity! Exist Received Qty = '{$existPrevCoil->received_quantity}', Trying to Insert Rework Received Qty = '{$receivedQty}'",
|
|
||||||
], 404);
|
|
||||||
}
|
|
||||||
|
|
||||||
$updated = ProcessOrder::where('plant_id', $plantId)
|
$updated = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
->where('line_id', $lineNamePlantId)
|
->where('line_id', $lineNamePlantId)
|
||||||
@@ -1092,7 +1070,7 @@ class PdfController extends Controller
|
|||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($coilNo > 1) {
|
if ($coilNo >= 1) {
|
||||||
$prevCoilNo = (string) ($coilNo - 1);
|
$prevCoilNo = (string) ($coilNo - 1);
|
||||||
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
$existPrevCoil = ProcessOrder::where('plant_id', $plantId)
|
||||||
->where('process_order', $processOrder)
|
->where('process_order', $processOrder)
|
||||||
@@ -1102,18 +1080,11 @@ class PdfController extends Controller
|
|||||||
if (! $existPrevCoil) {
|
if (! $existPrevCoil) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Previous coil number '{$prevCoilNo}' not exist against plant code '{$plantCode}' and process order '{$processOrder}'!",
|
'status_description' => "Previouse coil number '{$prevCoilNo}' not exist against plant code '{$plantCode}' and process order '{$processOrder}'!",
|
||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($total > $updatedOrderQty) {
|
|
||||||
return response()->json([
|
|
||||||
'status_code' => 'ERROR',
|
|
||||||
'status_description' => "Received quantity should not exceed exist order quantity! Exist Order Qty = '{$updatedOrderQty}', Already Exist Total Received Qty = '{$alreadyReceived}', Trying to Insert Received Qty = '{$receivedQty}'",
|
|
||||||
], 404);
|
|
||||||
}
|
|
||||||
|
|
||||||
ProcessOrder::Create(
|
ProcessOrder::Create(
|
||||||
[
|
[
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
@@ -1122,7 +1093,6 @@ class PdfController extends Controller
|
|||||||
'item_id' => $itemId,
|
'item_id' => $itemId,
|
||||||
'coil_number' => $coilNo,
|
'coil_number' => $coilNo,
|
||||||
'order_quantity' => $orderQty,
|
'order_quantity' => $orderQty,
|
||||||
'updated_order_quantity' => $updatedOrderQty,
|
|
||||||
'received_quantity' => $receivedQty,
|
'received_quantity' => $receivedQty,
|
||||||
'scrap_quantity' => $scrapQty,
|
'scrap_quantity' => $scrapQty,
|
||||||
'sfg_number' => $sfgNo,
|
'sfg_number' => $sfgNo,
|
||||||
|
|||||||
@@ -9,7 +9,14 @@ use App\Models\MotorTestingMaster;
|
|||||||
use App\Models\Plant;
|
use App\Models\Plant;
|
||||||
use App\Models\TestingPanelReading;
|
use App\Models\TestingPanelReading;
|
||||||
use App\Models\WorkGroupMaster;
|
use App\Models\WorkGroupMaster;
|
||||||
|
use DB;
|
||||||
|
use Filament\Notifications\Notification;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use Mpdf\Mpdf;
|
||||||
|
use chillerlan\QRCode\QROptions;
|
||||||
|
use chillerlan\QRCode\Output\QROutputInterface;
|
||||||
|
use Mpdf\QrCode\Output;
|
||||||
|
use Mpdf\QrCode\QrCode;
|
||||||
use Str;
|
use Str;
|
||||||
|
|
||||||
class TestingPanelController extends Controller
|
class TestingPanelController extends Controller
|
||||||
@@ -28,151 +35,173 @@ class TestingPanelController extends Controller
|
|||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
$expectedUser = env('API_AUTH_USER');
|
$expectedUser = env('API_AUTH_USER');
|
||||||
$expectedPw = env('API_AUTH_PW');
|
$expectedPw = env('API_AUTH_PW');
|
||||||
|
|
||||||
$header_auth = $request->header('Authorization');
|
$header_auth = $request->header('Authorization');
|
||||||
$expectedToken = $expectedUser.':'.$expectedPw;
|
$expectedToken = $expectedUser . ':' . $expectedPw;
|
||||||
|
|
||||||
if ('Bearer '.$expectedToken != $header_auth) {
|
if ("Bearer " . $expectedToken != $header_auth)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Invalid authorization token!',
|
'status_description' => 'Invalid authorization token!'
|
||||||
], 403);
|
], 403);
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = $request->all();
|
$data = $request->all();
|
||||||
|
|
||||||
if ($data['plant_code'] == null || $data['plant_code'] == '') {
|
if ($data['plant_code'] == null || $data['plant_code'] == '')
|
||||||
|
{
|
||||||
// return response("ERROR: Please provide a valid plant code.", 400)
|
// return response("ERROR: Please provide a valid plant code.", 400)
|
||||||
// ->header('Content-Type', 'text/plain');
|
// ->header('Content-Type', 'text/plain');
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Plant code can't be empty!",
|
'status_description' => "Plant code can't be empty!"
|
||||||
], 400);
|
], 400);
|
||||||
} elseif (Str::length($data['plant_code']) < 4 || ! is_numeric($data['plant_code']) || ! preg_match('/^[1-9]\d{3,}$/', $data['plant_code'])) {// !ctype_digit($data['plant_code'])
|
}
|
||||||
|
else if (Str::length($data['plant_code']) < 4 || !is_numeric($data['plant_code']) || !preg_match('/^[1-9]\d{3,}$/', $data['plant_code']))//!ctype_digit($data['plant_code'])
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Invalid plant code found!',
|
'status_description' => "Invalid plant code found!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$plant = Plant::where('code', $data['plant_code'])->first();
|
$plant = Plant::where('code', $data['plant_code'])->first();
|
||||||
if (! $plant) {
|
if (!$plant) {
|
||||||
// return response("Plant not found.", 400)->header('Content-Type', 'text/plain');
|
//return response("Plant not found.", 400)->header('Content-Type', 'text/plain');
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Plant not found!',
|
'status_description' => 'Plant not found!'
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$plantId = $plant->id;
|
$plantId = $plant->id;
|
||||||
|
|
||||||
if ($data['line_name'] == null || $data['line_name'] == '') {
|
if ($data['line_name'] == null || $data['line_name'] == '')
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Group work center can't be empty!",
|
'status_description' => "Group work center can't be empty!"
|
||||||
], 400);
|
], 400);
|
||||||
} elseif (Str::length($data['line_name']) < 0) {
|
}
|
||||||
|
else if (Str::length($data['line_name']) < 0)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Invalid group work center found!',
|
'status_description' => "Invalid group work center found!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$gWorkCenter = WorkGroupMaster::where('name', $data['line_name'])->first();
|
$gWorkCenter = WorkGroupMaster::where('name', $data['line_name'])->first();
|
||||||
if (! $gWorkCenter) {
|
if (!$gWorkCenter)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Group work center not found!',
|
'status_description' => 'Group work center not found!'
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$gWorkCenter = WorkGroupMaster::where('name', $data['line_name'])->where('plant_id', $plantId)->first();
|
$gWorkCenter = WorkGroupMaster::where('name', $data['line_name'])->where('plant_id', $plantId)->first();
|
||||||
if (! $gWorkCenter) {
|
if (!$gWorkCenter)
|
||||||
// return response( "Line not found for the specified plant : {$data['plant_code']}",400)->header('Content-Type', 'text/plain');
|
{
|
||||||
|
//return response( "Line not found for the specified plant : {$data['plant_code']}",400)->header('Content-Type', 'text/plain');
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Group work center not found for the specified plant : '{$data['plant_code']}'!",
|
'status_description' => "Group work center not found for the specified plant : '{$data['plant_code']}'!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$gWorkCenterId = $gWorkCenter->id;
|
$gWorkCenterId = $gWorkCenter->id;
|
||||||
|
|
||||||
if ($data['machine_name'] == null || $data['machine_name'] == '') {
|
if ($data['machine_name'] == null || $data['machine_name'] == '')
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Work center can't be empty!",
|
'status_description' => "Work center can't be empty!"
|
||||||
], 400);
|
], 400);
|
||||||
} elseif (Str::length($data['machine_name']) < 0) {
|
}
|
||||||
|
else if (Str::length($data['machine_name']) < 0)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Invalid work center found!',
|
'status_description' => "Invalid work center found!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$machine = Machine::where('work_center', $data['machine_name'])->first();
|
$machine = Machine::where('work_center', $data['machine_name'])->first();
|
||||||
if (! $machine) {
|
if (!$machine)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Work center not found!',
|
'status_description' => 'Work center not found!'
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$machine = Machine::where('work_center', $data['machine_name'])->where('plant_id', $plantId)->first();
|
$machine = Machine::where('work_center', $data['machine_name'])->where('plant_id', $plantId)->first();
|
||||||
if (! $machine) {
|
if (!$machine)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Work center not found for the specified plant : '{$data['plant_code']}'!",
|
'status_description' => "Work center not found for the specified plant : '{$data['plant_code']}'!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$machine = Machine::where('work_center', $data['machine_name'])->where('work_group_master_id', $gWorkCenterId)->first();
|
$machine = Machine::where('work_center', $data['machine_name'])->where('work_group_master_id', $gWorkCenterId)->first();
|
||||||
if (! $machine) {
|
if (!$machine)
|
||||||
|
{
|
||||||
// return response("Machine not found for the specified line : {$data['line_name']}", 400)->header('Content-Type', 'text/plain');
|
// return response("Machine not found for the specified line : {$data['line_name']}", 400)->header('Content-Type', 'text/plain');
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Work center not found for the specified Group work center : '{$data['line_name']}'!",
|
'status_description' => "Work center not found for the specified Group work center : '{$data['line_name']}'!"
|
||||||
], 400);
|
], 400);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$machine = Machine::where('work_center', $data['machine_name'])->where('plant_id', $plantId)->where('work_group_master_id', $gWorkCenterId)->first();
|
$machine = Machine::where('work_center', $data['machine_name'])->where('plant_id', $plantId)->where('work_group_master_id', $gWorkCenterId)->first();
|
||||||
if (! $machine) {
|
if (!$machine) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Work center not found for the specified Plant : '{$data['plant_code']}' and Group work center : '{$data['line_name']}'!",
|
'status_description' => "Work center not found for the specified Plant : '{$data['plant_code']}' and Group work center : '{$data['line_name']}'!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$lineId = $machine->line_id;
|
$lineId = $machine->line_id;
|
||||||
$machineId = $machine->id;
|
$machineId = $machine->id;
|
||||||
|
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
$insertedSerials = [];
|
$insertedSerials = [];
|
||||||
$missedItemCodes = [];
|
$missedItemCodes = [];
|
||||||
$duplicateItemCodes = [];
|
$duplicateItemCodes = [];
|
||||||
$existSnoCount = [];
|
$existSnoCount = [];
|
||||||
|
|
||||||
if (! empty($data['item_codes']) && is_array($data['item_codes'])) {
|
if (!empty($data['item_codes']) && is_array($data['item_codes']))
|
||||||
foreach ($data['item_codes'] as $item) {
|
{
|
||||||
|
foreach ($data['item_codes'] as $item)
|
||||||
|
{
|
||||||
$code = $item['item_code'] ?? null;
|
$code = $item['item_code'] ?? null;
|
||||||
|
|
||||||
// Check if item_code is present
|
// Check if item_code is present
|
||||||
if ($code == '' || $code == null) {
|
if ($code == '' || $code == null)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Item code can't be empty!",
|
'status_description' => "Item code can't be empty!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Collect duplicates
|
// Collect duplicates
|
||||||
if (isset($itemCodeCounts[$code])) {
|
if (isset($itemCodeCounts[$code]))
|
||||||
|
{
|
||||||
$itemCodeCounts[$code]++;
|
$itemCodeCounts[$code]++;
|
||||||
// Only add to duplicates array once
|
// Only add to duplicates array once
|
||||||
if ($itemCodeCounts[$code] == 2) {
|
if ($itemCodeCounts[$code] == 2) {
|
||||||
$duplicateItemCodes[] = $code;
|
$duplicateItemCodes[] = $code;
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$itemCodeCounts[$code] = 1;
|
$itemCodeCounts[$code] = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,41 +209,43 @@ class TestingPanelController extends Controller
|
|||||||
$query->where('code', $item['item_code']);
|
$query->where('code', $item['item_code']);
|
||||||
})->where('plant_id', $plantId)->first();
|
})->where('plant_id', $plantId)->first();
|
||||||
|
|
||||||
if (! $motorTestingMaster) {
|
if (!$motorTestingMaster) {
|
||||||
$missedItemCodes[] = $item['item_code'];
|
$missedItemCodes[] = $item['item_code'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($item['serial_numbers']) && is_array($item['serial_numbers'])) {
|
if (!empty($item['serial_numbers']) && is_array($item['serial_numbers'])) {
|
||||||
foreach ($item['serial_numbers'] as $serial) {
|
foreach ($item['serial_numbers'] as $serial)
|
||||||
|
{
|
||||||
$existSnoCount[] = $serial['serial_number'];
|
$existSnoCount[] = $serial['serial_number'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If any duplicates found, return error
|
// If any duplicates found, return error
|
||||||
if (! empty($duplicateItemCodes)) {
|
if (!empty($duplicateItemCodes)) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Duplicate item codes found in request: '.implode(', ', $duplicateItemCodes),
|
'status_description' => 'Duplicate item codes found in request: ' . implode(', ', $duplicateItemCodes)
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$uniqueInvalidCodes = array_unique($missedItemCodes);
|
$uniqueInvalidCodes = array_unique($missedItemCodes);
|
||||||
|
|
||||||
if (! empty($uniqueInvalidCodes)) {
|
if (!empty($uniqueInvalidCodes)) {
|
||||||
|
|
||||||
// return response("Item codes : ". implode(', ', $uniqueInvalidCodes)." not found in motor testing master for the specified plant {$plant->name}", 400)
|
// return response("Item codes : ". implode(', ', $uniqueInvalidCodes)." not found in motor testing master for the specified plant {$plant->name}", 400)
|
||||||
// ->header('Content-Type', 'text/plain');
|
// ->header('Content-Type', 'text/plain');
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Item codes : '.implode(', ', $uniqueInvalidCodes)." not found in master for the specified plant : '{$plant->name}'!",
|
'status_description' => "Item codes : ". implode(', ', $uniqueInvalidCodes)." not found in master for the specified plant : '{$plant->name}'!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
$insertedSnoCount = [];
|
$insertedSnoCount = [];
|
||||||
|
|
||||||
foreach ($data['item_codes'] as $item) {
|
foreach ($data['item_codes'] as $item)
|
||||||
|
{
|
||||||
|
|
||||||
$motorTestingMaster = MotorTestingMaster::whereHas('item', callback: function ($query) use ($item) {
|
$motorTestingMaster = MotorTestingMaster::whereHas('item', callback: function ($query) use ($item) {
|
||||||
$query->where('code', $item['item_code']);
|
$query->where('code', $item['item_code']);
|
||||||
@@ -222,16 +253,18 @@ class TestingPanelController extends Controller
|
|||||||
|
|
||||||
$motorTestingMasterId = $motorTestingMaster->id;
|
$motorTestingMasterId = $motorTestingMaster->id;
|
||||||
|
|
||||||
if (! empty($item['serial_numbers']) && is_array($item['serial_numbers'])) {
|
if (!empty($item['serial_numbers']) && is_array($item['serial_numbers']))
|
||||||
foreach ($item['serial_numbers'] as $serial) {
|
{
|
||||||
// For update_count calculation
|
foreach ($item['serial_numbers'] as $serial)
|
||||||
|
{
|
||||||
|
//For update_count calculation
|
||||||
$updateCount = [
|
$updateCount = [
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'line_id' => $lineId,
|
'line_id' => $lineId,
|
||||||
'machine_id' => $machineId,
|
'machine_id' => $machineId,
|
||||||
'motor_testing_master_id' => $motorTestingMasterId,
|
'motor_testing_master_id' => $motorTestingMasterId,
|
||||||
'serial_number' => $serial['serial_number'] ?? null,
|
'serial_number' => $serial['serial_number'] ?? null,
|
||||||
'rework_count' => $serial['rework_count'] ?? 0,
|
'rework_count' => $serial['rework_count'] ?? 0,
|
||||||
];
|
];
|
||||||
|
|
||||||
// // Find the current max update_count for this composite key //updated_at
|
// // Find the current max update_count for this composite key //updated_at
|
||||||
@@ -244,64 +277,64 @@ class TestingPanelController extends Controller
|
|||||||
$maxLength = TestingPanelReading::where($updateCount)->selectRaw('MAX(LENGTH(update_count)) as max_length')->value('max_length');
|
$maxLength = TestingPanelReading::where($updateCount)->selectRaw('MAX(LENGTH(update_count)) as max_length')->value('max_length');
|
||||||
|
|
||||||
// Then, get all records with that length
|
// Then, get all records with that length
|
||||||
$lastUpdateCount = TestingPanelReading::where($updateCount)->whereRaw('LENGTH(update_count) = ?', [$maxLength])->orderByDesc('update_count')->select('update_count')->first(); // ->get();
|
$lastUpdateCount = TestingPanelReading::where($updateCount)->whereRaw('LENGTH(update_count) = ?', [$maxLength])->orderByDesc('update_count')->select('update_count')->first();//->get();
|
||||||
|
|
||||||
$newUpdateCount = ($lastUpdateCount == null || $lastUpdateCount == '') ? 0 : (int) $lastUpdateCount?->update_count + 1; // $maxUpdateCount?->update_count
|
$newUpdateCount = ($lastUpdateCount == null || $lastUpdateCount == '') ? 0 : (int)$lastUpdateCount?->update_count + 1;//$maxUpdateCount?->update_count
|
||||||
|
|
||||||
$updateCountString = (string) $newUpdateCount;
|
$updateCountString = (string)$newUpdateCount;
|
||||||
|
|
||||||
$row = [
|
$row = [
|
||||||
'plant_id' => $plantId,
|
'plant_id' => $plantId,
|
||||||
'line_id' => $lineId,
|
'line_id' => $lineId,
|
||||||
'machine_id' => $machineId,
|
'machine_id' => $machineId,
|
||||||
'motor_testing_master_id' => $motorTestingMasterId,
|
'motor_testing_master_id'=> $motorTestingMasterId,
|
||||||
'serial_number' => $serial['serial_number'] ?? null,
|
'serial_number' => $serial['serial_number'] ?? null,
|
||||||
'winded_serial_number' => $serial['winded_serial_number'] ?? null,
|
'winded_serial_number' => $serial['winded_serial_number'] ?? null,
|
||||||
'output' => $serial['output'] ?? null,
|
'output' => $serial['output'] ?? null,
|
||||||
'before_fr_volt' => $serial['before_fr_volt'] ?? null,
|
'before_fr_volt' => $serial['before_fr_volt'] ?? null,
|
||||||
'before_fr_cur' => $serial['before_fr_cur'] ?? null,
|
'before_fr_cur' => $serial['before_fr_cur'] ?? null,
|
||||||
'before_fr_pow' => $serial['before_fr_pow'] ?? null,
|
'before_fr_pow' => $serial['before_fr_pow'] ?? null,
|
||||||
'before_fr_res_ry' => $serial['before_fr_res_ry'] ?? null,
|
'before_fr_res_ry' => $serial['before_fr_res_ry'] ?? null,
|
||||||
'before_fr_res_yb' => $serial['before_fr_res_yb'] ?? null,
|
'before_fr_res_yb' => $serial['before_fr_res_yb'] ?? null,
|
||||||
'before_fr_res_br' => $serial['before_fr_res_br'] ?? null,
|
'before_fr_res_br' => $serial['before_fr_res_br'] ?? null,
|
||||||
'before_fr_ir' => $serial['before_fr_ir'] ?? null,
|
'before_fr_ir' => $serial['before_fr_ir'] ?? null,
|
||||||
'before_fr_ir_r' => $serial['before_fr_ir_r'] ?? null,
|
'before_fr_ir_r' => $serial['before_fr_ir_r'] ?? null,
|
||||||
'before_fr_ir_y' => $serial['before_fr_ir_y'] ?? null,
|
'before_fr_ir_y' => $serial['before_fr_ir_y'] ?? null,
|
||||||
'before_fr_ir_b' => $serial['before_fr_ir_b'] ?? null,
|
'before_fr_ir_b' => $serial['before_fr_ir_b'] ?? null,
|
||||||
'before_fr_freq' => $serial['before_fr_freq'] ?? null,
|
'before_fr_freq' => $serial['before_fr_freq'] ?? null,
|
||||||
'before_fr_speed' => $serial['before_fr_speed'] ?? null,
|
'before_fr_speed' => $serial['before_fr_speed'] ?? null,
|
||||||
'after_fr_vol' => $serial['after_fr_vol'] ?? null,
|
'after_fr_vol' => $serial['after_fr_vol'] ?? null,
|
||||||
'after_fr_cur' => $serial['after_fr_cur'] ?? null,
|
'after_fr_cur' => $serial['after_fr_cur'] ?? null,
|
||||||
'after_fr_pow' => $serial['after_fr_pow'] ?? null,
|
'after_fr_pow' => $serial['after_fr_pow'] ?? null,
|
||||||
'after_fr_ir_hot' => $serial['after_fr_ir_hot'] ?? null,
|
'after_fr_ir_hot' => $serial['after_fr_ir_hot'] ?? null,
|
||||||
'after_fr_ir_hot_r' => $serial['after_fr_ir_hot_r'] ?? null,
|
'after_fr_ir_hot_r' => $serial['after_fr_ir_hot_r'] ?? null,
|
||||||
'after_fr_ir_hot_y' => $serial['after_fr_ir_hot_y'] ?? null,
|
'after_fr_ir_hot_y' => $serial['after_fr_ir_hot_y'] ?? null,
|
||||||
'after_fr_ir_hot_b' => $serial['after_fr_ir_hot_b'] ?? null,
|
'after_fr_ir_hot_b' => $serial['after_fr_ir_hot_b'] ?? null,
|
||||||
'after_fr_ir_cool' => $serial['after_fr_ir_cool'] ?? null,
|
'after_fr_ir_cool' => $serial['after_fr_ir_cool'] ?? null,
|
||||||
'after_fr_ir_cool_r' => $serial['after_fr_ir_cool_r'] ?? null,
|
'after_fr_ir_cool_r' => $serial['after_fr_ir_cool_r'] ?? null,
|
||||||
'after_fr_ir_cool_y' => $serial['after_fr_ir_cool_y'] ?? null,
|
'after_fr_ir_cool_y' => $serial['after_fr_ir_cool_y'] ?? null,
|
||||||
'after_fr_ir_cool_b' => $serial['after_fr_ir_cool_b'] ?? null,
|
'after_fr_ir_cool_b' => $serial['after_fr_ir_cool_b'] ?? null,
|
||||||
'after_fr_freq' => $serial['after_fr_freq'] ?? null,
|
'after_fr_freq' => $serial['after_fr_freq'] ?? null,
|
||||||
'after_fr_speed' => $serial['after_fr_speed'] ?? null,
|
'after_fr_speed' => $serial['after_fr_speed'] ?? null,
|
||||||
'after_fr_leak_cur' => $serial['after_fr_leak_cur'] ?? null,
|
'after_fr_leak_cur' => $serial['after_fr_leak_cur'] ?? null,
|
||||||
'locked_rt_volt' => $serial['locked_rt_volt'] ?? null,
|
'locked_rt_volt' => $serial['locked_rt_volt'] ?? null,
|
||||||
'locked_rt_cur' => $serial['locked_rt_cur'] ?? null,
|
'locked_rt_cur' => $serial['locked_rt_cur'] ?? null,
|
||||||
'locked_rt_pow' => $serial['locked_rt_pow'] ?? null,
|
'locked_rt_pow' => $serial['locked_rt_pow'] ?? null,
|
||||||
'no_load_pickup_volt' => $serial['no_load_pickup_volt'] ?? null,
|
'no_load_pickup_volt' => $serial['no_load_pickup_volt'] ?? null,
|
||||||
'room_temperature' => $serial['room_temperature'] ?? null,
|
'room_temperature' => $serial['room_temperature'] ?? null,
|
||||||
'hv_test' => $serial['hv_test'] ?? null,
|
'hv_test' => $serial['hv_test'] ?? null,
|
||||||
'batch_number' => $serial['batch_number'] ?? null,
|
'batch_number' => $serial['batch_number'] ?? null,
|
||||||
'batch_count' => $serial['batch_count'] ?? 0,
|
'batch_count' => $serial['batch_count'] ?? 0,
|
||||||
'result' => $serial['result'] ?? null,
|
'result' => $serial['result'] ?? null,
|
||||||
'remark' => $serial['remark'] ?? null,
|
'remark' => $serial['remark'] ?? null,
|
||||||
'rework_count' => $serial['rework_count'] ?? 0,
|
'rework_count' => $serial['rework_count'] ?? 0,
|
||||||
'output_flag' => $serial['output_flag'] ?? 0,
|
'output_flag' => $serial['output_flag'] ?? 0,
|
||||||
'tested_by' => $serial['tested_by'] ?? null,
|
'tested_by' => $serial['tested_by'] ?? null,
|
||||||
'updated_by' => $serial['updated_by'] ?? null,
|
'updated_by' => $serial['updated_by'] ?? null,
|
||||||
'created_at' => $serial['created_at'] ?? null,
|
'created_at' => $serial['created_at'] ?? null,
|
||||||
'updated_at' => $serial['updated_at'] ?? $serial['created_at'],
|
'updated_at' => $serial['updated_at'] ?? $serial['created_at'],
|
||||||
'scanned_at' => $serial['scanned_at'] ?? null,
|
'scanned_at' => $serial['scanned_at'] ?? null,
|
||||||
'update_count' => $updateCountString,
|
'update_count' => $updateCountString,
|
||||||
];
|
];
|
||||||
|
|
||||||
// Insert the new record
|
// Insert the new record
|
||||||
@@ -313,27 +346,32 @@ class TestingPanelController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($insertedSerials)) {
|
if (!empty($insertedSerials))
|
||||||
if (count($existSnoCount) == count($insertedSnoCount)) {
|
{
|
||||||
|
if(count($existSnoCount) == count($insertedSnoCount))
|
||||||
|
{
|
||||||
// $messages[] = "Inserted serial numbers are: " . implode(', ', $insertedSerials);
|
// $messages[] = "Inserted serial numbers are: " . implode(', ', $insertedSerials);
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'SUCCESS',
|
'status_code' => 'SUCCESS',
|
||||||
'status_description' => 'Inserted serial numbers are: '.implode(', ', $insertedSerials),
|
'status_description' => 'Inserted serial numbers are: ' . implode(', ', $insertedSerials)
|
||||||
], 200);
|
], 200);
|
||||||
} else {
|
}
|
||||||
$missingSno = array_diff($existSnoCount, $insertedSnoCount);
|
else
|
||||||
|
{
|
||||||
|
$missingSno = array_diff($existSnoCount,$insertedSnoCount);
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Missed serial numbers are: '.implode(', ', $missingSno),
|
'status_description' => "Missed serial numbers are: " . implode(', ', $missingSno)
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
}
|
||||||
|
catch (\Exception $e)
|
||||||
|
{
|
||||||
// return response($e->getMessage(), 500)->header('Content-Type', 'text/plain');
|
// return response($e->getMessage(), 500)->header('Content-Type', 'text/plain');
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Store testing panel readings internal server error : '.$e?->getCode(),
|
'status_description' => 'Store testing panel readings internal server error : '.$e?->getCode()
|
||||||
], 500);
|
], 500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -344,15 +382,16 @@ class TestingPanelController extends Controller
|
|||||||
public function get_motor_master(Request $request)
|
public function get_motor_master(Request $request)
|
||||||
{
|
{
|
||||||
$expectedUser = env('API_AUTH_USER');
|
$expectedUser = env('API_AUTH_USER');
|
||||||
$expectedPw = env('API_AUTH_PW');
|
$expectedPw = env('API_AUTH_PW');
|
||||||
$header_auth = $request->header('Authorization');
|
$header_auth = $request->header('Authorization');
|
||||||
$expectedToken = $expectedUser.':'.$expectedPw;
|
$expectedToken = $expectedUser . ':' . $expectedPw;
|
||||||
|
|
||||||
// $data = $request->all();
|
//$data = $request->all();
|
||||||
if ('Bearer '.$expectedToken != $header_auth) {
|
if ("Bearer " . $expectedToken != $header_auth)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Invalid authorization token!',
|
'status_description' => 'Invalid authorization token!'
|
||||||
], 403);
|
], 403);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -360,46 +399,45 @@ class TestingPanelController extends Controller
|
|||||||
$itemCode = $request->header('item-code');
|
$itemCode = $request->header('item-code');
|
||||||
// $description = $item ? $item->description : '';
|
// $description = $item ? $item->description : '';
|
||||||
|
|
||||||
if ($plantCode == null || $plantCode == '') {
|
if ($plantCode == null || $plantCode == '')
|
||||||
|
{
|
||||||
// return response("ERROR: Plant Name can't be empty", 400)
|
// return response("ERROR: Plant Name can't be empty", 400)
|
||||||
// ->header('Content-Type', 'text/plain');
|
// ->header('Content-Type', 'text/plain');
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Plant code can't be empty!",
|
'status_description' => "Plant code can't be empty!"
|
||||||
], 400);
|
], 400);
|
||||||
} elseif (Str::length($plantCode) < 4 || ! is_numeric($plantCode) || ! preg_match('/^[1-9]\d{3,}$/', $plantCode)) {
|
}
|
||||||
|
else if (Str::length($plantCode) < 4 || !is_numeric($plantCode) || !preg_match('/^[1-9]\d{3,}$/', $plantCode))
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Invalid plant code found!',
|
'status_description' => "Invalid plant code found!"
|
||||||
], 400);
|
], 400);
|
||||||
} elseif ($itemCode == null || $itemCode == '' || ! $itemCode) {
|
}
|
||||||
|
else if($itemCode == null || $itemCode == '')
|
||||||
|
{
|
||||||
|
// return response("ERROR: OBD Number can't be empty", 400)
|
||||||
|
// ->header('Content-Type', 'text/plain');
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Item code can't be empty!",
|
'status_description' => "Item Code can't be empty!"
|
||||||
], 404);
|
], 400);
|
||||||
} elseif (Str::length($itemCode) < 6) {
|
}
|
||||||
|
else if(Str::length($itemCode) < 6 || !ctype_alnum($itemCode))
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Item code '{$itemCode}' should contain minimum 6 digits!",
|
'status_description' => "Invalid item code found!"
|
||||||
], 404);
|
], 400);
|
||||||
} elseif (! ctype_alnum($itemCode)) {
|
|
||||||
return response()->json([
|
|
||||||
'status_code' => 'ERROR',
|
|
||||||
'status_description' => "Item code '{$itemCode}' should contain only alpha-numeric values!",
|
|
||||||
], 404);
|
|
||||||
} elseif (! preg_match('/^[a-zA-Z1-9][a-zA-Z0-9]{5,}$/', $itemCode)) {
|
|
||||||
return response()->json([
|
|
||||||
'status_code' => 'ERROR',
|
|
||||||
'status_description' => "Item code '{$itemCode}' should not begin with '0'!",
|
|
||||||
], 404);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$plant = Plant::where('code', $plantCode)->first();
|
$plant = Plant::where('code', $plantCode)->first();
|
||||||
|
|
||||||
if (! $plant) {
|
if (!$plant) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Plant not found!',
|
'status_description' => "Plant not found!"
|
||||||
], 400);
|
], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -407,79 +445,72 @@ class TestingPanelController extends Controller
|
|||||||
|
|
||||||
$item = Item::where('code', $itemCode)->first();
|
$item = Item::where('code', $itemCode)->first();
|
||||||
|
|
||||||
if (! $item) {
|
if (!$item)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Item code not found in item table!',
|
'status_description' => "Item Code not found in item table!"
|
||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$item = Item::where('plant_id', $plantId)->where('code', $itemCode)->first();
|
$item = Item::where('plant_id', $plantId)->where('code', $itemCode)->first();
|
||||||
|
|
||||||
if (! $item) {
|
if (!$item)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => "Item code not found in item table for the plant : '$plant->name'!",
|
'status_description' => "Item Code not found in item table for the plant : '$plant->name'!"
|
||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$itemId = $item->id;
|
// Get description or empty string if not found
|
||||||
|
|
||||||
$description = $item ? $item->description : '';
|
$description = $item ? $item->description : '';
|
||||||
|
|
||||||
$category = $item ? $item->category : '';
|
$category = $item ? $item->category : '';
|
||||||
|
|
||||||
$motorTestingMaster = MotorTestingMaster::where('item_id', $itemId)->first();
|
$motorTestingMaster = MotorTestingMaster::where('plant_id', $plantId)->where('item_id', $item->id)->first();
|
||||||
|
|
||||||
if (! $motorTestingMaster) {
|
if (!$motorTestingMaster)
|
||||||
|
{
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'status_code' => 'ERROR',
|
'status_code' => 'ERROR',
|
||||||
'status_description' => 'Item code not found in motor testing master table!',
|
'status_description' => "Item Code not found in motor testing master table for the plant : '$plant->name'!"
|
||||||
], 404);
|
|
||||||
}
|
|
||||||
|
|
||||||
$motorTestingMaster = MotorTestingMaster::where('plant_id', $plantId)->where('item_id', $itemId)->first();
|
|
||||||
|
|
||||||
if (! $motorTestingMaster) {
|
|
||||||
return response()->json([
|
|
||||||
'status_code' => 'ERROR',
|
|
||||||
'status_description' => "Item code not found in motor testing master table for the plant : '$plant->name'!",
|
|
||||||
], 404);
|
], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$output = [
|
$output = [
|
||||||
'mot_subassembly_code' => $motorTestingMaster->subassembly_code ?? '',
|
"mot_subassembly_code" => $motorTestingMaster->subassembly_code ?? "",
|
||||||
'mot_model_name' => ($itemCode == '123456') ? 'SAMPLE TYPE' : $description,
|
"mot_model_name" => $description,
|
||||||
'mot_non_isi_model' => $motorTestingMaster->isi_model ? '0' : '1',
|
"mot_non_isi_model" => $motorTestingMaster->isi_model ? "0" :"1",
|
||||||
'mot_phase' => $motorTestingMaster->phase ?? '',
|
"mot_phase" => $motorTestingMaster->phase ?? "",
|
||||||
'mot_hp' => $motorTestingMaster->hp ?? '',
|
"mot_hp" => $motorTestingMaster->hp ?? "",
|
||||||
'mot_kw' => $motorTestingMaster->kw ?? '',
|
"mot_kw" => $motorTestingMaster->kw ?? "",
|
||||||
'mot_volt' => $motorTestingMaster->volt ?? '',
|
"mot_volt" => $motorTestingMaster->volt ?? "",
|
||||||
'mot_cur' => $motorTestingMaster->current ?? '',
|
"mot_cur" => $motorTestingMaster->current ?? "",
|
||||||
'mot_rpm' => $motorTestingMaster->rpm ?? '',
|
"mot_rpm" => $motorTestingMaster->rpm ?? "",
|
||||||
'mot_rate_torque_kg' => $motorTestingMaster->torque ?? '',
|
"mot_rate_torque_kg" => $motorTestingMaster->torque ?? "",
|
||||||
'mot_freq' => $motorTestingMaster->frequency ?? '',
|
"mot_freq" => $motorTestingMaster->frequency ?? "",
|
||||||
'mot_conn' => $motorTestingMaster->connection ?? '',
|
"mot_conn" => $motorTestingMaster->connection ?? "",
|
||||||
'mot_ins_res_limit' => $motorTestingMaster->ins_res_limit ?? '',
|
"mot_ins_res_limit" => $motorTestingMaster->ins_res_limit ?? "",
|
||||||
'mot_ins_res_type' => $motorTestingMaster->ins_res_type ?? '',
|
"mot_ins_res_type" => $motorTestingMaster->ins_res_type ?? "",
|
||||||
'mot_category' => $category,
|
"mot_category" => $category,
|
||||||
'mot_routine_test_time' => $motorTestingMaster->routine_test_time ?? '',
|
"mot_routine_test_time" => $motorTestingMaster->routine_test_time ?? "",
|
||||||
'mot_res_ry_ll' => $motorTestingMaster->res_ry_ll ?? '',
|
"mot_res_ry_ll" => $motorTestingMaster->res_ry_ll ?? "",
|
||||||
'mot_res_ry_ul' => $motorTestingMaster->res_ry_ul ?? '',
|
"mot_res_ry_ul" => $motorTestingMaster->res_ry_ul ?? "",
|
||||||
'mot_res_yb_ll' => $motorTestingMaster->res_yb_ll ?? '',
|
"mot_res_yb_ll" => $motorTestingMaster->res_yb_ll ?? "",
|
||||||
'mot_res_yb_ul' => $motorTestingMaster->res_yb_ul ?? '',
|
"mot_res_yb_ul" => $motorTestingMaster->res_yb_ul ?? "",
|
||||||
'mot_res_br_ll' => $motorTestingMaster->res_br_ll ?? '',
|
"mot_res_br_ll" => $motorTestingMaster->res_br_ll ?? "",
|
||||||
'mot_res_br_ul' => $motorTestingMaster->res_br_ul ?? '',
|
"mot_res_br_ul" => $motorTestingMaster->res_br_ul ?? "",
|
||||||
'mot_lock_volt_limit' => $motorTestingMaster->lock_volt_limit ?? '',
|
"mot_lock_volt_limit" => $motorTestingMaster->lock_volt_limit ?? "",
|
||||||
'mot_leak_cur_limit' => $motorTestingMaster->leak_cur_limit ?? '',
|
"mot_leak_cur_limit" => $motorTestingMaster->leak_cur_limit ?? "",
|
||||||
'mot_lock_cur_ll' => $motorTestingMaster->lock_cur_ll ?? '',
|
"mot_lock_cur_ll" => $motorTestingMaster->lock_cur_ll ?? "",
|
||||||
'mot_lock_cur_ul' => $motorTestingMaster->lock_cur_ul ?? '',
|
"mot_lock_cur_ul" => $motorTestingMaster->lock_cur_ul ?? "",
|
||||||
'mot_noload_cur_ll' => $motorTestingMaster->noload_cur_ll ?? '',
|
"mot_noload_cur_ll" => $motorTestingMaster->noload_cur_ll ?? "",
|
||||||
'mot_noload_cur_ul' => $motorTestingMaster->noload_cur_ul ?? '',
|
"mot_noload_cur_ul" => $motorTestingMaster->noload_cur_ul ?? "",
|
||||||
'mot_noload_pow_ll' => $motorTestingMaster->noload_pow_ll ?? '',
|
"mot_noload_pow_ll" => $motorTestingMaster->noload_pow_ll ?? "",
|
||||||
'mot_noload_pow_ul' => $motorTestingMaster->noload_pow_ul ?? '',
|
"mot_noload_pow_ul" => $motorTestingMaster->noload_pow_ul ?? "",
|
||||||
'mot_noload_spd_ll' => $motorTestingMaster->noload_spd_ll ?? '',
|
"mot_noload_spd_ll" => $motorTestingMaster->noload_spd_ll ?? "",
|
||||||
'mot_noload_spd_ul' => $motorTestingMaster->noload_spd_ul ?? '',
|
"mot_noload_spd_ul" => $motorTestingMaster->noload_spd_ul ?? ""
|
||||||
];
|
];
|
||||||
|
|
||||||
return response()->json($output, 200);
|
return response()->json($output, 200);
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class UserController extends Controller
|
|||||||
* Display the specified resource.
|
* Display the specified resource.
|
||||||
*/
|
*/
|
||||||
// show(string $id)
|
// show(string $id)
|
||||||
public function get_user_data(Request $request)
|
public function get_testing_data(Request $request)
|
||||||
{
|
{
|
||||||
$expectedUser = env('API_AUTH_USER');
|
$expectedUser = env('API_AUTH_USER');
|
||||||
$expectedPw = env('API_AUTH_PW');
|
$expectedPw = env('API_AUTH_PW');
|
||||||
|
|||||||
@@ -64,11 +64,6 @@ class Item extends Model
|
|||||||
return $this->hasMany(CharacteristicValue::class);
|
return $this->hasMany(CharacteristicValue::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ClassCharacteristics()
|
|
||||||
{
|
|
||||||
return $this->hasMany(ClassCharacteristic::class, 'item_id', 'id');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function weightValidations()
|
public function weightValidations()
|
||||||
{
|
{
|
||||||
return $this->hasMany(WeightValidation::class);
|
return $this->hasMany(WeightValidation::class);
|
||||||
|
|||||||
@@ -43,11 +43,6 @@ class Machine extends Model
|
|||||||
return $this->hasMany(CharacteristicValue::class);
|
return $this->hasMany(CharacteristicValue::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ClassCharacteristics()
|
|
||||||
{
|
|
||||||
return $this->hasMany(ClassCharacteristic::class, 'machine_id', 'id');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testingPanelReadings()
|
public function testingPanelReadings()
|
||||||
{
|
{
|
||||||
return $this->hasMany(TestingPanelReading::class);
|
return $this->hasMany(TestingPanelReading::class);
|
||||||
|
|||||||
@@ -113,11 +113,6 @@ class Plant extends Model
|
|||||||
return $this->hasMany(EquipmentMaster::class, 'plant_id', 'id');
|
return $this->hasMany(EquipmentMaster::class, 'plant_id', 'id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ClassCharacteristics()
|
|
||||||
{
|
|
||||||
return $this->hasMany(ClassCharacteristic::class, 'plant_id', 'id');
|
|
||||||
}
|
|
||||||
|
|
||||||
// public function rejectReasons()
|
// public function rejectReasons()
|
||||||
// {
|
// {
|
||||||
// return $this->hasMany(RejectReason::class, 'plant_id', 'id');
|
// return $this->hasMany(RejectReason::class, 'plant_id', 'id');
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ class ProcessOrder extends Model
|
|||||||
'coil_number',
|
'coil_number',
|
||||||
'order_quantity',
|
'order_quantity',
|
||||||
'received_quantity',
|
'received_quantity',
|
||||||
'updated_order_quantity',
|
|
||||||
'sfg_number',
|
'sfg_number',
|
||||||
'machine_name',
|
'machine_name',
|
||||||
'scrap_quantity',
|
'scrap_quantity',
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ return new class extends Migration
|
|||||||
zmm_type TEXT DEFAULT NULL,
|
zmm_type TEXT DEFAULT NULL,
|
||||||
zmm_usp TEXT DEFAULT NULL,
|
zmm_usp TEXT DEFAULT NULL,
|
||||||
mark_status TEXT DEFAULT NULL,
|
mark_status TEXT DEFAULT NULL,
|
||||||
marked_datetime TIMESTAMP NOT NULL DEFAULT NOW(),
|
marked_datetime TIMESTAMP DEFAULT NULL,
|
||||||
marked_physical_count TEXT DEFAULT '0',
|
marked_physical_count TEXT DEFAULT '0',
|
||||||
marked_expected_time TEXT DEFAULT '0',
|
marked_expected_time TEXT DEFAULT '0',
|
||||||
marked_by TEXT DEFAULT NULL,
|
marked_by TEXT DEFAULT NULL,
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
|
|
||||||
return new class extends Migration
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the migrations.
|
|
||||||
*/
|
|
||||||
public function up(): void
|
|
||||||
{
|
|
||||||
$sql1 = <<<'SQL'
|
|
||||||
ALTER TABLE process_orders
|
|
||||||
ADD COLUMN updated_order_quantity NUMERIC(10,3) NULL
|
|
||||||
SQL;
|
|
||||||
|
|
||||||
DB::statement($sql1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reverse the migrations.
|
|
||||||
*/
|
|
||||||
public function down(): void
|
|
||||||
{
|
|
||||||
// Schema::table('process_orders', function (Blueprint $table) {
|
|
||||||
// //
|
|
||||||
// });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
<x-filament-panels::page>
|
|
||||||
|
|
||||||
<!-- HEADER -->
|
|
||||||
<div class="mb-8">
|
|
||||||
<h1 class="text-4xl font-bold tracking-tight">
|
|
||||||
CRI Digital Manufacturing IIoT Platform
|
|
||||||
</h1>
|
|
||||||
<p class="text-lg text-gray-600 mt-2">
|
|
||||||
Complete visibility, traceability, and control across your manufacturing operations.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- BANNER -->
|
|
||||||
{{-- <div class="w-full overflow-hidden rounded-2xl shadow mb-10"> --}}
|
|
||||||
<div class="w-full overflow-hidden rounded-xl shadow">
|
|
||||||
<img
|
|
||||||
src="{{ asset('images/iiot-banner.jpg') }}"
|
|
||||||
alt="CRI Digital Manufacturing IIoT"
|
|
||||||
class="w-full h-72 object-cover"
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- INTRO -->
|
|
||||||
<div class="max-w-4xl mb-10">
|
|
||||||
<p class="text-lg text-gray-700 mb-4">
|
|
||||||
CRI Digital Manufacturing IIoT is built to deliver
|
|
||||||
<strong>end-to-end traceability, real-time insights, and operational transparency</strong>
|
|
||||||
across plants, lines, and production processes.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p class="text-lg text-gray-700">
|
|
||||||
The platform ensures <strong>right quality and on-time delivery</strong> by enabling
|
|
||||||
complete tracking of materials, production orders, and finished goods—helping teams
|
|
||||||
make faster, data-driven decisions with confidence.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- KEY PILLARS -->
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-4 gap-6 mb-10">
|
|
||||||
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
|
||||||
<h3 class="text-lg font-semibold mb-2">🔍 Traceability</h3>
|
|
||||||
<p class="text-gray-600">
|
|
||||||
Track materials, batches, and serials from input to dispatch.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
|
||||||
<h3 class="text-lg font-semibold mb-2">✅ Quality Assurance</h3>
|
|
||||||
<p class="text-gray-600">
|
|
||||||
Validate process data and ensure first-time-right production.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
|
||||||
<h3 class="text-lg font-semibold mb-2">⏱ On-Time Delivery</h3>
|
|
||||||
<p class="text-gray-600">
|
|
||||||
Identify delays early and meet production commitments.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
|
||||||
<h3 class="text-lg font-semibold mb-2">📊 Real-Time Insights</h3>
|
|
||||||
<p class="text-gray-600">
|
|
||||||
Monitor performance and take quick corrective actions.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- SUPPORT -->
|
|
||||||
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
|
||||||
<h2 class="text-2xl font-semibold mb-3">24×7 Support</h2>
|
|
||||||
<p class="text-gray-700 mb-2">
|
|
||||||
Our dedicated IIoT support team is available round-the-clock to ensure
|
|
||||||
uninterrupted operations and quick issue resolution.
|
|
||||||
</p>
|
|
||||||
<p class="text-lg font-medium text-gray-900">
|
|
||||||
📞 Support Landline: <span class="font-semibold">0422 711 7179</span>
|
|
||||||
</p>
|
|
||||||
{{-- <p class="text-lg font-medium text-gray-900">
|
|
||||||
📞 Technical Support Contact: <span class="font-semibold">9952468104 / 9100832269</span>
|
|
||||||
</p> --}}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
|
|
||||||
<h2 class="text-2xl font-semibold mb-4">24×7 Support</h2>
|
|
||||||
|
|
||||||
<p class="text-lg text-gray-700 mb-4">
|
|
||||||
Our support structure is designed to ensure quick resolution based on the type
|
|
||||||
of issue — whether it is on-site, application-related, or infrastructure-related.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div class="space-y-3">
|
|
||||||
|
|
||||||
<p class="text-lg font-medium text-gray-900">
|
|
||||||
🏭 <strong>Plant & On-Site Support</strong> <br>
|
|
||||||
<span class="text-gray-700">
|
|
||||||
For plant visits, industry-level issues, and on-ground validation
|
|
||||||
</span><br>
|
|
||||||
📞 <span class="font-semibold">8925899458 / 8925899459</span>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p class="text-lg font-medium text-gray-900">
|
|
||||||
💻 <strong>Application & Logic Support</strong> <br>
|
|
||||||
<span class="text-gray-700">
|
|
||||||
For website errors, logic issues, and application-level problems
|
|
||||||
</span><br>
|
|
||||||
📞 <span class="font-semibold">9952468104 / 9100832269</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div> --}}
|
|
||||||
|
|
||||||
|
|
||||||
<!-- TEAM -->
|
|
||||||
{{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
|
|
||||||
<h2 class="text-2xl font-semibold mb-4">IIOT Team Members</h2>
|
|
||||||
<div class="grid grid-cols-2 md:grid-cols-3 gap-4 text-gray-700">
|
|
||||||
<div class="flex items-center gap-2">👤 Jothikumar</div>
|
|
||||||
<div class="flex items-center gap-2">👤 Jeithef Shibu</div>
|
|
||||||
<div class="flex items-center gap-2">👤 Dhanabalan</div>
|
|
||||||
<div class="flex items-center gap-2">👤 Ranjith</div>
|
|
||||||
<div class="flex items-center gap-2">👤 Srimathy</div>
|
|
||||||
<div class="flex items-center gap-2">👤 Gokul</div>
|
|
||||||
</div>
|
|
||||||
</div> --}}
|
|
||||||
|
|
||||||
</x-filament-panels::page>
|
|
||||||
@@ -1,13 +1,126 @@
|
|||||||
<x-filament-panels::page>
|
<x-filament-panels::page>
|
||||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2 sm:gap-4 md:gap-4 p-2 md:p-4 items-start">
|
|
||||||
{{-- Filters form --}}
|
<!-- HEADER -->
|
||||||
<div class="space-y-4 w-full max-w-full col-span-1">
|
<div class="mb-8">
|
||||||
{{ $this->filtersForm($this->form) }}
|
<h1 class="text-4xl font-bold tracking-tight">
|
||||||
|
CRI Digital Manufacturing IIoT Platform
|
||||||
|
</h1>
|
||||||
|
<p class="text-lg text-gray-600 mt-2">
|
||||||
|
Complete visibility, traceability, and control across your manufacturing operations.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- BANNER -->
|
||||||
|
{{-- <div class="w-full overflow-hidden rounded-2xl shadow mb-10"> --}}
|
||||||
|
<div class="w-full overflow-hidden rounded-xl shadow">
|
||||||
|
<img
|
||||||
|
src="{{ asset('images/iiot-banner.jpg') }}"
|
||||||
|
alt="CRI Digital Manufacturing IIoT"
|
||||||
|
class="w-full h-72 object-cover"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- INTRO -->
|
||||||
|
<div class="max-w-4xl mb-10">
|
||||||
|
<p class="text-lg text-gray-700 mb-4">
|
||||||
|
CRI Digital Manufacturing IIoT is built to deliver
|
||||||
|
<strong>end-to-end traceability, real-time insights, and operational transparency</strong>
|
||||||
|
across plants, lines, and production processes.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p class="text-lg text-gray-700">
|
||||||
|
The platform ensures <strong>right quality and on-time delivery</strong> by enabling
|
||||||
|
complete tracking of materials, production orders, and finished goods—helping teams
|
||||||
|
make faster, data-driven decisions with confidence.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- KEY PILLARS -->
|
||||||
|
<div class="grid grid-cols-1 md:grid-cols-4 gap-6 mb-10">
|
||||||
|
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
||||||
|
<h3 class="text-lg font-semibold mb-2">🔍 Traceability</h3>
|
||||||
|
<p class="text-gray-600">
|
||||||
|
Track materials, batches, and serials from input to dispatch.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{-- Stat widget --}}
|
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
||||||
<div class="w-full max-w-full col-span-1 sm:col-span-1 lg:col-span-2">
|
<h3 class="text-lg font-semibold mb-2">✅ Quality Assurance</h3>
|
||||||
@livewire(\App\Filament\Widgets\CumulativeChart::class)
|
<p class="text-gray-600">
|
||||||
|
Validate process data and ensure first-time-right production.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
||||||
|
<h3 class="text-lg font-semibold mb-2">⏱ On-Time Delivery</h3>
|
||||||
|
<p class="text-gray-600">
|
||||||
|
Identify delays early and meet production commitments.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
||||||
|
<h3 class="text-lg font-semibold mb-2">📊 Real-Time Insights</h3>
|
||||||
|
<p class="text-gray-600">
|
||||||
|
Monitor performance and take quick corrective actions.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- SUPPORT -->
|
||||||
|
<div class="bg-white rounded-xl border p-6 shadow-sm">
|
||||||
|
<h2 class="text-2xl font-semibold mb-3">24×7 Support</h2>
|
||||||
|
<p class="text-gray-700 mb-2">
|
||||||
|
Our dedicated IIoT support team is available round-the-clock to ensure
|
||||||
|
uninterrupted operations and quick issue resolution.
|
||||||
|
</p>
|
||||||
|
<p class="text-lg font-medium text-gray-900">
|
||||||
|
📞 Support Landline: <span class="font-semibold">0422 711 7179</span>
|
||||||
|
</p>
|
||||||
|
{{-- <p class="text-lg font-medium text-gray-900">
|
||||||
|
📞 Technical Support Contact: <span class="font-semibold">9952468104 / 9100832269</span>
|
||||||
|
</p> --}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
|
||||||
|
<h2 class="text-2xl font-semibold mb-4">24×7 Support</h2>
|
||||||
|
|
||||||
|
<p class="text-lg text-gray-700 mb-4">
|
||||||
|
Our support structure is designed to ensure quick resolution based on the type
|
||||||
|
of issue — whether it is on-site, application-related, or infrastructure-related.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="space-y-3">
|
||||||
|
|
||||||
|
<p class="text-lg font-medium text-gray-900">
|
||||||
|
🏭 <strong>Plant & On-Site Support</strong> <br>
|
||||||
|
<span class="text-gray-700">
|
||||||
|
For plant visits, industry-level issues, and on-ground validation
|
||||||
|
</span><br>
|
||||||
|
📞 <span class="font-semibold">8925899458 / 8925899459</span>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p class="text-lg font-medium text-gray-900">
|
||||||
|
💻 <strong>Application & Logic Support</strong> <br>
|
||||||
|
<span class="text-gray-700">
|
||||||
|
For website errors, logic issues, and application-level problems
|
||||||
|
</span><br>
|
||||||
|
📞 <span class="font-semibold">9952468104 / 9100832269</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div> --}}
|
||||||
|
|
||||||
|
|
||||||
|
<!-- TEAM -->
|
||||||
|
{{-- <div class="bg-white rounded-xl border p-6 shadow-sm">
|
||||||
|
<h2 class="text-2xl font-semibold mb-4">IIOT Team Members</h2>
|
||||||
|
<div class="grid grid-cols-2 md:grid-cols-3 gap-4 text-gray-700">
|
||||||
|
<div class="flex items-center gap-2">👤 Jothikumar</div>
|
||||||
|
<div class="flex items-center gap-2">👤 Jeithef Shibu</div>
|
||||||
|
<div class="flex items-center gap-2">👤 Dhanabalan</div>
|
||||||
|
<div class="flex items-center gap-2">👤 Ranjith</div>
|
||||||
|
<div class="flex items-center gap-2">👤 Srimathy</div>
|
||||||
|
<div class="flex items-center gap-2">👤 Gokul</div>
|
||||||
|
</div>
|
||||||
|
</div> --}}
|
||||||
|
|
||||||
</x-filament-panels::page>
|
</x-filament-panels::page>
|
||||||
|
|||||||
@@ -136,13 +136,9 @@ Route::post('serial-invoice/store-data', [InvoiceValidationController::class, 's
|
|||||||
|
|
||||||
Route::post('material-invoice/store-data', [InvoiceValidationController::class, 'materialInvoice']);
|
Route::post('material-invoice/store-data', [InvoiceValidationController::class, 'materialInvoice']);
|
||||||
|
|
||||||
// User Controller
|
|
||||||
|
|
||||||
Route::get('user/get-data', [UserController::class, 'get_user_data']);
|
|
||||||
|
|
||||||
// Testing panel Controller
|
// Testing panel Controller
|
||||||
|
|
||||||
Route::get('testing/user/get-data', [UserController::class, 'get_user_data']);
|
Route::get('testing/user/get-data', [UserController::class, 'get_testing_data']);
|
||||||
|
|
||||||
Route::get('testing/item/get-master-data', [TestingPanelController::class, 'get_motor_master']);
|
Route::get('testing/item/get-master-data', [TestingPanelController::class, 'get_motor_master']);
|
||||||
|
|
||||||
@@ -174,7 +170,7 @@ Route::get('laser/characteristics/check', [CharacteristicsController::class, 'ch
|
|||||||
|
|
||||||
Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
|
Route::post('laser/characteristics/data', [CharacteristicsController::class, 'storeClassChar']);
|
||||||
|
|
||||||
// ..Marked serial (auto or manual)
|
// ..serial (auto or manual)
|
||||||
|
|
||||||
Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
|
Route::post('laser/characteristics/status', [CharacteristicsController::class, 'storeLaserStatus']);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user