wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模具保养执行代码提交

Browse Source
This commit is contained in:
DEVICE8\12494
2023-05-30 08:34:44 +08:00
parent 9237c0e876
commit 919911d61d
7 changed files with 122 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
EquipMgr/Tnb.EquipMgr.Entities/Consts/MoldPlanMaintainStatus.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Consts
{
public class MoldPlanMaintainStatus
{
/// <summary>
/// 模具保养计划状态-已完成CODE
/// </summary>
public const string MOLDPLAN_MAINTAIN_STATUS_COMPLETED_CODE = "Completed";
}
}

16
EquipMgr/Tnb.EquipMgr.Entities/Consts/MoldUseStatus.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Consts
{
public class MoldUseStatus
{
/// <summary>
/// 模具使用状态在库状态ID
/// </summary>
public const string MOLDUSESTATUSZKID = "26149307089941";
}
}

4
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainRunUpInput.cs
View File

@@ -23,5 +23,9 @@ namespace Tnb.EquipMgr.Entities.Dto
/// 保养项状态 0，未完成 1，已完成
/// </summary>
public int? status { get; set; }
/// <summary>
/// 模具id
/// </summary>
public string mold_id { get; set; }
}
}

15
EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRuleService.cs
View File

@@ -83,7 +83,7 @@ namespace Tnb.EquipMgr
})
.ToListAsync();
}
/// <summary>
/// 关联模具
@@ -141,28 +141,29 @@ namespace Tnb.EquipMgr
await _db.Ado.BeginTranAsync();
var maintainRules = await _db.Queryable<ToolMoldMaintainRule>().Where(it => input.ruleIds.Contains(it.id)).ToListAsync();
var ruleMoldRelations = await _db.Queryable<ToolMoldMaintainRuleRelation>().Where(it=>input.ruleIds.Contains(it.rule_id)).ToListAsync();
var ruleMoldRelations = await _db.Queryable<ToolMoldMaintainRuleRelation>().Where(it => input.ruleIds.Contains(it.rule_id)).ToListAsync();
if (ruleMoldRelations?.Count > 0)
{
List<ToolMoldMaintainPlan> maintainPlans = new();
List<ToolMoldMaintainPlanRelation> maintainPlanRelations = new();
foreach (var maintainRule in maintainRules)
foreach (var mrr in ruleMoldRelations)
{
if (maintainRule.cycle.HasValue && maintainRule.cycle.Value > 0)
var rule = await _db.Queryable<ToolMoldMaintainRule>().FirstAsync(it => it.id == mrr.rule_id);
if (rule != null && rule.cycle.HasValue && rule.cycle.Value > 0)
{
ToolMoldMaintainPlan maintainPlan = new();
maintainPlan.plan_code = $"JHDM{DateTime.Now:yyyyMMddmmss}";
maintainPlan.mode = maintainRule.mode;
maintainPlan.mode = rule.mode;
maintainPlan.status = DictConst.UnMaintainStatusCode;
maintainPlan.plan_start_date = DateTime.Now;
maintainPlan.plan_end_date = DateTime.Now.AddDays(maintainRule.cycle.Value);
maintainPlan.plan_end_date = DateTime.Now.AddDays(rule.cycle.Value);
maintainPlan.create_id = _userManager.UserId;
maintainPlan.create_time = DateTime.Now;
maintainPlans.Add(maintainPlan);
ToolMoldMaintainPlanRelation maintainPlanReation = new();
maintainPlanReation.maintain_plan_id = maintainPlan.id;
maintainPlanReation.mold_id = (await _db.Queryable<ToolMoldMaintainRuleRelation>().FirstAsync(it => it.rule_id == maintainRule.id))?.mold_id!;
maintainPlanReation.mold_id = mrr.mold_id;
maintainPlanRelations.Add(maintainPlanReation);
}
}

97
EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs
View File

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Aspose.Cells.Drawing;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
@@ -14,8 +15,10 @@ using JNPF.Logging;
using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using StackExchange.Profiling.Internal;
using Tnb.BasicData;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Consts;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
@@ -40,9 +43,8 @@ namespace Tnb.EquipMgr
_dictionaryDataService = dictionaryDataService;
}
/// <summary>
/// 根据计划id,获取相关联模具、设备、保养项目组、保养项，信息
/// 根据计划id,获取相关联模具、设备、信息
/// </summary>
/// <param name="planId"></param>
/// <returns></returns>
@@ -50,7 +52,16 @@ namespace Tnb.EquipMgr
public async Task<dynamic> GetMaintainInfoFromByPlanId([FromRoute] string planId)
{
dynamic info = new ExpandoObject();
var planMoldRelation = await _db.Queryable<ToolMoldMaintainPlanRelation>().FirstAsync(it => it.maintain_plan_id == planId);
var planMoldRelation = await _db.Queryable<ToolMoldMaintainPlanRelation>()
.LeftJoin<ToolMoldMaintainPlan>((a, b) => a.maintain_plan_id == b.id)//ToolMoldMaintainPlan
.LeftJoin<ToolMoldMaintainRunRecord>((a, b, c) => b.plan_code == c.plan_code)
.Where(a => a.maintain_plan_id == planId)
.Select((a, b, c) => new
{
mold_id = a.mold_id,
plan_start_time = c.plan_start_time,
})
.FirstAsync();
if (planMoldRelation != null)
{
var mold = await _db.Queryable<ToolMolds>().FirstAsync(it => it.id == planMoldRelation.mold_id);
@@ -60,6 +71,7 @@ namespace Tnb.EquipMgr
info.mold_name = mold.mold_name;
info.mold_status = (await _dictionaryDataService.GetInfo(mold.mold_status))?.FullName;
info.maintain_qty = mold.maintain_qty;
info.plan_start_time = planMoldRelation.plan_start_time;
var moldEqpRelation = await _db.Queryable<ToolMoldsEquipment>().FirstAsync(it => it.mold_id == mold.id);
if (moldEqpRelation != null)
{
@@ -67,31 +79,41 @@ namespace Tnb.EquipMgr
info.eqp_code = eqp.code;
info.eqp_name = eqp.name;
}
var itemGroupRelation = await _db.Queryable<ToolMoldMaintainGroupRelation>().FirstAsync(it => it.mold_id == mold.id);
if (itemGroupRelation != null)
{
var checkItems = await _db.Queryable<ToolMoldMaintainGroup, ToolMoldMaintainGroupItem, ToolMoldMaintainItem>((a, b, c) => new JoinQueryInfos
(
JoinType.Left, a.id == b.item_group_id,
JoinType.Left, b.item_id == c.id
))
.Where(a => a.id == itemGroupRelation.item_group_id)
.Select((a, b, c) => new
{
item_group_id = a.id,
item_group_name = a.name,
item_id = c.id,
item_name = c.name,
}).ToListAsync();
if (checkItems?.Count > 0)
{
info.check_items = checkItems;
}
}
}
}
return info;
}
/// <summary>
/// 根据模具ID获取，保养组及项目信息
/// </summary>
/// <param name="moldId">模具ID</param>
/// <returns></returns>
[HttpGet]
public async Task<dynamic> GetCheckItemAndGrpByMoldId([FromRoute] string moldId)
{
if (moldId.IsNullOrEmpty()) throw new ArgumentException($"parameter {nameof(moldId)} not be null or empty");
var itemGroupRelation = await _db.Queryable<ToolMoldMaintainGroupRelation>().FirstAsync(it => it.mold_id == moldId);
if (itemGroupRelation != null)
{
var checkItems = await _db.Queryable<ToolMoldMaintainGroup, ToolMoldMaintainGroupItem, ToolMoldMaintainItem>((a, b, c) => new JoinQueryInfos
(
JoinType.Left, a.id == b.item_group_id,
JoinType.Left, b.item_id == c.id
))
.Where(a => a.id == itemGroupRelation.item_group_id)
.Select((a, b, c) => new
{
item_group_id = a.id,
item_group_name = a.name,
item_id = c.id,
item_name = c.name,
}).ToListAsync();
return checkItems;
}
return Enumerable.Empty<dynamic>();
}
/// <summary>
/// 模具保养计划执行-开始模具保养
@@ -173,7 +195,32 @@ namespace Tnb.EquipMgr
public async Task MaintainFinish(MoldMaintainRunUpInput input)
{
if (input == null) throw new ArgumentNullException("input");
var grpIds = await _db.Queryable<ToolMoldMaintainGroupRelation>()
.LeftJoin<ToolMolds>((a, b) => a.mold_id == b.id)
.Where(a => a.mold_id == input.mold_id)
.Select((a, b) => a.item_group_id)
.Distinct()
.ToListAsync();
var itemIds = await _db.Queryable<ToolMoldMaintainGroupItem>().Where(it => grpIds.Contains(it.item_group_id)).Select(it => it.item_id).ToListAsync();
if (itemIds?.Count > 0)
{
var items = await _db.Queryable<ToolMoldMaintainItem>().Where(it => itemIds.Contains(it.id) && it.status.HasValue && it.status.Value == 1).ToListAsync();
if (items?.Count < itemIds.Count)
{
throw new AppFriendlyException("当前模具有未完成的保养项目", 500);
}
var row = await _db.Updateable<ToolMolds>().SetColumns(it => new ToolMolds { mold_status = MoldUseStatus.MOLDUSESTATUSZKID }).Where(it => it.id == input.mold_id).ExecuteCommandAsync();
if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
var allMoldStatus = await _db.Queryable<ToolMoldMaintainPlanRelation>().InnerJoin<ToolMolds>((a, b) => a.mold_id == b.id)
.Where((a, b) => a.maintain_plan_id == input.plan_id)
.Select((a, b) => b.mold_status)
.ToListAsync();
if (allMoldStatus?.Count > 0 && allMoldStatus.All(x => x == MoldUseStatus.MOLDUSESTATUSZKID))
{
row = await _db.Updateable<ToolMoldMaintainPlan>().SetColumns(it => new ToolMoldMaintainPlan { status = MoldPlanMaintainStatus.MOLDPLAN_MAINTAIN_STATUS_COMPLETED_CODE }).Where(it => it.id == input.plan_id).ExecuteCommandAsync();
}
if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
}
}
}

1
ProductionMgr/Tnb.ProductionMgr/PrdCancelCloseDownService.cs
View File

@@ -225,6 +225,7 @@ namespace Tnb.ProductionMgr
await _maintainTaskService.Create(maintaindTask);
}
}
else throw Oops.Oh(ErrorCode.COM1001);

10
ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
View File

@@ -35,7 +35,7 @@ namespace Tnb.ProductionMgr
{
private readonly ISqlSugarClient _db;
private readonly IDictionaryDataService _dictionaryDataService;
private static Dictionary<string, Tuple<string,string>> _dicWorkLine = new Dictionary<string, Tuple<string, string>>();
private static Dictionary<string, Tuple<string, string>> _dicWorkLine = new Dictionary<string, Tuple<string, string>>();
public PrdPackReportService(ISqlSugarRepository<PrdMoTask> repository, IDictionaryDataService dictionaryDataService)
{
_db = repository.AsSugarClient();
@@ -53,12 +53,12 @@ namespace Tnb.ProductionMgr
var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId);
if (_dicWorkLine.Count < 1)
{
var list = await _db.Queryable<OrganizeEntity>().Where(it => it.Category == "workline").ToListAsync();
var list = await _db.Queryable<OrganizeEntity>().Where(it => it.Category == "workline").ToListAsync();
_dicWorkLine = list.ToDictionary(x => x.Id, x => Tuple.Create<string, string>(x.EnCode, x.FullName));
}
var items = await _db.Queryable<PrdMoTask>().LeftJoin<BasProcess>((a, b) => a.process_id == b.id).LeftJoin<PrdMo>((a, b, c) => a.mo_id == c.id)
.WhereIF(!string.IsNullOrEmpty(input.mo_task_code), a => a.mo_task_code == input.mo_task_code)
.WhereIF(!string.IsNullOrEmpty(input.mo_task_code), a => a.mo_task_code == input.mo_task_code.Trim())
.Where(a => string.IsNullOrEmpty(a.parent_id) && a.schedule_type == 2 && a.mo_task_status != "ToBeScheduled")
.Select((a, b, c) => new PrdMoTask
{
@@ -123,7 +123,7 @@ namespace Tnb.ProductionMgr
mo_task_code = a.mo_task_code,
workline_id = a.workline_id,
process_id = a.process_id,
process_code =b.process_code,
process_code = b.process_code,
process_name = b.process_name,
plan_start_date = a.estimated_start_date,
plan_end_date = a.estimated_end_date,