From d77e2953b764dc6509fe80bb4b37a1ea3aaa4624 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 4 Dec 2024 14:41:33 +0800 Subject: [PATCH] 1 --- DOAN.Service/MES/Product/ProWorkorderService.cs | 12 ++++++------ DOAN.Service/Mobile/ReportFlowService.cs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DOAN.Service/MES/Product/ProWorkorderService.cs b/DOAN.Service/MES/Product/ProWorkorderService.cs index 56270ff..38e1786 100644 --- a/DOAN.Service/MES/Product/ProWorkorderService.cs +++ b/DOAN.Service/MES/Product/ProWorkorderService.cs @@ -546,18 +546,18 @@ namespace DOAN.Service.MES.product NPOI.SS.UserModel.ICell currentCell_18 = currentRow.GetCell(11); if (currentCell_18 == null) { - workorder.GroupCode = string.Empty; + workorder.WorkshopCode = string.Empty; } else { if (currentCell_18.CellType == CellType.Numeric) { - workorder.GroupCode = currentCell_18.NumericCellValue.ToString(); + workorder.WorkshopCode = currentCell_18.NumericCellValue.ToString(); } else { - workorder.GroupCode = currentCell_18.StringCellValue; + workorder.WorkshopCode = currentCell_18.StringCellValue; } } @@ -826,18 +826,18 @@ namespace DOAN.Service.MES.product NPOI.SS.UserModel.ICell currentCell_18 = currentRow.GetCell(11); if (currentCell_18 == null) { - workorder.GroupCode = string.Empty; + workorder.WorkshopCode = string.Empty; } else { if (currentCell_18.CellType == CellType.Numeric) { - workorder.GroupCode = currentCell_18.NumericCellValue.ToString(); + workorder.WorkshopCode = currentCell_18.NumericCellValue.ToString(); } else { - workorder.GroupCode = currentCell_18.StringCellValue; + workorder.WorkshopCode = currentCell_18.StringCellValue; } } diff --git a/DOAN.Service/Mobile/ReportFlowService.cs b/DOAN.Service/Mobile/ReportFlowService.cs index 223c802..a84f768 100644 --- a/DOAN.Service/Mobile/ReportFlowService.cs +++ b/DOAN.Service/Mobile/ReportFlowService.cs @@ -35,7 +35,7 @@ public class ReportFlowService : BaseService, IReportFlowServic .SetColumns(it => it.FinishNum == finish_num) .SetColumns(it => it.BadNum == bad_num) .SetColumns(it => it.Worker == Worker) - .SetColumns(it => it.JobDate == DateTime.Today) + .SetColumns(it => it.JobDate == DateTime.Now) .SetColumns(it => it.UpdatedBy == Worker) .SetColumns(it => it.UpdatedTime == DateTime.Now) .ExecuteCommand(); @@ -50,7 +50,7 @@ public class ReportFlowService : BaseService, IReportFlowServic proReportwork01.FinishNum = finish_num; proReportwork01.BadNum = bad_num; proReportwork01.Worker = Worker; - proReportwork01.JobDate = DateTime.Today; + proReportwork01.JobDate = DateTime.Now; proReportwork01.CreatedBy = Worker; proReportwork01.CreatedTime = DateTime.Now; result= Context.Insertable(proReportwork01).ExecuteCommand();