diff --git a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs index f14fefef..b8cd6297 100644 --- a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs +++ b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs @@ -27,6 +27,22 @@ public static class DictConst /// 备品备件类型 /// public const string SparePartsType = "SparePartsType"; + /// + /// 注塑工单 + /// + public const string PrdMoTypeZS = "25572555259157"; + /// + /// 挤出工单 + /// + public const string PrdMoTypeJC = "25019172714005"; + /// + /// 组装工单 + /// + public const string PrdMoTypeZZ = "25019181615125"; + /// + /// 包装工单 + /// + public const string PrdMoTypeBZ = "25019191681045"; #endregion diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoFromOneListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoFromOneListOutput.cs index b5f8082b..85dcfc0c 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoFromOneListOutput.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoFromOneListOutput.cs @@ -52,7 +52,34 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage public string? workline_name { get; set; } + public string? workshop_name { get; set; } + public string? mbom_version { get; set; } + + public string station_name { get; set; } + + public string equip_code { get; set; } + + } + + /// + /// 工单追溯二级列表输出类 + /// + public class PrdMoFromManListOutput + { + // /// + // /// 提报id + // /// + // public string id { get; set; } + // + // public string workgroup_name { get; set; } + + public string employee_name { get; set; } + public string work_time { get; set; } + + public DateTime? start_time { get; set; } + public DateTime? end_time { get; set; } + } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs index 114b4484..4c817ed4 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs @@ -418,29 +418,101 @@ namespace Tnb.ProductionMgr public async Task PrdMoFromTwoList(Dictionary dic) { string mo_id = dic.ContainsKey("mo_id") ? dic["mo_id"] : ""; - return await _db.Queryable() - .LeftJoin((a, b) => a.material_id == b.id) - .LeftJoin((a, b, c) => a.workline_id == c.Id) - .LeftJoin((a, b, c, d) => a.bom_id == d.id) - .WhereIF(!string.IsNullOrEmpty(mo_id),(a,b,c,d)=>a.mo_id==mo_id) - .Select((a, b, c, d) => - new PrdMoFromTwoListOutput - { - id = a.id, - mo_task_code = a.mo_task_code, - material_id = a.material_id, - material_code = b.code, - material_name = b.name, - material_standard = b.material_standard, - act_start_date = a.act_start_date == null - ? "" - : a.act_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), - act_end_date = a.act_end_date == null - ? "" - : a.act_end_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), - workline_name = c.FullName, - mbom_version = d.version - }).ToListAsync(); + string mo_task_code = dic.ContainsKey("mo_task_code") ? dic["mo_task_code"] : ""; + string batch = dic.ContainsKey("batch") ? dic["batch"] : ""; + List ids = new List(); + if (!string.IsNullOrEmpty(batch)) + { + ids = await _db.Queryable().Where(x => x.batch.Contains(batch)).Select(x=>x.mo_task_id).ToListAsync(); + } + + PrdMo prdMo = await _repository.GetSingleAsync(x => x.id == mo_id); + if (prdMo.mo_type is DictConst.PrdMoTypeZS or DictConst.PrdMoTypeJC) + { + return await _db.Queryable() + .LeftJoin((a, b) => a.material_id == b.id) + .LeftJoin((a,b,c)=>a.eqp_id==c.ObjectId && c.ObjectType=="Eqp") + .LeftJoin((a,b,c,d)=>c.OrganizeId==d.Id) + .LeftJoin((a,b,c,d,e)=>d.OrganizeIdTree.Contains(e.Id) && e.Category==DictConst.RegionCategoryWorkshopCode) + .LeftJoin((a,b,c,d,e,f)=>a.eqp_id==f.id) + .WhereIF(!string.IsNullOrEmpty(mo_id),(a,b,c,d)=>a.mo_id==mo_id) + .WhereIF(!string.IsNullOrEmpty(mo_task_code),(a,b,c,d)=>a.mo_task_code==mo_task_code) + .WhereIF(ids!=null && ids.Count>0,(a,b,c,d)=>ids.Contains(a.id)) + .Select((a, b, c, d,e,f) => + new PrdMoFromTwoListOutput + { + id = a.id, + mo_task_code = a.mo_task_code, + material_id = a.material_id, + material_code = b.code, + material_name = b.name, + material_standard = b.material_standard, + act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), + act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), + workshop_name = e.FullName, + station_name = d.FullName, + equip_code = f.code + }).ToListAsync(); + } + else + { + return await _db.Queryable() + .LeftJoin((a, b) => a.material_id == b.id) + .LeftJoin((a, b, c) => a.workline_id == c.Id) + .LeftJoin((a, b, c, d) => a.bom_id == d.id) + .WhereIF(!string.IsNullOrEmpty(mo_id),(a,b,c,d)=>a.mo_id==mo_id) + .WhereIF(!string.IsNullOrEmpty(mo_task_code),(a,b,c,d)=>a.mo_task_code==mo_task_code) + .WhereIF(ids!=null && ids.Count>0,(a,b,c,d)=>ids.Contains(a.id)) + .Select((a, b, c, d) => + new PrdMoFromTwoListOutput + { + id = a.id, + mo_task_code = a.mo_task_code, + material_id = a.material_id, + material_code = b.code, + material_name = b.name, + material_standard = b.material_standard, + act_start_date = a.act_start_date == null ? "" : a.act_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), + act_end_date = a.act_end_date == null ? "" : a.act_end_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), + workline_name = c.FullName, + mbom_version = d.version + }).ToListAsync(); + } + + } + + /// + /// 工单追溯人列表 + /// + /// + /// + [HttpPost] + public async Task PrdMoFromManList(Dictionary dic) + { + string mo_task_id = dic.ContainsKey("mo_task_id") ? dic["mo_task_id"] : ""; + string batch = dic.ContainsKey("batch") ? dic["batch"] : ""; + List ids = new List(); + if (!string.IsNullOrEmpty(batch)) + { + ids = await _db.Queryable().Where(x => x.batch.Contains(batch)).Select(x=>x.mo_task_id).ToListAsync(); + } + + return await _db.Queryable() + .LeftJoin((a, b) => a.create_id == b.Id) + .WhereIF(!string.IsNullOrEmpty(mo_task_id), (a, b) => a.mo_task_id == mo_task_id) + .WhereIF(ids!=null && ids.Count>0,(a,b)=>ids.Contains(a.mo_task_id)) + .GroupBy((a,b)=>new {a.create_id,employee_name = b.RealName}) + .Select((a, b) => new PrdMoFromManListOutput() + { + // id = a.id, + employee_name = b.RealName, + start_time = SqlFunc.AggregateMin(a.create_time), + end_time = SqlFunc.AggregateMax(a.create_time) + }).Mapper(x => + { + x.work_time = (x.start_time == null ? "" : x.start_time.Value.ToString("yyyy-MM-dd HH:mm:ss")) + "~" + (x.end_time == null ? "" : x.end_time.Value.ToString("yyyy-MM-dd HH:mm:ss")); + }) + .ToListAsync(); } #endregion diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index ab5ad11d..d7d81073 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -45,7 +45,7 @@ using Tnb.BasicData.Entities.Dto; using NPOI.SS.Formula.Functions; using Tnb.PerMgr.Entities; using Tnb.QcMgr.Interfaces; -using Tnb.QcMgr.Entities.Dto; +using Tnb.QcMgr.Entities; using Tnb.QcMgr.Entities.Enums; // using Tnb.PerMgr.Entities; diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs index 8af6d628..c6c9b706 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Tnb.QcMgr.Entities.Dto +namespace Tnb.QcMgr.Entities { public class CheckItemsInput { diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs index 08231e28..7849ddde 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tnb.QcMgr.Entities.Dto; namespace Tnb.QcMgr.Entities { diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs index cbe7eed4..acffee6a 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Tnb.QcMgr.Entities.Dto +namespace Tnb.QcMgr.Entities { public class QcCheckExecHOut { diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs new file mode 100644 index 00000000..705cfb5a --- /dev/null +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tnb.QcMgr.Entities +{ + public class SpcDataInput + { + } +} diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs index c58ec94c..42983040 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using NPOI.SS.Formula.PTG; using Tnb.QcMgr.Entities.Enums; -namespace Tnb.QcMgr.Entities.Dto +namespace Tnb.QcMgr.Entities { public class TriggerPlan { diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanWork.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanWork.cs index 4493fa0f..c38b862a 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanWork.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckPlanWork.cs @@ -7,7 +7,7 @@ using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.QcMgr.Entities.Entity +namespace Tnb.QcMgr.Entities { /// /// 质检方案工位关联表 diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcErrorLevel.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcErrorLevel.cs index e3978c78..eec0e3a7 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Entity/QcErrorLevel.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcErrorLevel.cs @@ -7,7 +7,7 @@ using JNPF.Common.Contracts; using JNPF.Common.Security; using SqlSugar; -namespace Tnb.QcMgr.Entities.Entity +namespace Tnb.QcMgr.Entities { /// /// 不良等级 diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcConfig.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcConfig.cs new file mode 100644 index 00000000..9312eb96 --- /dev/null +++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcConfig.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.QcMgr.Entities +{ + + /// + /// spc控制图系数 + /// + [SugarTable("qc_spc_config")] + public partial class QcSpcConfig : BaseEntity + { + public QcSpcConfig() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 控制图类型 + /// + public string? spctype { get; set; } + + /// + /// 子组容量 + /// + public string? subcapacity { get; set; } + + /// + /// 控制图键 + /// + public string? spckey { get; set; } + + /// + /// 控制图值 + /// + public decimal? spcdata { get; set; } + + } + +} diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcD.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcD.cs new file mode 100644 index 00000000..ec893256 --- /dev/null +++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcD.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.QcMgr.Entities +{ + /// + /// spc子表 + /// + [SugarTable("qc_spc_d")] + public partial class QcSpcD : BaseEntity + { + public QcSpcD() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 主表id + /// + public string? mainid { get; set; } + + /// + /// 检验时间 + /// + public string? checktime { get; set; } + + /// + /// 批次 + /// + public string? batch { get; set; } + + /// + /// 数据 + /// + public string? data { get; set; } + + /// + /// 检查数量 + /// + public int? checknum { get; set; } + + /// + /// 不良品数量 + /// + public int? defectivenum { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + } + +} diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcH.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcH.cs new file mode 100644 index 00000000..f0e96a3d --- /dev/null +++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcH.cs @@ -0,0 +1,160 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.QcMgr.Entities +{ + + /// + /// spc主表 + /// + [SugarTable("qc_spc_h")] + public partial class QcSpcH : BaseEntity + { + public QcSpcH() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 编号 + /// + public string? code { get; set; } + + /// + /// 检测项目 + /// + public string? checkproject { get; set; } + + /// + /// 检测类别 + /// + public string? checktype { get; set; } + + /// + /// 图类 + /// + public string? graphtype { get; set; } + + /// + /// 样本容量 + /// + public int? samplesize { get; set; } + + /// + /// 小数位数 + /// + public int? decimalplace { get; set; } + + /// + /// 产品名称 + /// + public string? productname { get; set; } + + /// + /// 任务单编号 + /// + public string? taskcode { get; set; } + + /// + /// 批次 + /// + public string? batch { get; set; } + + /// + /// 产线 + /// + public string? productline { get; set; } + + /// + /// 班次 + /// + public string? work { get; set; } + + /// + /// 设备 + /// + public string? device { get; set; } + + /// + /// 工序 + /// + public string? process { get; set; } + + /// + /// 供应商 + /// + public string? supplier { get; set; } + + /// + /// 客户 + /// + public string? custom { get; set; } + + /// + /// 规格上限 + /// + public decimal? uplimit { get; set; } + + /// + /// 目标值 + /// + public decimal? target { get; set; } + + /// + /// 规格下限 + /// + public decimal? lowerlimit { get; set; } + + /// + /// 子组容量 + /// + public int? subcapacity { get; set; } + + /// + /// 判异规则 + /// + public string? rule { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 流程任务Id + /// + public string? f_flowtaskid { get; set; } + + /// + /// 流程引擎Id + /// + public string? f_flowid { get; set; } + + } + +} diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs index 651f47e5..3f2544ec 100644 --- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs +++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tnb.QcMgr.Entities.Dto; +using Tnb.QcMgr.Entities; namespace Tnb.QcMgr.Interfaces { diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs index 2192f330..c48775a2 100644 --- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs +++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tnb.QcMgr.Entities; -using Tnb.QcMgr.Entities.Dto; namespace Tnb.QcMgr.Interfaces { diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs index 808b10f6..5eb82b69 100644 --- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tnb.QcMgr.Entities.Dto; +using Tnb.QcMgr.Entities; namespace Tnb.QcMgr.Interfaces { diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs index 1c373810..75c5ae9b 100644 --- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs +++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tnb.QcMgr.Entities; -using Tnb.QcMgr.Entities.Dto; namespace Tnb.QcMgr.Interfaces { diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs new file mode 100644 index 00000000..1d6b2afb --- /dev/null +++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tnb.QcMgr.Entities; + +namespace Tnb.QcMgr.Interfaces +{ + public interface IQcSpcService + { + /// + /// 获取spcd数据 + /// + /// + /// + public Task GetSpcItems(string id); + + /// + /// 保存spcd数据 + /// + /// + public Task SaveData(SpcDataInput SpcDataInput); + } +} diff --git a/QcMgr/Tnb.QcMgr/QcCheckItemService.cs b/QcMgr/Tnb.QcMgr/QcCheckItemService.cs index df3acbe1..fea60fdb 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckItemService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckItemService.cs @@ -22,7 +22,6 @@ using NPOI.Util; using SqlSugar; using Tnb.Common; using Tnb.QcMgr.Entities; -using Tnb.QcMgr.Entities.Dto; using Tnb.QcMgr.Interfaces; namespace Tnb.QcMgr diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs index a9f95453..15f413e1 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs @@ -25,7 +25,7 @@ using Newtonsoft.Json; using SqlSugar; using Tnb.ProductionMgr.Entities; using Tnb.QcMgr.Entities; -using Tnb.QcMgr.Entities.Dto; +using Tnb.QcMgr.Entities; using Tnb.QcMgr.Entities.Entity; using Tnb.QcMgr.Entities.Enums; using Tnb.QcMgr.Interfaces; diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs index 21c4a099..f33ee000 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs @@ -17,7 +17,6 @@ using Newtonsoft.Json; using SqlSugar; using Tnb.BasicData.Entities; using Tnb.QcMgr.Entities; -using Tnb.QcMgr.Entities.Dto; namespace Tnb.QcMgr { /// diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs index 7d57caca..431fd37d 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs @@ -27,7 +27,7 @@ using Tnb.EquipMgr.Entities; using Tnb.ProductionMgr.Entities.Dto; using Tnb.ProductionMgr.Entities; using Tnb.QcMgr.Entities; -using Tnb.QcMgr.Entities.Dto; +using Tnb.QcMgr.Entities; using Tnb.QcMgr.Entities.Entity; using Tnb.QcMgr.Interfaces; using JNPF.Common.Extension;