diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs
index e5d1dd0..eaab64e 100644
--- a/SubProject/FPJ0000/Project/fProjectData.cs
+++ b/SubProject/FPJ0000/Project/fProjectData.cs
@@ -107,21 +107,19 @@ namespace FPJ0000
             catch (System.Exception ex)
             {
                 rtBack.Text = rtDesc.Text = rtAft.Text = rtBef.Text = "";
-
-                System.Windows.Forms.MessageBox.Show(ex.Message);
+                AR.UTIL.MsgE(ex.Message);
+                //System.Windows.Forms.MessageBox.Show(ex.Message);
             }
             this.cmbReqProcess.Text = dr.process;
             this.cmbState.Text = dr.status;
             this.cmbReqTeam.Text = dr.part;
-            //this.cmbCate.Text = dr.category;
             this.tbDue.Text = dr.crdue;
 
             this.cmbReqSite.Text = dr.ReqSite;
             this.cmbReqPlant.Text = dr.ReqPlant;
             this.cmbReqPackage.Text = dr.ReqPackage;
             this.cmbReqLine.Text = dr.ReqLine;
-            //this.tbSFI.Text = dr.sfi.ToString();
-
+            
             rtAft.Text = string.Empty;
             rtBef.Text = string.Empty;
             rtDesc.Text = string.Empty;
diff --git a/SubProject/FPJ0000/dsJobReport.Designer.cs b/SubProject/FPJ0000/dsJobReport.Designer.cs
index 930b5a1..95b192d 100644
--- a/SubProject/FPJ0000/dsJobReport.Designer.cs
+++ b/SubProject/FPJ0000/dsJobReport.Designer.cs
@@ -3502,7 +3502,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2
             this._commandCollection[1].Connection = this.Connection;
             this._commandCollection[1].CommandText = "SELECT  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2" +
                 "\r\nFROM     Common WITH (nolock)\r\nWHERE  (gcode = @gcode) AND (grp = @grp) AND (I" +
-                "SNULL(svalue2, \'\') = @jobtype)\r\nORDER BY code";
+                "SNULL(svalue2, \'N/A\') = @jobtype)\r\nORDER BY code";
             this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
diff --git a/SubProject/FPJ0000/dsJobReport.xsd b/SubProject/FPJ0000/dsJobReport.xsd
index 5559fff..1ac8f2f 100644
--- a/SubProject/FPJ0000/dsJobReport.xsd
+++ b/SubProject/FPJ0000/dsJobReport.xsd
@@ -224,7 +224,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2
 FROM     Common WITH (nolock)
-WHERE  (gcode = @gcode) AND (grp = @grp) AND (ISNULL(svalue2, '') = @jobtype)
+WHERE  (gcode = @gcode) AND (grp = @grp) AND (ISNULL(svalue2, 'N/A') = @jobtype)
 ORDER BY code</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Common" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
diff --git a/SubProject/FPJ0000/dsJobReport.xss b/SubProject/FPJ0000/dsJobReport.xss
index fac0576..7d86925 100644
--- a/SubProject/FPJ0000/dsJobReport.xss
+++ b/SubProject/FPJ0000/dsJobReport.xss
@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="45" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:HolidayDateList" ZOrder="3" X="39" Y="135" Height="96" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
     <Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="13" Y="321" Height="343" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />