From 8860044e922ae4896e553c10ce1358a979251a2f Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Thu, 16 Nov 2023 13:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=A8=E6=A3=80BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.EquipMgr.Entities/Entity/ToolMolds.cs | 2 +- .../ToolMoldRequisitionService.cs | 46 +++++++++++++++++-- .../Tnb.EquipMgr/ToolMoldReturnService.cs | 43 +++++++++++++++-- QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs | 2 +- QcMgr/Tnb.QcMgr/QcCheckTaskService.cs | 2 +- 5 files changed, 83 insertions(+), 12 deletions(-) diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs index 3674be98..639fcd84 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.cs @@ -67,7 +67,7 @@ public partial class ToolMolds : BaseEntity /// /// 成长周期 /// - public int? growth_cycle { get; set; } + public decimal? growth_cycle { get; set; } /// /// 型腔数 diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs index f71ae603..e7dbd085 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs @@ -1,4 +1,5 @@ using System.Dynamic; +using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Enums; using JNPF.Common.Filter; @@ -7,10 +8,12 @@ using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; using JNPF.Systems.Entitys.Permission; +using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; using JNPF.VisualDev.Interfaces; +using Mapster; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SqlSugar; @@ -34,12 +37,16 @@ namespace Tnb.EquipMgr private readonly ISqlSugarClient _db; private readonly IRunService _runService; private readonly IVisualDevService _visualDevService; + private readonly IBillRullService _billRuleService; + private readonly IUserManager _userManager; public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public ToolMoldRequisitionService( ISqlSugarRepository repository, IRunService runService, - IVisualDevService visualDevService + IVisualDevService visualDevService, + IBillRullService billRullService, + IUserManager userManager ) { _db = repository.AsSugarClient(); @@ -47,6 +54,8 @@ namespace Tnb.EquipMgr _visualDevService = visualDevService; OverideFuncs.GetListAsync = GetList; OverideFuncs.CreateAsync = Create; + _billRuleService= billRullService; + _userManager= userManager; } private async Task GetList(VisualDevModelListQueryInput input) @@ -96,13 +105,42 @@ namespace Tnb.EquipMgr return PageResult.SqlSugarPageResult(result); } - + private DateTime GetDateTime(long value) + { + + DateTime unixStartTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc); + DateTime dateTime = unixStartTime.AddMilliseconds(value); + return dateTime; + } private async Task Create(VisualDevModelDataCrInput input) { + string Code = await _billRuleService.GetBillNumber("moldRequisition"); DbResult result = await _db.Ado.UseTranAsync(async () => { - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); - await _runService.Create(templateEntity, input); + ToolMoldRequisition toolMoldRequisition = new ToolMoldRequisition(); + toolMoldRequisition.code = Code; + toolMoldRequisition.mold_id= input.data[nameof(ToolMoldRequisition.mold_id)].ToString(); + toolMoldRequisition.mo_task_id = input.data[nameof(ToolMoldRequisition.mo_task_id)].ToString(); + toolMoldRequisition.equip_id = input.data[nameof(ToolMoldRequisition.equip_id)].ToString(); + if (input.data[nameof(ToolMoldRequisition.requisition_time)] != null) + { + toolMoldRequisition.requisition_time = GetDateTime(long.Parse(input.data[nameof(ToolMoldRequisition.requisition_time)].ToString()!)); + } + if (input.data[nameof(ToolMoldRequisition.estimated_return_time)] != null) + { + toolMoldRequisition.estimated_return_time = GetDateTime(long.Parse(input.data[nameof(ToolMoldRequisition.estimated_return_time)].ToString()!)); + } + + toolMoldRequisition.recipient_id = input.data[nameof(ToolMoldRequisition.recipient_id)].ToString(); + if (input.data.ContainsKey(nameof(ToolMoldRequisition.remark))) + { + toolMoldRequisition.remark = input.data[nameof(ToolMoldRequisition.remark)].ToString(); + } + toolMoldRequisition.create_time = DateTime.Now; + toolMoldRequisition.create_id = _userManager.UserId; + await _db.Insertable(toolMoldRequisition).ExecuteCommandAsync(); + // VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); + // await _runService.Create(templateEntity, input); _ = await _db.Updateable().SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.SCTypeId) diff --git a/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs b/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs index 2c413d78..b6211f70 100644 --- a/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs +++ b/EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs @@ -1,8 +1,10 @@ +using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Enums; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Interfaces; @@ -25,29 +27,60 @@ namespace Tnb.EquipMgr private readonly ISqlSugarClient _db; private readonly IRunService _runService; private readonly IVisualDevService _visualDevService; + private readonly IBillRullService _billRuleService; + private readonly IUserManager _userManager; public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public ToolMoldReturnService( ISqlSugarRepository repository, IRunService runService, - IVisualDevService visualDevService + IVisualDevService visualDevService, + IBillRullService billRullService, + IUserManager userManager ) { _db = repository.AsSugarClient(); _runService = runService; _visualDevService = visualDevService; OverideFuncs.CreateAsync = Create; + _billRuleService= billRullService; + _userManager = userManager; } + private DateTime GetDateTime(long value) + { + DateTime unixStartTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc); + DateTime dateTime = unixStartTime.AddMilliseconds(value); + return dateTime; + } private async Task Create(VisualDevModelDataCrInput input) { + string Code = await _billRuleService.GetBillNumber("moldReturn"); DbResult result = await _db.Ado.UseTranAsync(async () => { - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); - await _runService.Create(templateEntity, input); + ToolMoldReturn toolMoldReturn = new ToolMoldReturn(); + toolMoldReturn.code = Code; + toolMoldReturn.mold_id = input.data[nameof(ToolMoldReturn.mold_id)].ToString(); + toolMoldReturn.location_id = input.data[nameof(ToolMoldReturn.location_id)].ToString(); + if (input.data[nameof(ToolMoldReturn.return_id)] != null) + { + toolMoldReturn.return_id = input.data[nameof(ToolMoldReturn.return_id)].ToString(); + } + if (input.data[nameof(ToolMoldReturn.return_time)] != null) + { + toolMoldReturn.return_time = GetDateTime(long.Parse(input.data[nameof(ToolMoldReturn.return_time)].ToString()!)); + } + if (input.data.ContainsKey(nameof(ToolMoldReturn.remark))) + { + toolMoldReturn.remark = input.data[nameof(ToolMoldReturn.remark)].ToString(); + } + toolMoldReturn.create_time = DateTime.Now; + toolMoldReturn.create_id = _userManager.UserId; + // VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); + //await _runService.Create(templateEntity, input); + await _db.Insertable(toolMoldReturn).ExecuteCommandAsync(); - - string? locationId = ""; + string ? locationId = ""; if (input.data.TryGetValue("location_id", out object? value)) { locationId = value.ToString(); diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs index 1d2880e5..4b8c36ee 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs @@ -56,7 +56,7 @@ namespace Tnb.QcMgr .LeftJoin((a, b, c) => a.processid == c.id) .LeftJoin((a, b, c, d) => a.workid == d.Id) .LeftJoin((a, b, c, d, e) => a.execuser == e.Id) - .WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid) + .WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => b.name.Contains(materialid)) .WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype) .WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status) .Where((a, b, c, d, e) => a.status == list.Where(p => p.FullName == "已完成").First().Id) diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs index 51b94859..70ef769b 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs @@ -67,7 +67,7 @@ namespace Tnb.QcMgr .LeftJoin((a, b, c) => a.processid == c.id) .LeftJoin((a, b, c, d) => a.workid == d.Id) .LeftJoin((a, b, c, d, e) => a.execuser == e.Id) - .WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid) + .WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d,e) => b.name.Contains(materialid)) .WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype) .WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status) .Where((a, b, c, d, e) => a.status == list.Where(p => p.FullName == "待执行").First().Id)