From 48f390cdb717c831c9f48fac1750907eb4b45756 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Fri, 17 Nov 2023 10:35:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E8=AE=BE=E5=A4=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/DictConst.cs | 4 + .../Dto/EquipListOuput.cs | 230 ++++++++++++++++++ .../Entity/EqpEquipment.cs | 4 - EquipMgr/Tnb.EquipMgr/EquipmentService.cs | 82 +++++++ 4 files changed, 316 insertions(+), 4 deletions(-) create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipListOuput.cs diff --git a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs index 95b03123..5789376a 100644 --- a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs +++ b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs @@ -280,6 +280,10 @@ public static class DictConst /// 设备保养类型 /// public const string EqpMaintainType = "EqpMaintainType"; + /// + /// 设备生命周期 + /// + public const string EquipmentLife = "EquipmentLife"; #endregion } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipListOuput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipListOuput.cs new file mode 100644 index 00000000..740787a3 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipListOuput.cs @@ -0,0 +1,230 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.EquipMgr.Entities; + + +public partial class EquipListOuput +{ + public string id { get; set; } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 设备代码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 设备名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 设备类型id + /// + public string equip_type_id { get; set; } = string.Empty; + + /// + /// 设备类型id + /// + public string equip_type_id_id { get; set; } = string.Empty; + + /// + /// 设备生产日期 + /// + public string? product_date { get; set; } + + /// + /// 设备生产厂家 + /// + public string? manufacturer { get; set; } + + /// + /// 使用部门id + /// + public string? use_department_id { get; set; } + + public string? use_department_id_id { get; set; } + + /// + /// 安装日期 + /// + public string install_date { get; set; } = string.Empty; + + /// + /// 使用日期 + /// + public DateTime? use_date { get; set; } + + /// + /// 验收日期 + /// + public DateTime? accept_date { get; set; } + + /// + /// 管理部门id + /// + public string? manage_department_id { get; set; } + + public string? manage_department_id_id { get; set; } + + /// + /// 设备生命周期 + /// + public string? life { get; set; } + + /// + /// 技改编码 + /// + public string? techno_logy_code { get; set; } + + /// + /// 备注 + /// + public string remark { get; set; } = string.Empty; + + /// + /// 时间戳 + /// + public string? timestamp { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + public string? create_id_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + public string? modify_id_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 扩展字段 + /// + public string? extras { get; set; } + + /// + /// 供应商id + /// + public string? supplier_id { get; set; } + + public string? supplier_id_id { get; set; } + + /// + /// 出厂编码 + /// + public string? factory_code { get; set; } + + /// + /// 合同/采购单号 + /// + public string? contract_no { get; set; } + + /// + /// 维保单位 + /// + public string? maintenance_unit { get; set; } + + /// + /// 维保电话 + /// + public string? maintenance_phone { get; set; } + + /// + /// 规格型号 + /// + public string? specification { get; set; } + + /// + /// 安装地点 + /// + public string? installation_location { get; set; } + + /// + /// 是否成套设备 + /// + public string is_complete_set { get; set; } = string.Empty; + + /// + /// DCS-ID + /// + public string? dcs_id { get; set; } + + /// + /// 技术参数 + /// + public string? technology_parameter { get; set; } + + /// + /// 状态 + /// + public string? status { get; set; } + + /// + /// 吨位 + /// + public decimal? tonnage { get; set; } + + /// + /// 设备机台号 + /// + public string? eqp_machine_num { get; set; } + + /// + /// 模具Id + /// + public string? mold_id { get; set; } + /// + /// 工位编码 + /// + public string? station_code { get; set; } + + /// + /// 质保开始时间 + /// + public DateTime? warranty_start_time { get; set; } + + /// + /// 质保结束时间 + /// + public DateTime? warranty_end_time { get; set; } + + /// + /// 责任人 + /// + public string? responsibler_id { get; set; } + + public string? responsibler_id_id { get; set; } + + /// + /// 二维码 + /// + public string? qrcode { get; set; } + + /// + /// 入库库位id + /// + public string? as_location_id { get; set; } + + public string? as_location_id_id { get; set; } + + +} diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs index 300bbf3d..c771febc 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs @@ -213,9 +213,5 @@ public partial class EqpEquipment : BaseEntity /// public string? as_location_id { get; set; } - /// - /// 第三方平台设备编号 - /// - public string? third_equip_code { get; set; } } diff --git a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs index 3630b578..ab32e0fa 100644 --- a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs @@ -6,6 +6,7 @@ using JNPF.DynamicApiController; using JNPF.Extras.CollectiveOAuth.Models; using JNPF.FriendlyException; using JNPF.Systems.Entitys.Permission; +using JNPF.Systems.Entitys.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; @@ -50,7 +51,88 @@ namespace Tnb.EquipMgr _userManager = userManager; OverideFuncs.CreateAsync = Create; OverideFuncs.UpdateAsync = Update; + OverideFuncs.GetListAsync = PageList; } + + private async Task PageList(VisualDevModelListQueryInput input) + { + Dictionary? queryJson = !string.IsNullOrEmpty(input.queryJson) ? Newtonsoft.Json.JsonConvert.DeserializeObject>(input.queryJson) : new Dictionary(); + string equip_type_id = queryJson.ContainsKey("equip_type_id") ? queryJson["equip_type_id"].ToString() : ""; + string code = queryJson.ContainsKey("code") ? queryJson["code"].ToString() : ""; + string name = queryJson.ContainsKey("name") ? queryJson["name"].ToString() : ""; + string contract_no = queryJson.ContainsKey("contract_no") ? queryJson["contract_no"].ToString() : ""; + + var result = await _repository.AsSugarClient().Queryable((a, b,c,d,e,f,g,h,i,j) => + new JoinQueryInfos( + JoinType.Left, a.use_department_id == b.Id, + JoinType.Left, a.manage_department_id == c.Id, + JoinType.Left, a.create_id == d.Id, + JoinType.Left, a.modify_id == e.Id, + JoinType.Left, a.supplier_id == f.id, + JoinType.Left, a.responsibler_id == g.Id, + JoinType.Left, a.as_location_id == h.id, + JoinType.Left, i.EnCode==DictConst.EquipmentLife, + JoinType.Left, i.Id==j.DictionaryTypeId && a.life==j.EnCode + )) + .WhereIF(!string.IsNullOrEmpty(equip_type_id),a=>a.equip_type_id==equip_type_id) + .WhereIF(!string.IsNullOrEmpty(code),a=>a.code.Contains(code)) + .WhereIF(!string.IsNullOrEmpty(name),a=>a.name.Contains(name)) + .WhereIF(!string.IsNullOrEmpty(contract_no),a=>a.contract_no.Contains(contract_no)) + .Select((a, b,c,d,e,f,g,h,i,j) => new EquipListOuput() + { + id = a.id, + org_id = a.org_id, + code = a.code , + name = a.name , + equip_type_id = a.equip_type_id , + product_date = a.product_date, + manufacturer = a.manufacturer, + use_department_id = b.FullName, + use_department_id_id = a.use_department_id, + install_date = a.install_date , + use_date = a.use_date, + accept_date = a.accept_date, + manage_department_id = c.FullName, + manage_department_id_id = a.manage_department_id, + life = j.FullName, + techno_logy_code = a.techno_logy_code, + remark = a.remark , + timestamp = a.timestamp, + create_id = d.RealName, + create_id_id = a.create_id, + create_time = a.create_time, + modify_id = e.RealName, + modify_id_id = a.modify_id, + modify_time = a.modify_time, + extras = a.extras, + supplier_id = f.supplier_name, + supplier_id_id = a.supplier_id, + factory_code = a.factory_code, + contract_no = a.contract_no, + maintenance_unit = a.maintenance_unit, + maintenance_phone = a.maintenance_phone, + specification = a.specification, + installation_location = a.installation_location, + is_complete_set = a.is_complete_set=="1" ? "是" : "否", + dcs_id = a.dcs_id, + technology_parameter = a.technology_parameter, + status = a.status, + tonnage = a.tonnage, + eqp_machine_num = a.eqp_machine_num, + mold_id = a.mold_id, + station_code = a.station_code, + warranty_start_time = a.warranty_start_time, + warranty_end_time = a.warranty_end_time, + responsibler_id = g.RealName, + responsibler_id_id = a.responsibler_id, + qrcode = a.qrcode, + as_location_id = h.location_name, + as_location_id_id = a.as_location_id, + }).ToPagedListAsync(input.currentPage,input.pageSize); + return PageResult.SqlSugarPageResult(result); + + } + /// /// 在线开发-获取设备列表 ///