From 52a16b0228c5c3828366c467f3af763e7ca44924 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 31 May 2023 17:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/DictConst.cs | 4 + .../Dto/EquipFileQueryOutput.cs | 14 +++ .../Dto/EquipMaintainRecordQueryOutput.cs | 21 +++++ .../Dto/EquipQueryInput.cs | 19 +++++ .../Dto/EquipRepairRecordQueryOutput.cs | 16 ++++ .../Dto/EquipSparePartsInput.cs | 9 ++ .../Dto/EquipSparePartsQueryOutput.cs | 13 +++ .../Dto/EquipSpotInsRecordQueryOutput.cs | 20 +++++ .../EquipTechnologyParameterQueryOutput.cs | 10 +++ .../Dto/SubEquipQueryOutput.cs | 18 ++++ .../Entity/EqpEquipSpareParts.cs | 52 ++++++++++++ .../Entity/EqpSpareParts.cs | 67 +++++++++++++++ .../Entity/EqpSubEquip.cs | 62 ++++++++++++++ .../Entity/EqpTechnologyParameter.cs | 62 ++++++++++++++ .../IEqpEquipFileService.cs | 6 ++ .../IEqpEquipSparePartsService.cs | 20 +++++ .../IEqpMaintainRecordService.cs | 6 ++ .../IEqpRepairApplyService.cs | 6 ++ .../IEqpSubEquipService.cs | 13 +++ .../IEqpTechnologyParameterService.cs | 12 +++ .../IEquSpotInsRecordService.cs | 6 ++ EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs | 35 +++++++- .../Tnb.EquipMgr/EqpEquipSparePartsService.cs | 85 +++++++++++++++++++ .../Tnb.EquipMgr/EqpRepairApplyService.cs | 33 +++++++ .../Tnb.EquipMgr/EqpRepairOutApplyService.cs | 1 - EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs | 67 +++++++++++++++ .../EqpTechnologyParameterService.cs | 52 ++++++++++++ .../Tnb.EquipMgr/EquMaintainRecordService.cs | 38 +++++++++ .../Tnb.EquipMgr/EquSpotInsRecordService.cs | 35 ++++++++ .../Entity/WmsCarryH.cs | 2 +- 30 files changed, 801 insertions(+), 3 deletions(-) create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpareParts.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSubEquip.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpTechnologyParameter.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipSparePartsService.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSubEquipService.cs create mode 100644 EquipMgr/Tnb.EquipMgr.Interfaces/IEqpTechnologyParameterService.cs create mode 100644 EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs create mode 100644 EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs create mode 100644 EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs diff --git a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs index eecc7bef..11e85654 100644 --- a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs +++ b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs @@ -11,6 +11,10 @@ public static class DictConst /// 区域类型-工位Code /// public const string RegionCategoryStationCode = "workstation"; + /// + /// 备品备件类型 + /// + public const string SparePartsType = "SparePartsType"; #endregion diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs new file mode 100644 index 00000000..2b280b55 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs @@ -0,0 +1,14 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipFileQueryOutput + { + public string id { get; set; } + public string attachment { get; set; } + public string create_id { get; set; } + public string create_id_id { get; set; } + public string create_time { get; set; } + public string equip_id { get; set; } + public string equip_id_id { get; set; } + public string file_name { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs new file mode 100644 index 00000000..a8978a55 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs @@ -0,0 +1,21 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipMaintainRecordQueryOutput + { + public string id { get; set; } + public string attachment { get; set; } + public string create_time { get; set; } + public string equip_id { get; set; } + public string equip_id_id { get; set; } + public string execute_time { get; set; } + public string execute_user_id { get; set; } + public string repeat_remark { get; set; } + public string repeat_result { get; set; } + public string repeat_time { get; set; } + public string repeat_user_id { get; set; } + public string result { get; set; } + public string result_remark { get; set; } + public string maintain_tem_equip_id { get; set; } + public string status { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs new file mode 100644 index 00000000..80af62d9 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs @@ -0,0 +1,19 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipQueryInput + { + public string equip_id { get; set; } + + /// + /// 当前页码:pageIndex. + /// + public virtual int currentPage { get; set; } = 1; + + /// + /// 每页行数. + /// + public virtual int pageSize { get; set; } = 50; + + public string queryJson { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs new file mode 100644 index 00000000..ba539654 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRecordQueryOutput.cs @@ -0,0 +1,16 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipRepairRecordQueryOutput + { + public string id { get; set; } + public string code { get; set; } + public string name { get; set; } + public string equip_id { get; set; } + public string apply_user_id { get; set; } + public string is_ugent { get; set; } + public string description { get; set; } + public string complete_time { get; set; } + public string repairer_id { get; set; } + public string repair_description { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs new file mode 100644 index 00000000..69b222b3 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs @@ -0,0 +1,9 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipSparePartsInput + { + public string equip_id { get; set; } + + public List spare_parts_ids { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs new file mode 100644 index 00000000..2e35315d --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs @@ -0,0 +1,13 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipSparePartsQueryOutput + { + public string id { get; set; } + public string type_code { get; set; } + public string type_name { get; set; } + public string code { get; set; } + public string name { get; set; } + public string specification { get; set; } + + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs new file mode 100644 index 00000000..b0162c36 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSpotInsRecordQueryOutput.cs @@ -0,0 +1,20 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipSpotInsRecordQueryOutput + { + public string id { get; set; } + public string attachment { get; set; } + public string create_time { get; set; } + public string equip_id { get; set; } + public string repeat_remark { get; set; } + public string repeat_result { get; set; } + public string repeat_time { get; set; } + public string repeat_user_id { get; set; } + public string result { get; set; } + public string result_remark { get; set; } + public string spot_ins_tem_equip_id { get; set; } + public string spot_record_date_time { get; set; } + public string spot_record_user_id { get; set; } + public string status { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs new file mode 100644 index 00000000..d1e91278 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipTechnologyParameterQueryOutput.cs @@ -0,0 +1,10 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class EquipTechnologyParameterQueryOutput + { + public string id { get; set; } + public string name { get; set; } + public string definition { get; set; } + public string remark { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs new file mode 100644 index 00000000..32200413 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/SubEquipQueryOutput.cs @@ -0,0 +1,18 @@ +namespace Tnb.EquipMgr.Entities.Dto +{ + public class SubEquipQueryOutput + { + public string code { get; set; } + public string create_id { get; set; } + public string create_id_id { get; set; } + public string create_time { get; set; } + public string equip_id { get; set; } + public string equip_id_id { get; set; } + public string id { get; set; } + public string modify_id { get; set; } + public string modify_time { get; set; } + public string name { get; set; } + public string org_id { get; set; } + public string specification { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs new file mode 100644 index 00000000..64136645 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipSpareParts.cs @@ -0,0 +1,52 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.EquipMgr.Entities; + +/// +/// 设备备品备件关联表 +/// +[SugarTable("eqp_equip_spare_parts")] +public partial class EqpEquipSpareParts : BaseEntity +{ + public EqpEquipSpareParts() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 设备id + /// + public string equip_id { get; set; } = string.Empty; + + /// + /// 备品备件id + /// + public string spare_parts_id { get; set; } = string.Empty; + + /// + /// 创建用户 + /// + 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; } + +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpareParts.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpareParts.cs new file mode 100644 index 00000000..264d8ea1 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpareParts.cs @@ -0,0 +1,67 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.EquipMgr.Entities; + +/// +/// 备品备件 +/// +[SugarTable("eqp_spare_parts")] +public partial class EqpSpareParts : BaseEntity +{ + public EqpSpareParts() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 类型id + /// + public string type_id { get; set; } = string.Empty; + + /// + /// 编码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 规格型号 + /// + public string? specification { 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; } + + /// + /// 备注 + /// + public string? remark { get; set; } + +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSubEquip.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSubEquip.cs new file mode 100644 index 00000000..6d4ee06f --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSubEquip.cs @@ -0,0 +1,62 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.EquipMgr.Entities; + +/// +/// 设备子设备关联表 +/// +[SugarTable("eqp_sub_equip")] +public partial class EqpSubEquip : BaseEntity +{ + public EqpSubEquip() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 编码 + /// + public string code { get; set; } = string.Empty; + + /// + /// 名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 规格型号 + /// + public string? specification { 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 equip_id { get; set; } = string.Empty; + +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpTechnologyParameter.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpTechnologyParameter.cs new file mode 100644 index 00000000..18494867 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpTechnologyParameter.cs @@ -0,0 +1,62 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.EquipMgr.Entities; + +/// +/// 设备技术参数 +/// +[SugarTable("eqp_technology_parameter")] +public partial class EqpTechnologyParameter : BaseEntity +{ + public EqpTechnologyParameter() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 名称 + /// + public string name { get; set; } = string.Empty; + + /// + /// 定义 + /// + public string definition { get; set; } = string.Empty; + + /// + /// 备注 + /// + public string? remark { 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 equip_id { get; set; } = string.Empty; + +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipFileService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipFileService.cs index 6f685177..3d47193f 100644 --- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipFileService.cs +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipFileService.cs @@ -11,5 +11,11 @@ namespace Tnb.EquipMgr.Interfaces ///// ///// //public Task Upload(string equip_id,IFormFile file); + + /// + /// 根据设备id获取设备附件 + /// + /// + public Task GetEquipFileList(EquipQueryInput input); } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipSparePartsService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipSparePartsService.cs new file mode 100644 index 00000000..38a1bcb0 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipSparePartsService.cs @@ -0,0 +1,20 @@ +using Tnb.EquipMgr.Entities.Dto; + +namespace Tnb.EquipMgr.Interfaces +{ + public interface IEqpEquipSparePartsService + { + /// + /// 新增备品备件 + /// + /// + /// + public Task AddEquipSpareParts(EquipSparePartsInput input); + + /// + /// 根据设备id获取备品备件 + /// + /// + public Task GetEquipSparePartsList(EquipQueryInput input); + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpMaintainRecordService.cs index 387129b3..3ca7ee5a 100644 --- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpMaintainRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpMaintainRecordService.cs @@ -25,6 +25,12 @@ namespace Tnb.EquipMgr.Interfaces /// /// public Task RepeatMaintain(MaintainRecordRepeatInput input); + + /// + /// 根据设备id获取设备保养记录 + /// + /// + public Task GetMaintainRecordList(EquipQueryInput input); } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs index eee44398..f23044b1 100644 --- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs @@ -53,5 +53,11 @@ namespace Tnb.EquipMgr.Interfaces /// /// public Task GetRepairApplyDetail(Dictionary dic); + + /// + /// 根据设备id获取维修记录 + /// + /// + public Task GetRepairRecordList(EquipQueryInput input); } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSubEquipService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSubEquipService.cs new file mode 100644 index 00000000..45b03060 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSubEquipService.cs @@ -0,0 +1,13 @@ +using Tnb.EquipMgr.Entities.Dto; + +namespace Tnb.EquipMgr.Interfaces +{ + public interface IEqpSubEquipService + { + /// + /// 根据设备id获取子设备 + /// + /// + public Task GetSubEquipList(EquipQueryInput input); + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpTechnologyParameterService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpTechnologyParameterService.cs new file mode 100644 index 00000000..2c5212c7 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEqpTechnologyParameterService.cs @@ -0,0 +1,12 @@ +using Tnb.EquipMgr.Entities.Dto; +namespace Tnb.EquipMgr.Interfaces +{ + public interface IEqpTechnologyParameterService + { + /// + /// 根据设备id获取技术参数 + /// + /// + public Task GetEquipTechnologyParameterList(EquipQueryInput input); + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs index b639f300..43c849fc 100644 --- a/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs @@ -25,6 +25,12 @@ namespace Tnb.EquipMgr.Interfaces /// /// public Task RepeatSpotIns(SpotInsRecordRepeatInput input); + + /// + /// 根据设备id获取点巡检记录 + /// + /// + public Task GetSpotInsRecordList(EquipQueryInput input); } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs b/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs index 3367ffc3..adc74cac 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs @@ -1,12 +1,14 @@ using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Enums; +using JNPF.Common.Filter; using JNPF.Common.Models; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; using JNPF.Logging; using JNPF.Systems.Common; +using JNPF.Systems.Entitys.Permission; using JNPF.Systems.Interfaces.Common; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; @@ -56,7 +58,8 @@ namespace Tnb.EquipMgr equip_id = equip_id, create_id = _userManager.UserId, create_time = DateTime.Now, - attachment = JsonConvert.SerializeObject(attachment) + attachment = JsonConvert.SerializeObject(attachment), + org_id = _userManager.GetUserInfo().Result.organizeId, }; await _repository.InsertAsync(eqpEquipFile); @@ -71,5 +74,35 @@ namespace Tnb.EquipMgr return msg; } + + [HttpPost] + public async Task GetEquipFileList(EquipQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary queryJson = new Dictionary(); + if (!string.IsNullOrEmpty(input.queryJson)) + { + queryJson = JsonConvert.DeserializeObject>(input.queryJson); + } + var result = await db.Queryable() + .LeftJoin((a, b) => a.create_id == b.Id) + .LeftJoin((a, b,c) => a.modify_id == c.Id) + .LeftJoin((a, b,c,d) => a.equip_id == d.id) + .Where((a,b,c,d)=>a.equip_id==input.equip_id) + .WhereIF(queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson["file_name"])) + .Select((a, b, c,d) => new EquipFileQueryOutput + { + id = a.id, + attachment = a.attachment, + create_id = b.RealName, + create_id_id = a.create_id, + create_time = a.create_time.Value.ToString("yyyy-MM-dd"), + equip_id=d.name, + equip_id_id= a.equip_id, + file_name=a.file_name, + }).ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs b/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs new file mode 100644 index 00000000..59dc823d --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs @@ -0,0 +1,85 @@ +using JNPF.Common.Core.Manager; +using JNPF.Common.Filter; +using JNPF.Common.Security; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using JNPF.Systems.Entitys.Permission; +using JNPF.Systems.Entitys.System; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SqlSugar; +using Tnb.EquipMgr.Entities; +using Tnb.EquipMgr.Entities.Dto; +using Tnb.EquipMgr.Interfaces; + +namespace Tnb.EquipMgr +{ + /// 设备备品备件 + /// + [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + public class EqpEquipSparePartsService : IEqpEquipSparePartsService, IDynamicApiController, ITransient + { + private readonly ISqlSugarRepository _repository; + private readonly IUserManager _userManager; + + public EqpEquipSparePartsService(ISqlSugarRepository repository, IUserManager userManager) + { + _userManager = userManager; + _repository = repository; + } + + [HttpPost] + public async Task AddEquipSpareParts(EquipSparePartsInput input) + { + List oldList = await _repository.GetListAsync(x => x.equip_id == input.equip_id); + List list = new List(); + string orgId = _userManager.GetUserInfo().Result.organizeId; + foreach (var spare_parts_id in input.spare_parts_ids) + { + if (oldList.Any(x => x.spare_parts_id == spare_parts_id)) + continue; + list.Add(new EqpEquipSpareParts() + { + id = SnowflakeIdHelper.NextId(), + equip_id = input.equip_id, + spare_parts_id = spare_parts_id, + create_id = _userManager.UserId, + create_time = DateTime.Now, + org_id = orgId, + }); + } + + await _repository.InsertRangeAsync(list); + } + + [HttpPost] + public async Task GetEquipSparePartsList(EquipQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary queryJson = new Dictionary(); + if (!string.IsNullOrEmpty(input.queryJson)) + { + queryJson = JsonConvert.DeserializeObject>(input.queryJson); + } + var result = await db.Queryable() + .LeftJoin((a,b)=>a.spare_parts_id==b.id) + .LeftJoin((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null) + .LeftJoin((a, b,c,d) => d.DictionaryTypeId == c.Id && b.type_id == d.EnCode) + .Where((a,b,c,d)=>a.equip_id==input.equip_id) + .WhereIF(queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson["code"])) + .WhereIF(queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson["name"])) + .Select((a, b, c,d) => new EquipSparePartsQueryOutput + { + id = a.id, + type_code = d.EnCode, + type_name = d.FullName, + code = b.code, + name = b.name, + specification = b.specification + }).ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs index 79cc078a..18f17524 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs @@ -1,10 +1,13 @@ using JNPF.Common.Core.Manager; using JNPF.Common.Enums; +using JNPF.Common.Filter; using JNPF.Common.Security; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; +using JNPF.Systems.Entitys.Permission; using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; using SqlSugar; using Tnb.EquipMgr.Entities; using Tnb.EquipMgr.Entities.Dto; @@ -129,5 +132,35 @@ namespace Tnb.EquipMgr eqpRepairOutApply = eqpRepairOutApply, }; } + + [HttpPost] + public async Task GetRepairRecordList(EquipQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary queryJson = new Dictionary(); + if (!string.IsNullOrEmpty(input.queryJson)) + { + queryJson = JsonConvert.DeserializeObject>(input.queryJson); + } + var result = await db.Queryable() + .LeftJoin((a,b)=>a.apply_user_id==b.Id) + .LeftJoin((a,b,c)=>a.repairer_id==c.Id) + .Where(a=>a.equip_id==input.equip_id) + .Select((a,b,c) => new EquipRepairRecordQueryOutput + { + id = a.id, + equip_id = a.equip_id, + code = a.code, + name = a.name, + apply_user_id =b.RealName, + is_ugent = a.is_ugent==1 ? "是" : "否", + description = a.description, + repair_description = a.repair_description, + complete_time = a.complete_time.Value.ToString("yyyy-MM-dd HH:mm"), + repairer_id = c.RealName + }).ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs index 3d6f461a..400d3677 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairOutApplyService.cs @@ -100,7 +100,6 @@ namespace Tnb.EquipMgr if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); - //todo 退回流程 if (result.IsSuccess) { if (string.IsNullOrEmpty(input.id)) diff --git a/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs b/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs new file mode 100644 index 00000000..f7059e63 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr/EqpSubEquipService.cs @@ -0,0 +1,67 @@ +using JNPF.Common.Core.Manager; +using JNPF.Common.Filter; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using JNPF.Systems.Entitys.Permission; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SqlSugar; +using Tnb.EquipMgr.Entities; +using Tnb.EquipMgr.Entities.Dto; +using Tnb.EquipMgr.Interfaces; + +namespace Tnb.EquipMgr +{ + /// + /// 设备保养计划执行管理 + /// + [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + public class EqpSubEquipService : IEqpSubEquipService, IDynamicApiController, ITransient + { + private readonly ISqlSugarRepository _repository; + private readonly IUserManager _userManager; + + public EqpSubEquipService(ISqlSugarRepository repository, + IUserManager userManager) + { + _repository = repository; + _userManager = userManager; + } + + [HttpPost] + public async Task GetSubEquipList(EquipQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary queryJson = new Dictionary(); + if (!string.IsNullOrEmpty(input.queryJson)) + { + queryJson = JsonConvert.DeserializeObject>(input.queryJson); + } + var result = await db.Queryable() + .LeftJoin((a, b) => a.create_id == b.Id) + .LeftJoin((a, b,c) => a.modify_id == c.Id) + .LeftJoin((a, b,c,d) => a.equip_id == d.id) + .Where((a,b,c,d)=>a.equip_id==input.equip_id) + .WhereIF(queryJson.ContainsKey("code"),(a,b,c,d)=>a.code.Contains(queryJson["code"])) + .WhereIF(queryJson.ContainsKey("name"),(a,b,c,d)=>a.name.Contains(queryJson["name"])) + .Select((a, b, c,d) => new SubEquipQueryOutput + { + id = a.id, + create_id = b.RealName, + create_id_id = a.create_id, + create_time = a.create_time.Value.ToString("yyyy-MM-dd"), + equip_id=d.name, + equip_id_id= a.equip_id, + code = a.code, + modify_id = c.RealName, + modify_time = a.modify_time.Value.ToString("yyyy-MM-dd"), + name = a.name, + org_id = a.org_id, + specification = a.specification, + }).ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs b/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs new file mode 100644 index 00000000..b36da391 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr/EqpTechnologyParameterService.cs @@ -0,0 +1,52 @@ +using JNPF.Common.Core.Manager; +using JNPF.Common.Filter; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SqlSugar; +using Tnb.EquipMgr.Entities; +using Tnb.EquipMgr.Entities.Dto; +using Tnb.EquipMgr.Interfaces; + +namespace Tnb.EquipMgr +{ + /// 设备备品备件 + /// + [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + public class EqpTechnologyParameterService : IEqpTechnologyParameterService, IDynamicApiController, ITransient + { + private readonly ISqlSugarRepository _repository; + private readonly IUserManager _userManager; + + public EqpTechnologyParameterService(ISqlSugarRepository repository, IUserManager userManager) + { + _userManager = userManager; + _repository = repository; + } + + [HttpPost] + public async Task GetEquipTechnologyParameterList(EquipQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary queryJson = new Dictionary(); + if (!string.IsNullOrEmpty(input.queryJson)) + { + queryJson = JsonConvert.DeserializeObject>(input.queryJson); + } + var result = await db.Queryable() + .Where(a=>a.equip_id==input.equip_id) + .WhereIF(queryJson.ContainsKey("name"),a=>a.name.Contains(queryJson["name"])) + .Select(a => new EquipTechnologyParameterQueryOutput + { + id = a.id, + name = a.name, + definition = a.definition, + remark = a.remark + }).ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs index 0d526d9b..62c6dc6f 100644 --- a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs @@ -1,9 +1,11 @@ using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Enums; +using JNPF.Common.Filter; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; +using JNPF.Systems.Entitys.Permission; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Interfaces; @@ -142,5 +144,41 @@ namespace Tnb.EquipMgr if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008); return result.IsSuccess ? "复核成功" : result.ErrorMessage; } + + [HttpPost] + public async Task GetMaintainRecordList(EquipQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary queryJson = new Dictionary(); + if (!string.IsNullOrEmpty(input.queryJson)) + { + queryJson = JsonConvert.DeserializeObject>(input.queryJson); + } + var result = await db.Queryable() + .LeftJoin((a,b)=>a.equip_id==b.id) + .LeftJoin((a,b,c)=>a.execute_user_id==c.Id) + .LeftJoin((a,b,c,d)=>a.repeat_user_id==d.Id) + .Where(a=>a.equip_id==input.equip_id) + .Select((a,b,c,d) => new EquipMaintainRecordQueryOutput + { + id = a.id, + attachment = a.attachment, + create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), + equip_id = b.code, + equip_id_id = a.equip_id, + repeat_remark = a.repeat_remark, + repeat_result = a.repeat_result=="1"?"合格":"不合格", + repeat_time = a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"), + repeat_user_id = d.RealName, + result = a.result=="1"?"合格":"不合格", + result_remark = a.result_remark, + maintain_tem_equip_id = a.maintain_tem_equip_id, + execute_time = a.execute_time.Value.ToString("yyyy-MM-dd HH:mm"), + execute_user_id = c.RealName, + status = SqlFunc.IF(a.status.Equals("1")).Return("待执行").ElseIF(a.status.Equals("2")).Return("待复核").ElseIF(a.status.Equals("3")).Return("已完成").End("") + }).ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + } } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs index cf3a76aa..f3b10465 100644 --- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs +++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs @@ -1,9 +1,11 @@ using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Enums; +using JNPF.Common.Filter; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; +using JNPF.Systems.Entitys.Permission; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Interfaces; @@ -126,5 +128,38 @@ namespace Tnb.EquipMgr status = SpotInsRecordExecutionStatus.COMPLETED }, x => x.id == input.id); } + + [HttpPost] + public async Task GetSpotInsRecordList(EquipQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary queryJson = new Dictionary(); + if (!string.IsNullOrEmpty(input.queryJson)) + { + queryJson = JsonConvert.DeserializeObject>(input.queryJson); + } + var result = await db.Queryable() + .LeftJoin((a,b)=>a.repeat_user_id==b.Id) + .Where(a=>a.equip_id==input.equip_id) + .Select((a,b) => new EquipSpotInsRecordQueryOutput + { + id = a.id, + attachment = a.attachment, + create_time = a.create_time.Value.ToString("yyyy-MM-dd HH:mm"), + equip_id = a.equip_id, + repeat_remark = a.repeat_remark, + repeat_result = a.repeat_result=="1"?"合格":"不合格", + repeat_time = a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm"), + repeat_user_id = b.RealName, + result = a.result=="1"?"合格":"不合格", + result_remark = a.result_remark, + spot_ins_tem_equip_id = a.spot_ins_tem_equip_id, + spot_record_date_time = a.spot_record_date_time.Value.ToString("yyyy-MM-dd HH:mm"), + spot_record_user_id = a.spot_record_user_id, + status = SqlFunc.IF(a.status.Equals("1")).Return("待执行").ElseIF(a.status.Equals("2")).Return("待复核").ElseIF(a.status.Equals("3")).Return("已完成").End("") + }).ToPagedListAsync(input.currentPage, input.pageSize); + + return PageResult.SqlSugarPageResult(result); + } } } \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs index 76092322..3bdce8b2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs @@ -42,7 +42,7 @@ public partial class WmsCarryH : BaseEntity /// /// 载具状态 /// - public int carry_status { get; set; }; + public int carry_status { get; set; } /// /// 载具分类ID