From 52b0eb1762263480643b7b812b3e9f4ab86caf72 Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Tue, 29 Aug 2023 17:10:50 +0800 Subject: [PATCH] 1 --- QcMgr/Tnb.QcMgr.Entities/Enums/EnumTriggerType.cs | 10 +++++----- QcMgr/Tnb.QcMgr/QcCheckPlanService.cs | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/QcMgr/Tnb.QcMgr.Entities/Enums/EnumTriggerType.cs b/QcMgr/Tnb.QcMgr.Entities/Enums/EnumTriggerType.cs index 6a534904..c6d5ccc8 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Enums/EnumTriggerType.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Enums/EnumTriggerType.cs @@ -16,15 +16,15 @@ namespace Tnb.QcMgr.Entities.Enums } public enum EnumTriggerEvent { - [Remark("首件检", "换模具")] + [Remark("首检", "换模具")] 首件检换模具 = 1, - [Remark("首件检", "换物料批号")] + [Remark("首检", "换物料批号")] 首件检换物料批号 = 2, - [Remark("首件检", "换物料编号")] + [Remark("首检", "换物料编号")] 首件检换物料编号 = 3, - [Remark("首件检", "新的生产任务")] + [Remark("首检", "新的生产任务")] 首件检新的生产任务 = 4, - [Remark("首件检", "生产任务暂停")] + [Remark("首检", "生产任务暂停")] 首件检生产任务暂停 = 5, [Remark("出厂检", "按入厂频次")] 出厂检按入厂频次 = 6, diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs index 15f413e1..8c6c0a34 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs @@ -292,11 +292,12 @@ namespace Tnb.QcMgr { var DictionaryData = _repository.AsSugarClient().Queryable ((a, b) => new object[] { JoinType.Left, a.DictionaryTypeId == b.Id, }) - .Where((a, b) => b.FullName == "质量方案类型").ToList(); + .Where((a, b) => b.FullName == "质检类型选择").ToList(); var TriggerEvent = new QcTriggerEvent(); var enumTriggerEvent = entity.triggerevent; var remark = RemarkAttribute.GetRemark(enumTriggerEvent); - TriggerEvent = _repository.AsSugarClient().Queryable().Where(p => p.type == DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id && p.name == remark.CheckContent).First(); + var type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id; + TriggerEvent = _repository.AsSugarClient().Queryable().Where(p => p.type == type && p.name == remark.CheckContent).First(); Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id)); } private void Filter(List QcCheckPlanHs, TriggerPlanEntity entity)