diff --git a/app/Mail/InvalidQualityMail.php b/app/Mail/InvalidQualityMail.php
index 947ff06..5a32b38 100644
--- a/app/Mail/InvalidQualityMail.php
+++ b/app/Mail/InvalidQualityMail.php
@@ -28,10 +28,12 @@ class InvalidQualityMail extends Mailable
     public $greeting;
     public $subjectLine;
 
+    public $mExpectedValue;
+
     public $mLinePart;
 
     public $itemCode;
-    public function __construct($parNo, $mProdOrder, $mplantName, $mLinePart, $mUserName, $mailType = 'InvalidPartNumber')
+    public function __construct($parNo, $mProdOrder, $mplantName, $mLinePart, $mUserName, $mExpectedValue, $mailType = 'InvalidPartNumber')
     {
         $this->mPartNo = $parNo;
         $this->mProdOrder = $mProdOrder;
@@ -39,6 +41,7 @@ class InvalidQualityMail extends Mailable
         $this->mLinePart = $mLinePart;
         $this->mUserName = $mUserName;
         $this->mailType = $mailType;
+        $this->mExpectedValue = $mExpectedValue;
     }
 
     public function envelope(): Envelope
@@ -57,6 +60,12 @@ class InvalidQualityMail extends Mailable
             case 'InvalidPartNumber5':
                 $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
                 break;
+            case 'FinalInspectionNotOk':
+                $this->subjectLine = "Quality Part Validation Inspection Status ({$this->mplantName})";
+                break;
+            case 'InvalidTubeStickerPump':
+                $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
+                break;
             case 'InvalidPartNumber':
             default:
                 $this->subjectLine = "Quality Part Validation ({$this->mplantName})";
@@ -80,6 +89,7 @@ class InvalidQualityMail extends Mailable
                     <b>Line Name:</b> {$this->mLinePart}<br>
                     <b>Production Order:</b> {$this->mProdOrder}<br>
                     <b>Scanned Part Number 2:</b> {$this->mPartNo}<br>
+                    <b>Expected Scanned Part Number 2:</b> {$this->mExpectedValue}<br>
                     <b>Employee Code:</b> {$this->mUserName}<br>
                 ";
                 break;
@@ -91,6 +101,7 @@ class InvalidQualityMail extends Mailable
                     <b>Line Name:</b> {$this->mLinePart}<br>
                     <b>Production Order:</b> {$this->mProdOrder}<br>
                     <b>Scanned Part Number 3:</b> {$this->mPartNo}<br>
+                    <b>Expected Scanned Part Number 2:</b> {$this->mExpectedValue}<br>
                     <b>Employee Code:</b> {$this->mUserName}<br>
                 ";
                 break;
@@ -102,6 +113,7 @@ class InvalidQualityMail extends Mailable
                     <b>Line Name:</b> {$this->mLinePart}<br>
                     <b>Production Order:</b> {$this->mProdOrder}<br>
                     <b>Scanned Part Number 4:</b> {$this->mPartNo}<br>
+                    <b>Expected Scanned Part Number 2:</b> {$this->mExpectedValue}<br>
                     <b>Employee Code:</b> {$this->mUserName}<br>
                 ";
                 break;
@@ -113,6 +125,52 @@ class InvalidQualityMail extends Mailable
                     <b>Line Name:</b> {$this->mLinePart}<br>
                     <b>Production Order:</b> {$this->mProdOrder}<br>
                     <b>Scanned Part Number 5:</b> {$this->mPartNo}<br>
+                    <b>Expected Scanned Part Number 2:</b> {$this->mExpectedValue}<br>
+                    <b>Employee Code:</b> {$this->mUserName}<br>
+                ";
+                break;
+            case 'FinalInspectionNotOk':
+                $this->greeting = "
+                    Dear Sir/Madam,<br><br>
+                    Please note that the final inspection is not ok for scanned serial number.<br>
+                    <b>Plant:</b> {$this->mplantName}<br>
+                    <b>Line Name:</b> {$this->mLinePart}<br>
+                    <b>Production Order:</b> {$this->mProdOrder}<br>
+                    <b>Serial Number:</b> {$this->mPartNo}<br>
+                    <b>Final Inspection :</b>Not OK<br>
+                    <b>Employee Code:</b> {$this->mUserName}<br>
+                ";
+                break;
+            case 'InvalidTubeStickerPump':
+                $this->greeting = "
+                    Dear Sir/Madam,<br><br>
+                    Please note that the scanned tube sticker pump serial number appears to be incorrect.<br>
+                    <b>Plant:</b> {$this->mplantName}<br>
+                    <b>Line Name:</b> {$this->mLinePart}<br>
+                    <b>Production Order:</b> {$this->mProdOrder}<br>
+                    <b>Scanned Tube Pump QR:</b> {$this->mPartNo}<br>
+                    <b>Employee Code:</b> {$this->mUserName}<br>
+                ";
+                break;
+            case 'InvalidTubeStickerMotor':
+                $this->greeting = "
+                    Dear Sir/Madam,<br><br>
+                    Please note that the scanned tube sticker motor serial number appears to be incorrect.<br>
+                    <b>Plant:</b> {$this->mplantName}<br>
+                    <b>Line Name:</b> {$this->mLinePart}<br>
+                    <b>Production Order:</b> {$this->mProdOrder}<br>
+                    <b>Scanned Tube Motor QR:</b> {$this->mPartNo}<br>
+                    <b>Employee Code:</b> {$this->mUserName}<br>
+                ";
+                break;
+            case 'InvalidTubeStickerPumpset':
+                $this->greeting = "
+                    Dear Sir/Madam,<br><br>
+                    Please note that the scanned tube sticker pumpset serial number appears to be incorrect.<br>
+                    <b>Plant:</b> {$this->mplantName}<br>
+                    <b>Line Name:</b> {$this->mLinePart}<br>
+                    <b>Production Order:</b> {$this->mProdOrder}<br>
+                    <b>Scanned Tube Pumpset QR:</b> {$this->mPartNo}<br>
                     <b>Employee Code:</b> {$this->mUserName}<br>
                 ";
                 break;
@@ -125,6 +183,7 @@ class InvalidQualityMail extends Mailable
                     <b>Line Name:</b> {$this->mLinePart}<br>
                     <b>Production Order:</b> {$this->mProdOrder}<br>
                     <b>Scanned Part Number 1:</b> {$this->mPartNo}<br>
+                    <b>Expected Scanned Part Number 1:</b> {$this->mExpectedValue}<br>
                     <b>Employee Code:</b> {$this->mUserName}<br>
                 ";
                 break;