diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs
index 62af791..8c2a0db 100644
--- a/shangjian/XGL.Data/DBService/FormingMachineService.cs
+++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs
@@ -274,7 +274,7 @@ where res.taskcode = '0' and equipmentCode = 'C6' and res.OrderCode is not null
                                 ('{CommonFunc.Common.GetUUID()}', '{LoginUser.UserId}', '{LoginUser.UserName}', '{type}', GetDate(),
                                  '工单状态更新-暂停', 'w2', '{status}', '{deviceCode}','{remark}','{orderCode}');";
             }
-            
+
             sqlList.Add(logSql);
             bool issucc = Utils.netClientDBHelper.executeBatchSql(sqlList);
 
@@ -1667,7 +1667,7 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC";
             return Utils.netClientDBHelper.executeUpdate(sql) > 0;
         }
 
-        public bool UpdateProWorkBatchInWorkBatchCode(string lineCode, string batchCode, string status,string productCode,string productName)
+        public bool UpdateProWorkBatchInWorkBatchCode(string lineCode, string batchCode, string status, string productCode, string productName)
         {
             string sql = $@"update pro_workbatch_inwork set batch='{batchCode}',product_code='{productCode}',product_name='{productName}',status='{status}' where line_code='{lineCode}' ";
             return Utils.netClientDBHelper.executeUpdate(sql) > 0;
diff --git a/shangjian/XGL.Data/userDB.cs b/shangjian/XGL.Data/userDB.cs
index 2fd154c..ca0c0f7 100644
--- a/shangjian/XGL.Data/userDB.cs
+++ b/shangjian/XGL.Data/userDB.cs
@@ -329,7 +329,7 @@ namespace XGL.Data
                 //待补充班组班次
                 LoginUser.ShiftCode = shiftID;
                 LoginUser.TeamCode = teamID;
-                LoginUser.WorkDate = workDate;
+                LoginUser.WorkDate = DateTime.Parse(workDate).ToString("yyyy-MM-dd");
                 LoginUser.Start_Time = startTime;
                 LoginUser.End_Time = endTime;
                 LoginUser.CurrDeviceIP = Common.GetLocationHostAddress();
diff --git a/shangjian/XGL/Views/LanJu_InOut.xaml.cs b/shangjian/XGL/Views/LanJu_InOut.xaml.cs
index 30997d8..cf75431 100644
--- a/shangjian/XGL/Views/LanJu_InOut.xaml.cs
+++ b/shangjian/XGL/Views/LanJu_InOut.xaml.cs
@@ -122,7 +122,7 @@ namespace XGL.Views
                     currShiftDate = DateTime.Now.Date.AddDays(-1);
                 }
 
-                DataTable dt = formingMachineService.GetInOutHistoryList(_workOrderCode, _deviceCode, currShiftDate.ToString());
+                DataTable dt = formingMachineService.GetInOutHistoryList(_workOrderCode, _deviceCode, currShiftDate.ToString("yyyy-MM-dd H:mm:ss"));
                 if (dt == null) return;
                 foreach (DataRow i in dt.Rows)
                 {