From 5f1eeb08c96551795d1c66b558f86f51b461788a Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 15 Aug 2024 10:56:50 +0800 Subject: [PATCH] =?UTF-8?q?TODO=20=E5=AE=8C=E6=88=90=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E6=8A=A5=E5=B7=A5=20(=E5=90=AF=E7=94=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JobKanban/LoginOrSetController.cs | 19 +++++++++++- .../MES/product/Dto/ProReportworkDto.cs | 28 +++++++++++++++++ DOAN.Model/MES/product/ProReportwork.cs | 15 ++++++--- DOAN.Service/JobKanban/LoginOrSetService.cs | 31 ++++++++++--------- .../MES/product/ProReportworkService.cs | 6 ++-- 5 files changed, 75 insertions(+), 24 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs index e92d4d3..4a2e4df 100644 --- a/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs +++ b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs @@ -131,7 +131,7 @@ namespace DOAN.Admin.WebApi.Controllers.JobKanban return SUCCESS(response); } /// - /// 完成 工单和报工 + /// 完成 工单和报工 (废弃) /// /// /// @@ -147,6 +147,23 @@ namespace DOAN.Admin.WebApi.Controllers.JobKanban var response = _LoginOrSetService.FinishWorkOrder(reportWork); return SUCCESS(response); } + /// + /// TODO 完成 工单和报工 (启用) + /// + /// + /// + [HttpPost("finish_workorder2")] + public IActionResult FinishWorkOrder2([FromBody] ProReportworkDto3 reportWorkDto) + { + if (reportWorkDto == null) + { + return SUCCESS(null); + } + ProReportwork reportWork = reportWorkDto.Adapt(); + reportWork.ToCreate(HttpContext); + var response = _LoginOrSetService.FinishWorkOrder(reportWork); + return SUCCESS(response); + } // 获取今日总任务数 ，剩余任务数 diff --git a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs index e960f7c..20f24d3 100644 --- a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs +++ b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs @@ -75,5 +75,33 @@ namespace DOAN.Model.MES.product.Dto + } + + + public class ProReportworkDto3 + { + + public string FkWorkorder { get; set; } + + public int? DispatchNum { get; set; } + + public int? FinishedNum { get; set; } + + public string GroupCode { get; set; } + //组id + public string Group_Schedule_Id { get; set; } + + public string LineCode { get; set; } + + /// + /// 工艺路线id + /// + public int Fk_route_id { get; set; } + + //public string CreatedBy { get; set; } + + + + } } \ No newline at end of file diff --git a/DOAN.Model/MES/product/ProReportwork.cs b/DOAN.Model/MES/product/ProReportwork.cs index d4137fb..a0d57e8 100644 --- a/DOAN.Model/MES/product/ProReportwork.cs +++ b/DOAN.Model/MES/product/ProReportwork.cs @@ -42,20 +42,25 @@ namespace DOAN.Model.MES.product [SugarColumn(ColumnName = "group_code")] public string GroupCode { get; set; } + /// + /// 组id + /// + [SugarColumn(ColumnName = "fk_group_schedule_id")] + public string Group_Schedule_Id { get; set; } + /// /// 线code /// [SugarColumn(ColumnName = "line_code")] public string LineCode { get; set; } + /// - /// 班组长 + /// 工艺路线id /// - [SugarColumn(ColumnName = "group_leader")] - public string GroupLeader { get; set; } + [SugarColumn(ColumnName = "fk_route_id")] + public int Fk_route_id { get; set; } - - /// /// 创建人 /// diff --git a/DOAN.Service/JobKanban/LoginOrSetService.cs b/DOAN.Service/JobKanban/LoginOrSetService.cs index 6753227..163b27c 100644 --- a/DOAN.Service/JobKanban/LoginOrSetService.cs +++ b/DOAN.Service/JobKanban/LoginOrSetService.cs @@ -162,22 +162,23 @@ namespace DOAN.Service.JobKanban workorderStatus.CreatedTime = DateTime.Now; Context.Insertable(workorderStatus).ExecuteCommand(); - + reportWorkDto.Id = XueHua; + reportWorkDto.DispatchNum = DispatchNum; + Context.Storageable(reportWorkDto) + .WhereColumns(it => it.FkWorkorder) + .ExecuteCommand(); }); - ProReportwork reportWork = new ProReportwork(); - reportWork.Id = XueHua; - reportWork.FkWorkorder = reportWorkDto.FkWorkorder; - reportWork.DispatchNum = DispatchNum; - reportWork.FinishedNum = reportWorkDto.FinishedNum; - reportWork.GroupCode = reportWorkDto.GroupCode; - reportWork.LineCode = reportWorkDto.LineCode; - reportWork.GroupLeader = reportWorkDto.GroupLeader; - reportWork.CreatedTime = DateTime.Now; - reportWork.CreatedBy = reportWorkDto.CreatedBy; - - Context.Storageable(reportWork) - .WhereColumns(it => it.FkWorkorder) - .ExecuteCommand(); + //ProReportwork reportWork = new ProReportwork(); + //reportWork.Id = XueHua; + //reportWork.FkWorkorder = reportWorkDto.FkWorkorder; + //reportWork.DispatchNum = DispatchNum; + //reportWork.FinishedNum = reportWorkDto.FinishedNum; + //reportWork.GroupCode = reportWorkDto.GroupCode; + //reportWork.LineCode = reportWorkDto.LineCode; + //reportWork.GroupLeader = reportWorkDto.GroupLeader; + //reportWork.CreatedTime = DateTime.Now; + //reportWork.CreatedBy = reportWorkDto.CreatedBy; + return result; } diff --git a/DOAN.Service/MES/product/ProReportworkService.cs b/DOAN.Service/MES/product/ProReportworkService.cs index 095984c..512f9de 100644 --- a/DOAN.Service/MES/product/ProReportworkService.cs +++ b/DOAN.Service/MES/product/ProReportworkService.cs @@ -31,7 +31,7 @@ namespace DOAN.Service.MES.product /// public PagedInfo GetList(ProReportworkQueryDto parm) { - if(parm.TimeRange.Length == 2) + if(parm.TimeRange!=null&&parm.TimeRange.Length == 2) { parm.TimeRange[0]= parm.TimeRange[0].Date; parm.TimeRange[1]= parm.TimeRange[1].Date.AddDays(1); @@ -41,8 +41,8 @@ namespace DOAN.Service.MES.product .AndIF(!string.IsNullOrEmpty(parm.FkWorkorder),it=>it.FkWorkorder.Contains(parm.FkWorkorder)) .AndIF(!string.IsNullOrEmpty(parm.GroupCode),it=>it.GroupCode==parm.FkWorkorder) .AndIF(!string.IsNullOrEmpty(parm.LineCode),it=>it.LineCode==parm.FkWorkorder) - .AndIF(parm.TimeRange.Length == 2 && parm.TimeRange[0]>DateTime.MinValue,it=>it.CreatedTime>= parm.TimeRange[0]) - .AndIF(parm.TimeRange.Length == 2 && parm.TimeRange[1]>DateTime.MinValue,it=>it.CreatedTime<= parm.TimeRange[1]) + .AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[0]>DateTime.MinValue,it=>it.CreatedTime>= parm.TimeRange[0]) + .AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[1]>DateTime.MinValue,it=>it.CreatedTime<= parm.TimeRange[1]) ; var response = Queryable()