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

1

Browse Source
This commit is contained in:
qianjiawei
2023-08-29 17:10:50 +08:00
parent 1c372c6d78
commit 52b0eb1762
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
QcMgr/Tnb.QcMgr.Entities/Enums/EnumTriggerType.cs
View File

@@ -16,15 +16,15 @@ namespace Tnb.QcMgr.Entities.Enums
} }
public enum EnumTriggerEvent public enum EnumTriggerEvent
{ {
[Remark("首件检", "换模具")] [Remark("首检", "换模具")]
首件检换模具 = 1, 首件检换模具 = 1,
[Remark("首件检", "换物料批号")] [Remark("首检", "换物料批号")]
首件检换物料批号 = 2, 首件检换物料批号 = 2,
[Remark("首件检", "换物料编号")] [Remark("首检", "换物料编号")]
首件检换物料编号 = 3, 首件检换物料编号 = 3,
[Remark("首件检", "新的生产任务")] [Remark("首检", "新的生产任务")]
首件检新的生产任务 = 4, 首件检新的生产任务 = 4,
[Remark("首件检", "生产任务暂停")] [Remark("首检", "生产任务暂停")]
首件检生产任务暂停 = 5, 首件检生产任务暂停 = 5,
[Remark("出厂检", "按入厂频次")] [Remark("出厂检", "按入厂频次")]
出厂检按入厂频次 = 6, 出厂检按入厂频次 = 6,

5
QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
View File

@@ -292,11 +292,12 @@ namespace Tnb.QcMgr
{ {
var DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity> var DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
((a, b) => new object[] { JoinType.Left, a.DictionaryTypeId == b.Id, }) ((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 TriggerEvent = new QcTriggerEvent();
var enumTriggerEvent = entity.triggerevent; var enumTriggerEvent = entity.triggerevent;
var remark = RemarkAttribute.GetRemark(enumTriggerEvent); var remark = RemarkAttribute.GetRemark(enumTriggerEvent);
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().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<QcTriggerEvent>().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)); Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id));
} }
private void Filter(List<QcCheckPlanH> QcCheckPlanHs, TriggerPlanEntity entity) private void Filter(List<QcCheckPlanH> QcCheckPlanHs, TriggerPlanEntity entity)