diff --git a/HRM.DA/Service/Attendance/AttnRawDataService.cs b/HRM.DA/Service/Attendance/AttnRawDataService.cs
index be6e444..2ce4ec1 100644
--- a/HRM.DA/Service/Attendance/AttnRawDataService.cs
+++ b/HRM.DA/Service/Attendance/AttnRawDataService.cs
@@ -395,14 +395,14 @@ namespace HRM.DA
                     DataTable _dtRawData = null;
                     _dtRawData = new DataTable("AttnRawData");
                    // _dtRawData.Columns.Add("ATTNRAWDATAID", typeof(int));
-                    _dtRawData.Columns.Add("CARDID", typeof(int));
-                    _dtRawData.Columns.Add("EMPLOYEEID", typeof(int));
-                    _dtRawData.Columns.Add("CARDNO", typeof(string));
-                    _dtRawData.Columns.Add("PUNCHTIME", typeof(DateTime));
-                    _dtRawData.Columns.Add("ENTRYMODE", typeof(int));
-                    _dtRawData.Columns.Add("DEVICEIPADDRESS", typeof(string));
-                    _dtRawData.Columns.Add("DEVICENO", typeof(string));
-                    _dtRawData.Columns.Add("PUNCHDATE", typeof(DateTime));
+                    _dtRawData.Columns.Add("CardID", typeof(int));
+                    _dtRawData.Columns.Add("EmployeeID", typeof(int));
+                    _dtRawData.Columns.Add("CardNo", typeof(string));
+                    _dtRawData.Columns.Add("PunchTime", typeof(DateTime));
+                    _dtRawData.Columns.Add("EntryMode", typeof(int));
+                    _dtRawData.Columns.Add("DeviceIPAddress", typeof(string));
+                    _dtRawData.Columns.Add("DeviceNo", typeof(string));
+                    //_dtRawData.Columns.Add("PUNCHDATE", typeof(DateTime));
 
                     foreach (AttnRawData item in attnRawDatas)
                     {
@@ -422,8 +422,8 @@ namespace HRM.DA
                            item.PunchTime,
                            (int)item.EntryMode,
                            item.DeviceIPAddress,
-                           item.DeviceNo,
-                           item.PunchTime);
+                           item.DeviceNo
+                           );
                     }
 
                     using (SqlBulkCopy bulkCopy = new SqlBulkCopy((SqlConnection)tc.Connection,
@@ -433,14 +433,14 @@ namespace HRM.DA
                         bulkCopy.BatchSize = 5000;
 
                        // bulkCopy.ColumnMappings.Add("ATTNRAWDATAID", "ATTNRAWDATAID");
-                        bulkCopy.ColumnMappings.Add("CARDID", "CARDID");
-                        bulkCopy.ColumnMappings.Add("EMPLOYEEID", "EMPLOYEEID");
-                        bulkCopy.ColumnMappings.Add("CARDNO", "CARDNO");
-                        bulkCopy.ColumnMappings.Add("PUNCHTIME", "PUNCHTIME");
-                        bulkCopy.ColumnMappings.Add("ENTRYMODE", "ENTRYMODE");
-                        bulkCopy.ColumnMappings.Add("DEVICEIPADDRESS", "DEVICEIPADDRESS");
-                        bulkCopy.ColumnMappings.Add("DEVICENO", "DEVICENO");
-                        bulkCopy.ColumnMappings.Add("PUNCHDATE", "PUNCHDATE");
+                        bulkCopy.ColumnMappings.Add("CardID", "CardID");
+                        bulkCopy.ColumnMappings.Add("EmployeeID", "EmployeeID");
+                        bulkCopy.ColumnMappings.Add("CardNo", "CardNo");
+                        bulkCopy.ColumnMappings.Add("PunchTime", "PunchTime");
+                        bulkCopy.ColumnMappings.Add("EntryMode", "EntryMode");
+                        bulkCopy.ColumnMappings.Add("DeviceIPAddress", "DeviceIPAddress");
+                        bulkCopy.ColumnMappings.Add("DeviceNo", "DeviceNo");
+                       // bulkCopy.ColumnMappings.Add("PUNCHDATE", "PUNCHDATE");
 
                         bulkCopy.DestinationTableName = "AttnRawData";
                         bulkCopy.WriteToServer(_dtRawData);
diff --git a/HRM.UI/ClientApp/src/app/attendance/read-attendance-rawdata/read-attendance-rawdata.component.ts b/HRM.UI/ClientApp/src/app/attendance/read-attendance-rawdata/read-attendance-rawdata.component.ts
index 1b1a38a..0b5d790 100644
--- a/HRM.UI/ClientApp/src/app/attendance/read-attendance-rawdata/read-attendance-rawdata.component.ts
+++ b/HRM.UI/ClientApp/src/app/attendance/read-attendance-rawdata/read-attendance-rawdata.component.ts
@@ -248,8 +248,8 @@ export class ReadAttendanceRawdataComponent {
                 item.employeeNo = x.employeeNo,
                 item.entryMode = (x.entryMode == undefined || x.entryMode.length <= 0) ? 0 : this.entryModes.find(e => e.name.trim().toLowerCase() == x.entryMode.trim().toLowerCase()).value,
                 item.cardNo = (x.cardNo !== undefined || x.cardNo !== "" || x.cardNo !== null) ? item.employeeNo : item.cardNo,
-                item.deviceNo = (x.deviceNo !== undefined || x.deviceNo !== "" || x.deviceNo !== null) ? null : item.deviceNo,
-                item.deviceIPAddress = (x.deviceIPAddress !== undefined || x.deviceIPAddress !== "" || x.deviceIPAddress !== null) ? null : item.deviceIPAddress
+                item.deviceNo = (x.deviceNo !== undefined || x.deviceNo !== "" || x.deviceNo !== null) ? "" : item.deviceNo,
+                item.deviceIPAddress = (x.deviceIPAddress !== undefined || x.deviceIPAddress !== "" || x.deviceIPAddress !== null) ? "" : item.deviceIPAddress
                 this.attnRawDatas.push(item);
             });
             //console.log(this.attnRawDatas);