@ -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();
@ -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)
{