diff --git a/frm_Freq_Reg.vb b/frm_Freq_Reg.vb
index fdbc5eb..3f65a90 100644
--- a/frm_Freq_Reg.vb
+++ b/frm_Freq_Reg.vb
@@ -4292,7 +4292,7 @@ SuccessExit:
         End If
 
         If TDUseCompare = True Then
-            DBCmd = "SELECT TestStep,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Frequency,Ct_Power,Ct_Max_ShotCnt,Ct_Motor_Lv, PV_SN,P1_Date,P1_Time,P3_DateTime,Manufacture_Date  FROM " & cartridge_table & " WHERE Product_SN = '" & prd_code & "'"
+            DBCmd = "SELECT TestStep,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,Ct_Frequency,Ct_Power,Ct_Max_ShotCnt,Ct_Motor_Lv, PV_SN,P1_Date,P1_Time,P3_DateTime,IFNULL(Manufacture_Date,'') as Manufacture_Date  FROM " & cartridge_table & " WHERE Product_SN = '" & prd_code & "'"
             If DBQueryReader(DBCmd) Then
                 For i = 0 To check_list.max_check - 1
                     check_data(i) = sqlDataQuery(i).ToString
@@ -4317,6 +4317,7 @@ SuccessExit:
                 'error_switch = True
             Else
                 txb_5_date.Text = check_data(check_list.Manufacture_Date)
+                txb_5_date.BackColor = Color.Green
             End If
 
             If check_data(check_list.make_name) = Nothing Or check_data(check_list.make_name) = "0" Then
@@ -4435,7 +4436,7 @@ SuccessExit:
                 txb_5_barcode.BackColor = Color.Green
             End If
         Else
-            DBCmd = "SELECT TestStep,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,PV_SN, Manufacture_Date FROM " & MainNonTDDB & " WHERE Product_SN = '" & prd_code & "'"
+            DBCmd = "SELECT TestStep,Ct_Manufacture_Name,Ct_SN,Ct_Model,Ct_Type,Ct_Abroad,Ct_Agency,PV_SN,IFNULL(Manufacture_Date,'') as Manufacture_Date FROM " & MainNonTDDB & " WHERE Product_SN = '" & prd_code & "'"
             If DBQueryReader(DBCmd) Then
                 For i = 0 To check_list.power - 1
                     check_data(i) = sqlDataQuery(i).ToString
@@ -4469,6 +4470,7 @@ SuccessExit:
                 'error_switch = True
             Else
                 txb_5_date.Text = check_data(check_list.Manufacture_Date)
+                txb_5_date.BackColor = Color.Green
             End If
 
             If check_data(check_list.serial) = Nothing Or check_data(check_list.serial) = "0" Then