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

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
EquipMgr/Tnb.EquipMgr.Entities/Consts/MoldPlanMaintainStatus.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Consts
namespace Tnb.EquipMgr.Entities.Consts
{
public class MoldPlanMaintainStatus
{

8
EquipMgr/Tnb.EquipMgr.Entities/Consts/MoldUseStatus.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Consts
namespace Tnb.EquipMgr.Entities.Consts
{
public class MoldUseStatus
{

4
EquipMgr/Tnb.EquipMgr.Entities/Consts/SpotInsRecordExecutionStatus.cs
View File

@@ -9,12 +9,12 @@ namespace Tnb.EquipMgr
/// 待执行
/// </summary>
public const string TOBEEXECUTED = "1";
/// <summary>
/// 待复核
/// </summary>
public const string TOBECHECK = "2";
/// <summary>
/// 已完成
/// </summary>

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/BaseMoldMaintainInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class BaseMoldMaintainInput
{

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/CheckItemOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class CheckItemOutput
{

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/CheckItemQueryinput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 根据模具ID、计划ID获取，保养组及项目信息

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/ClosedownEndListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class ClosedownEndListOutput
{

6
EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpMaintainRecordListOutput.cs
View File

@@ -14,11 +14,11 @@ namespace Tnb.EquipMgr.Entities.Dto
public string execute_time { get; set; }
public string repeat_user_id { get; set; }
public string repeat_user_id_id { get; set; }
public string execute_user_id{ get; set; }
public string execute_user_id { get; set; }
public string execute_user_id_id { get; set; }
public string repeat_time { get; set; }
public string last_execute_time { get; set; }
public string last_execute_time { get; set; }
public DateTime? date_repeat_time { get; set; }
public DateTime? date_create_time { get; set; }
public DateTime? date_execute_time { get; set; }

4
EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs
View File

@@ -12,10 +12,10 @@ namespace Tnb.EquipMgr.Entities.Dto
public string spot_record_date_time { get; set; }
public string repeat_user_id { get; set; }
public string repeat_user_id_id { get; set; }
public string spot_record_user_id{ get; set; }
public string spot_record_user_id { get; set; }
public string spot_record_user_id_id { get; set; }
public string repeat_time { get; set; }
public DateTime? date_repeat_time { get; set; }
public DateTime? date_create_time { get; set; }
public DateTime? date_spot_record_date_time { get; set; }

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipDaqQueryOutput.cs
View File

@@ -5,7 +5,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public string? id { get; set; }
public string? data_source { get; set; }
public string create_id { get; set; } = string.Empty;
public string? create_time { get; set; }
public string? create_time { get; set; }
public string? data_type { get; set; }
public string? enabled { get; set; }
public string? equip_id { get; set; }

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipFileQueryOutput.cs
View File

@@ -6,7 +6,7 @@ namespace Tnb.EquipMgr.Entities.Dto
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? create_time { get; set; }
public string? equip_id { get; set; }
public string? equip_id_id { get; set; }
public string? file_name { get; set; }

4
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs
View File

@@ -3,7 +3,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public class EquipQueryInput
{
public string equip_id { get; set; } = string.Empty;
/// <summary>
/// 当前页码:pageIndex.
/// </summary>
@@ -13,7 +13,7 @@ namespace Tnb.EquipMgr.Entities.Dto
/// 每页行数.
/// </summary>
public virtual int pageSize { get; set; } = 50;
public string? queryJson { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipRepairRefuseInput.cs
View File

@@ -4,6 +4,6 @@ namespace Tnb.EquipMgr.Entities.Dto
{
public string id { get; set; } = string.Empty;
public string reason { get; set; } = string.Empty;
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsInput.cs
View File

@@ -3,7 +3,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public class EquipSparePartsInput
{
public string equip_id { get; set; } = string.Empty;
public List<string>? spare_parts_ids { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipSparePartsQueryOutput.cs
View File

@@ -8,6 +8,6 @@ namespace Tnb.EquipMgr.Entities.Dto
public string? code { get; set; }
public string? name { get; set; }
public string? specification { get; set; }
}
}

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipmentListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 设备列表输出类

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainInfoQueryinput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class MaintainInfoQueryinput
{

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainPlanCrInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 生成保养计划输入参数

9
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainPlanMoldLstOutput.cs
View File

@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using NPOI.HSSF.Record.Chart;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 保养计划模具列表输出参数

6
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatInput.cs
View File

@@ -5,9 +5,9 @@ namespace Tnb.EquipMgr.Entities.Dto
public string id { get; set; } = string.Empty;
public string repeat_result { get; set; } = string.Empty;
public string? repeat_remark { get; set; }
public List<Dictionary<string,string>>? details { get; set; }
public List<Dictionary<string, string>>? details { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRecordRepeatOutput.cs
View File

@@ -3,7 +3,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public class MaintainRecordRepeatOutput
{
public EqpMaintainRecordH? model { get; set; }
public List<EqpMaintainRecordD>? details { get; set; }
}
}

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRuleMoldListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 保养规则关联模具列表输出参数

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainStatusUpInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 修改维修单任务状态输入参数
@@ -18,6 +12,6 @@ namespace Tnb.EquipMgr.Entities.Dto
/// <summary>
/// 维修单状态 DWX(待维修)、WXZ(维修中)、YWC(已维修)
/// </summary>
public string status { get; set; }
public string status { get; set; }
}
}

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaterialListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 物料列表输出类

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class RelevanceMoldListOutput
{

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainDelInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具保养删除参数

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainGroupItemRelationInput.cs
View File

@@ -1,15 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 关联保养组与模具输入参数
/// </summary>
public class MoldMaintainGroupItemRelationInput :BaseMoldMaintainInput
public class MoldMaintainGroupItemRelationInput : BaseMoldMaintainInput
{
}
}

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainItemInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具保养项输入参数

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainItemListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具保养项列表输出

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainPlanRunQueryOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具保养计划执行查询输出参数

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainRunUpInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具保养执行输入参数
@@ -34,7 +28,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public string starttime { get; set; }
}
public class MaintainItemInfo
public class MaintainItemInfo
{
public string item_group_id { get; set; }

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainUpInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class MoldMaintainUpInput
{
@@ -15,6 +9,6 @@ namespace Tnb.EquipMgr.Entities.Dto
/// <summary>
/// 维修状态
/// </summary>
public string status{ get; set; }
public string status { get; set; }
}
}

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldRuleSelectorListOutput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具规则选择列表输出类

9
EquipMgr/Tnb.EquipMgr.Entities/Dto/PadMainListOutput.cs
View File

@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class PadMainListOutput
{

6
EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs
View File

@@ -5,11 +5,11 @@ namespace Tnb.EquipMgr.Entities.Dto
public class PadRepairListInput : PageInputBase
{
public string status { get; set; }
public string equip_info { get; set; }
public DateTime? start_time { get; set; }
public DateTime? end_time { get; set; }
}
}

4
EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListOutput.cs
View File

@@ -3,9 +3,9 @@ namespace Tnb.EquipMgr.Entities.Dto
public class PadRepairListOutput
{
public string id { get; set; }
public string code { get; set; }
public string name { get; set; }
public string equip_id { get; set; }
public string equip_id_id { get; set; }

7
EquipMgr/Tnb.EquipMgr.Entities/Dto/PdaMaintainInput.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Filter;
using JNPF.Common.Filter;
namespace Tnb.EquipMgr.Entities.Dto
{

4
EquipMgr/Tnb.EquipMgr.Entities/Dto/PdaRepairApplyListOutput.cs
View File

@@ -13,9 +13,9 @@ namespace Tnb.EquipMgr.Entities.Dto
public string status { get; set; }
public string repairer_id { get; set; }
public string? repairer_id_id { get; set; }
public string apply_user_id { get; set; }
public string apply_user_id_id { get; set; }
}
}

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/RelevanceMoldFromPlanInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具保养计划制定-计划关联模具输入参数

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/RelevanceMoldInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
/// <summary>
/// 模具规则定义，关键模具输入参数
@@ -27,7 +21,7 @@ namespace Tnb.EquipMgr.Entities.Dto
}
public class RowIdItem
public class RowIdItem
{
/// <summary>
/// 模具id

12
EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyOutRegisterInput.cs
View File

@@ -3,22 +3,22 @@ namespace Tnb.EquipMgr.Entities.Dto
public class RepairApplyOutRegisterInput
{
public string? id { get; set; }
/// <summary>
/// 实际维修供应商id
/// </summary>
public string? real_supplier_id { get; set; }
/// <summary>
/// 附件
/// </summary>
public string? attachment { get; set; }
/// <summary>
/// 费用
/// </summary>
public decimal? cost { get; set; }
/// <summary>
/// 修复时间
/// </summary>
@@ -28,12 +28,12 @@ namespace Tnb.EquipMgr.Entities.Dto
/// 维修耗时
/// </summary>
public decimal? repair_take_time { get; set; }
/// <summary>
/// 维修备注
/// </summary>
public string? repair_remark { get; set; }
/// <summary>
/// 报修申请id
/// </summary>

16
EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs
View File

@@ -3,27 +3,27 @@ namespace Tnb.EquipMgr.Entities.Dto
public class RepairApplyRegisterInput
{
public string? id { get; set; }
/// <summary>
/// 故障ID
/// </summary>
public string? fault_id { get; set; }
/// <summary>
/// 是否完成
/// </summary>
public string? is_complete { get; set; }
/// <summary>
/// 完成时间
/// </summary>
public DateTime? complete_time { get; set; }
/// <summary>
/// 维修耗时
/// </summary>
public int? repair_take_time { get; set; }
/// <summary>
/// 是否停机
/// </summary>
@@ -33,17 +33,17 @@ namespace Tnb.EquipMgr.Entities.Dto
/// 停机时长
/// </summary>
public int? halt_take_time { get; set; }
/// <summary>
/// 维修描述
/// </summary>
public string? repair_description { get; set; }
/// <summary>
/// 维修图片
/// </summary>
public string? repair_img { get; set; }
/// <summary>
/// 是否外修
/// </summary>

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairDelayInput.cs
View File

@@ -3,15 +3,15 @@ namespace Tnb.EquipMgr.Entities.Dto
public class RepairDelayInput
{
public string? repair_apply_id { get; set; }
public string? equip_id { get; set; }
public string? repair_request_sender_id { get; set; }
public string? repair_sender_id { get; set; }
public DateTime expected_time { get; set; }
public string? delay_reason { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairOutApplyInput.cs
View File

@@ -10,6 +10,6 @@ namespace Tnb.EquipMgr.Entities.Dto
public string? construction_period_requirement { get; set; }
public string? out_apply_reason { get; set; }
public string? remark { get; set; }
}
}

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordExecuteInput.cs
View File

@@ -3,13 +3,13 @@ namespace Tnb.EquipMgr.Entities.Dto
public class SpotInsRecordExecuteInput
{
public string? id { get; set; }
public string? attachment { get; set; }
public string? result { get; set; }
public string? result_remark { get; set; }
public List<Dictionary<string,string>>? details { get; set; }
public List<Dictionary<string, string>>? details { get; set; }
}
}

4
EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatInput.cs
View File

@@ -3,9 +3,9 @@ namespace Tnb.EquipMgr.Entities.Dto
public class SpotInsRecordRepeatInput
{
public string? id { get; set; }
public string? repeat_result { get; set; }
public string? repeat_remark { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsRecordRepeatOutput.cs
View File

@@ -3,7 +3,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public class SpotInsRecordRepeatOutput
{
public EqpSpotInsRecordH? model { get; set; }
public List<EqpSpotInsRecordD>? details { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/SpotInsTemPublishInput.cs
View File

@@ -3,7 +3,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public class SpotInsTemPublishInput
{
public string? id { get; set; }
public string[]? equipIds { get; set; }
}
}

8
EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities
namespace Tnb.EquipMgr.Entities
{
public class ToolInput
{

10
EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolMoldInput.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
namespace Tnb.EquipMgr.Entities.Dto
{
public class ToolMoldInput
{
@@ -16,5 +10,5 @@ namespace Tnb.EquipMgr.Entities.Dto
public string[] molds { get; set; }
}
}

2
EquipMgr/Tnb.EquipMgr.Entities/Dto/WorklineAndEquipTreeOutput.cs
View File

@@ -7,7 +7,7 @@ namespace Tnb.EquipMgr.Entities.Dto
/// </summary>
/// <returns></returns>
public string id { get; set; }
/// <summary>
/// 标题
/// </summary>

10
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs
View File

@@ -187,12 +187,12 @@ public partial class EqpEquipment : BaseEntity<string>
/// 工位编码
/// </summary>
public string? station_code { get; set; }
/// <summary>
/// 质保开始时间
/// </summary>
public DateTime? warranty_start_time { get; set; }
/// <summary>
/// 质保结束时间
/// </summary>
@@ -207,17 +207,17 @@ public partial class EqpEquipment : BaseEntity<string>
/// 二维码
/// </summary>
public string? qrcode { get; set; }
/// <summary>
/// 挤出件类型
/// </summary>
public string? tube { get; set; }
/// <summary>
/// 入库库位id
/// </summary>
public string? as_location_id { get; set; }
/// <summary>
/// 第三方平台设备编号
/// </summary>

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemEquipH.cs
View File

@@ -128,7 +128,7 @@ public partial class EqpMaintainTemEquipH : BaseEntity<string>
/// 责任岗位id
/// </summary>
public string send_post_info_user_id { get; set; } = string.Empty;
/// <summary>
/// 所属组织
/// </summary>

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpMaintainTemH.cs
View File

@@ -123,7 +123,7 @@ public partial class EqpMaintainTemH : BaseEntity<string>
/// 责任岗位id
/// </summary>
public string send_post_info_user_id { get; set; } = string.Empty;
/// <summary>
/// 所属组织
/// </summary>

3
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairAnalysisRecord.cs
View File

@@ -1,5 +1,4 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
@@ -12,7 +11,7 @@ public partial class EqpRepairAnalysisRecord : BaseEntity<int>
{
public EqpRepairAnalysisRecord()
{
}
/// <summary>
/// TODO

4
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
View File

@@ -148,12 +148,12 @@ public partial class EqpRepairApply : BaseEntity<string>
/// 附件
/// </summary>
public string? attachment { get; set; }
/// <summary>
/// 维修图片
/// </summary>
public string? repair_img { get; set; }
/// <summary>
/// 生产任务单id
/// </summary>

3
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairCompletionRecord.cs
View File

@@ -1,5 +1,4 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
@@ -12,7 +11,7 @@ public partial class EqpRepairCompletionRecord : BaseEntity<int>
{
public EqpRepairCompletionRecord()
{
}
/// <summary>
/// TODO

3
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairDelay.cs
View File

@@ -1,6 +1,3 @@
using System;
using System.Linq;
using System.Text;
using JNPF.Common.Security;
using SqlSugar;

8
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairOutApply.cs
View File

@@ -113,23 +113,23 @@ public partial class EqpRepairOutApply : BaseEntity<string>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 附件
/// </summary>
public string? attachment { get; set; }
/// <summary>
/// 实际维修供应商
/// </summary>
public string? real_supplier_id { get; set; }
/// <summary>
/// 流程id
/// </summary>
[SugarColumn(ColumnName = "f_flowid")]
public string? flow_id { get; set; }
/// <summary>
/// 流程任务id
/// </summary>

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpEquipCheckRecord.cs
View File

@@ -118,7 +118,7 @@ public partial class EqpSpEquipCheckRecord : BaseEntity<string>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
/// <summary>
/// 所属组织
/// </summary>

2
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpSpotInsRecordD.cs
View File

@@ -108,5 +108,5 @@ public partial class EqpSpotInsRecordD : BaseEntity<string>
/// 是否通过
/// </summary>
public string? is_pass { get; set; }
}

5
EquipMgr/Tnb.EquipMgr.Entities/Entity/MoldMaintenance.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
using SqlSugar;
namespace Tnb.EquipMgr.Entities
{

1
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckItem.cs
View File

@@ -1,5 +1,4 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
using Yitter.IdGenerator;

1
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolModelCheckPeriod.cs
View File

@@ -1,5 +1,4 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;

7
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlan.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Contracts;
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;

6
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.part.cs
View File

@@ -1,5 +1,3 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
@@ -7,7 +5,7 @@ namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 模具信息表
/// </summary>
public partial class ToolMolds
public partial class ToolMolds
{
/// <summary>
/// 库房编码
@@ -17,6 +15,6 @@ public partial class ToolMolds
/// <summary>
/// 库位编码
/// </summary>
[SugarColumn(IsIgnore =true)]
[SugarColumn(IsIgnore = true)]
public string location_code { get; set; }
}

14
EquipMgr/Tnb.EquipMgr.Entities/Enums/MaintainStatus.cs
View File

@@ -1,24 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Enums
namespace Tnb.EquipMgr.Entities.Enums
{
public enum MaintainStatus
{
/// <summary>
/// 待维修
/// </summary>
DWX=1,
DWX = 1,
/// <summary>
/// 维修中
/// </summary>
WXZ=2,
WXZ = 2,
/// <summary>
/// 已完成
/// </summary>
YWC=4,
YWC = 4,
}
}

3
EquipMgr/Tnb.EquipMgr.Entities/Mapper/Mapper.cs
View File

@@ -1,6 +1,5 @@
using Mapster;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Entities;
namespace Tnb.EquipMgr.Entities.Mapper
{
@@ -14,7 +13,7 @@ namespace Tnb.EquipMgr.Entities.Mapper
.Map(dest => dest.mold_id, src => src.id);
config.ForType<ToolMolds, MaintainPlanMoldLstOutput>()
.Map(dest => dest.mold_id, src => src.id);
//.Map(dest=>dest.mold_name,src=>src.mold_name);
//.Map(dest=>dest.mold_name,src=>src.mold_name);
}
}
}

1
EquipMgr/Tnb.EquipMgr.Entities/Tnb.EquipMgr.Entities.csproj
View File

@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

1
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipFileService.cs
View File

@@ -1,4 +1,3 @@
using Microsoft.AspNetCore.Http;
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces

2
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpEquipSparePartsService.cs
View File

@@ -10,7 +10,7 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="input"></param>
/// <returns></returns>
public Task AddEquipSpareParts(EquipSparePartsInput input);
/// <summary>
/// 根据设备id获取备品备件
/// </summary>

5
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpMaintainRecordService.cs
View File

@@ -1,4 +1,3 @@
using JNPF.Common.Dtos.VisualDev;
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
@@ -18,14 +17,14 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="dic"></param>
/// <returns></returns>
public Task<MaintainRecordRepeatOutput> GetMaintainRecordRepeatInfo(Dictionary<string, string> dic);
/// <summary>
/// 复核备保养计划
/// </summary>
/// <param name="pageInput"></param>
/// <returns></returns>
public Task<string> RepeatMaintain(MaintainRecordRepeatInput input);
/// <summary>
/// 根据设备id获取设备保养记录
/// </summary>

2
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpMaintainTemEquipService.cs
View File

@@ -2,7 +2,7 @@ namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpMaintainTemEquipService
{
/// <summary>
/// 停止计划
/// </summary>

30
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairApplyService.cs
View File

@@ -5,43 +5,43 @@ namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpRepairApplyService
{
/// <summary>
/// 维修作废
/// </summary>
/// <param name="dic"></param>
public Task<string> Repeal(Dictionary<string,string> dic);
public Task<string> Repeal(Dictionary<string, string> dic);
/// <summary>
/// 维修关闭
/// </summary>
/// <param name="dic"></param>
public Task<string> Close(Dictionary<string,string> dic);
public Task<string> Close(Dictionary<string, string> dic);
/// <summary>
/// 维修指派
/// </summary>
/// <param name="dic"></param>
public Task<string> Assign(Dictionary<string,string> dic);
public Task<string> Assign(Dictionary<string, string> dic);
/// <summary>
/// 维修接收
/// </summary>
/// <param name="dic"></param>
public Task<string> Receive(Dictionary<string,string> dic);
public Task<string> Receive(Dictionary<string, string> dic);
/// <summary>
/// 维修拒绝
/// </summary>
/// <param name="dic"></param>
public Task<string> Refuse(Dictionary<string,string> dic);
public Task<string> Refuse(Dictionary<string, string> dic);
/// <summary>
/// 维修信息
/// </summary>
/// <param name="dic"></param>
public Task<EqpRepairApply> GetInfo(Dictionary<string,string> dic);
public Task<EqpRepairApply> GetInfo(Dictionary<string, string> dic);
/// <summary>
/// 维修登记
/// </summary>
@@ -53,13 +53,13 @@ namespace Tnb.EquipMgr.Interfaces
/// </summary>
/// <param name="dic"></param>
public Task<RepairApplyDetailOutput> GetRepairApplyDetail(Dictionary<string, string> dic);
/// <summary>
/// 根据设备id获取维修记录
/// </summary>
/// <returns></returns>
public Task<dynamic> GetRepairRecordList(EquipQueryInput input);
/// <summary>
/// 看板端设备报修维修列表接口
/// </summary>

2
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairDelayService.cs
View File

@@ -9,6 +9,6 @@ namespace Tnb.EquipMgr.Interfaces
/// </summary>
/// <param name="dic"></param>
public Task<string> Delay(RepairDelayInput input);
}
}

10
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpRepairOutApplyService.cs
View File

@@ -5,24 +5,24 @@ namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpRepairOutApplyService
{
/// <summary>
/// 获取外修申请信息
/// </summary>
/// <param name="dic"></param>
public Task<EqpRepairOutApply> GetInfo(Dictionary<string,string> dic);
public Task<EqpRepairOutApply> GetInfo(Dictionary<string, string> dic);
/// <summary>
/// 外修申请
/// </summary>
/// <param name="dic"></param>
public Task<string> OutApply(RepairOutApplyInput input);
/// <summary>
/// 外修登记
/// </summary>
/// <param name="dic"></param>
public Task<string> Register(RepairApplyOutRegisterInput input);
}
}

2
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSpEquipCheckRecordService.cs
View File

@@ -1,5 +1,5 @@
using Tnb.EquipMgr.Entities;
namespace Tnb.EquipMgr.Interfaces
{
public interface IEqpSpEquipCheckRecordService

2
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpSparePartsRequisitionHService.cs
View File

@@ -5,6 +5,6 @@ namespace Tnb.EquipMgr.Interfaces
/// </summary>
public interface IEqpSparePartsRequisitionHService
{
}
}

2
EquipMgr/Tnb.EquipMgr.Interfaces/IEqpWorkshopChangeLogService.cs
View File

@@ -12,7 +12,7 @@ namespace Tnb.EquipMgr.Interfaces
/// </summary>
/// <returns></returns>
public Task<dynamic> GetEquipWorkshopChangeList(EquipQueryInput input);
/// <summary>
/// 设备迁移
/// </summary>

5
EquipMgr/Tnb.EquipMgr.Interfaces/IEquSpotInsRecordService.cs
View File

@@ -1,4 +1,3 @@
using JNPF.Common.Dtos.VisualDev;
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
@@ -18,14 +17,14 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="dic"></param>
/// <returns></returns>
public Task<SpotInsRecordRepeatOutput> GetSpotInsRecordRepeatInfo(Dictionary<string, string> dic);
/// <summary>
/// 复核点巡检
/// </summary>
/// <param name="pageInput"></param>
/// <returns></returns>
public Task RepeatSpotIns(SpotInsRecordRepeatInput input);
/// <summary>
/// 根据设备id获取点巡检记录
/// </summary>

6
EquipMgr/Tnb.EquipMgr.Interfaces/IEquipmentService.cs
View File

@@ -10,7 +10,7 @@ namespace Tnb.EquipMgr.Interfaces
/// <param name="dic"></param>
/// <returns></returns>
public Task<EqpEquipment> GetEntityById(Dictionary<string, string> dic);
/// <summary>
/// 根据设备类型获取设备列表
/// </summary>
@@ -22,8 +22,8 @@ namespace Tnb.EquipMgr.Interfaces
/// 获取产线和注塑挤出设备树
/// </summary>
/// <returns></returns>
public Task<dynamic> GetWorklineAndEquipTree(Dictionary<string,string> dic);
public Task<dynamic> GetWorklineAndEquipTree(Dictionary<string, string> dic);
/// <summary>
/// 根据二维码查设备
/// </summary>

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldHouseService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Interfaces
namespace Tnb.EquipMgr.Interfaces
{
/// <summary>
/// 目录库房服务接口

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldLocationService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Interfaces
namespace Tnb.EquipMgr.Interfaces
{
/// <summary>
/// 模具库位服务接口

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaintainGroupService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Interfaces
namespace Tnb.EquipMgr.Interfaces
{
/// <summary>
/// 模具保养项目组接口

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaintainPlanRunService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Interfaces
namespace Tnb.EquipMgr.Interfaces
{
public interface IToolMoldMaintainPlanRunService
{

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaintainPlanService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Interfaces
namespace Tnb.EquipMgr.Interfaces
{
public interface IToolMoldMaintainPlanService
{

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaintainRuleService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Interfaces
namespace Tnb.EquipMgr.Interfaces
{
/// <summary>
/// 设备保养规则定义

7
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaintainTaskService.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities;
namespace Tnb.EquipMgr.Interfaces
{

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldMaterialService.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
{

2
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldRequisitionService.cs
View File

@@ -5,6 +5,6 @@ namespace Tnb.EquipMgr.Interfaces
/// </summary>
public interface IToolMoldRequisitionService
{
}
}

8
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldsService.cs
View File

@@ -1,12 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.ProductionMgr.Entities.Dto;
namespace Tnb.EquipMgr.Interfaces
{

1
EquipMgr/Tnb.EquipMgr.Interfaces/Tnb.EquipMgr.Interfaces.csproj
View File

@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

36
EquipMgr/Tnb.EquipMgr/App/AppEqpRepairApplyService.cs
View File

@@ -1,10 +1,7 @@
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 JNPF.Systems.Entitys.System;
using JNPF.VisualDev;
@@ -16,7 +13,6 @@ using SqlSugar;
using Tnb.BasicData;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
namespace Tnb.EquipMgr
{
@@ -26,7 +22,7 @@ namespace Tnb.EquipMgr
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class AppEqpRepairApplyService : IOverideVisualDevService,IDynamicApiController, ITransient
public class AppEqpRepairApplyService : IOverideVisualDevService, IDynamicApiController, ITransient
{
private const string ModuleId = "28621611210261";
private readonly ISqlSugarRepository<EqpRepairApply> _repository;
@@ -46,43 +42,43 @@ namespace Tnb.EquipMgr
_visualDevService = visualDevService;
OverideFuncs.GetListAsync = GetList;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, object> queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
string code = queryJson!=null && queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
string name = queryJson!=null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string code = queryJson != null && queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
string name = queryJson != null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string userId = _userManager.UserId;
var result = await db.Queryable<EqpRepairApply>()
.LeftJoin<EqpEquipment>((a, b) => a.equip_id == b.id)
.LeftJoin<UserEntity>((a, b, c) => a.apply_user_id == c.Id)
.LeftJoin<DictionaryTypeEntity>((a,b,c,d)=>d.EnCode==DictConst.RepairStatus)
.LeftJoin<DictionaryDataEntity>((a,b,c,d,e)=>a.status==e.EnCode && d.Id==e.DictionaryTypeId)
.LeftJoin<DictionaryTypeEntity>((a, b, c, d) => d.EnCode == DictConst.RepairStatus)
.LeftJoin<DictionaryDataEntity>((a, b, c, d, e) => a.status == e.EnCode && d.Id == e.DictionaryTypeId)
.WhereIF(!string.IsNullOrEmpty("code"), (a, b, c) => a.code.Contains(code))
.WhereIF(!string.IsNullOrEmpty("name"), (a, b, c) => a.name.Contains(name))
.Where((a, b, c) => a.repairer_id == userId)
.Where((a, b, c) => a.status == "2" || a.status=="3")
.Select((a, b, c,d,e) => new PdaRepairApplyListOutput
.Where((a, b, c) => a.status == "2" || a.status == "3")
.Select((a, b, c, d, e) => new PdaRepairApplyListOutput
{
id = a.id,
code = a.code,
name = a.name,
equip_id = b.code+"/"+b.name,
equip_id = b.code + "/" + b.name,
equip_id_id = a.equip_id,
expect_complete_time = a.expect_complete_time==null ? "" : a.expect_complete_time.Value.ToString("yyyy-MM-dd"),
is_ugent = a.is_ugent==null ? "" : a.is_ugent==0 ? "否" : "是",
expect_complete_time = a.expect_complete_time == null ? "" : a.expect_complete_time.Value.ToString("yyyy-MM-dd"),
is_ugent = a.is_ugent == null ? "" : a.is_ugent == 0 ? "否" : "是",
description = a.description,
status = e.FullName,
apply_user_id = SqlFunc.IsNull(c.RealName,"异常停机"),
apply_user_id = SqlFunc.IsNull(c.RealName, "异常停机"),
apply_user_id_id = a.create_id,
// repairer_id = c.RealName,
// repairer_id_id = a.repairer_id,
}).ToPagedListAsync(input.currentPage,input.pageSize);
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<PdaRepairApplyListOutput>.SqlSugarPageResult(result);
}
/// <summary>
/// 根据id获取维修相关信息
@@ -90,7 +86,7 @@ namespace Tnb.EquipMgr
/// <param name="dic"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetRepairInfoById(Dictionary<string,string> dic)
public async Task<dynamic> GetRepairInfoById(Dictionary<string, string> dic)
{
string id = dic.ContainsKey("id") ? dic["id"] : "";
if (string.IsNullOrEmpty(id)) return null;
@@ -106,7 +102,7 @@ namespace Tnb.EquipMgr
equip_id = a.equip_id,
equip_code = b.code,
equip_name = b.name,
expect_complete_time = a.expect_complete_time==null?"":a.expect_complete_time.Value.ToString("yyyy-MM-dd"),
expect_complete_time = a.expect_complete_time == null ? "" : a.expect_complete_time.Value.ToString("yyyy-MM-dd"),
is_ugent = a.is_ugent,
description = a.description,
status = a.status,

17
EquipMgr/Tnb.EquipMgr/BaseMoldMaintainService.cs
View File

@@ -1,18 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
using System.Linq.Expressions;
using JNPF.Common.Contracts;
using JNPF.Common.Enums;
using JNPF.Common.Security;
using JNPF.Common.Extension;
using JNPF.FriendlyException;
using Mapster;
using SqlSugar;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Entities;
using Mapster;
using JNPF.Common.Contracts;
using JNPF.Common.Extension;
namespace Tnb.EquipMgr
{
@@ -75,7 +68,7 @@ namespace Tnb.EquipMgr
var itemIds = await _db.Queryable<TRelaction>().Where(masterFilterExp).Select(masterSelector).ToListAsync();
if (itemIds?.Count > 0)
{
var items = await _db.Queryable<TDest>().Where(it=>itemIds.Contains(it.id)).ToListAsync();
var items = await _db.Queryable<TDest>().Where(it => itemIds.Contains(it.id)).ToListAsync();
list = items.Adapt<List<TOutput>>();
}
return list;

22
EquipMgr/Tnb.EquipMgr/EqpDaqService.cs
View File

@@ -6,10 +6,10 @@ using JNPF.Systems.Entitys.Permission;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using Tnb.BasicData;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
using Tnb.BasicData;
namespace Tnb.EquipMgr
{
@@ -34,29 +34,29 @@ namespace Tnb.EquipMgr
{
var db = _repository.AsSugarClient();
Dictionary<string, string>? queryJson = new Dictionary<string, string>();
if (input!=null && !string.IsNullOrEmpty(input.queryJson))
if (input != null && !string.IsNullOrEmpty(input.queryJson))
{
queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
}
var result = await db.Queryable<EqpDaq>()
.LeftJoin<UserEntity>((a,b)=>a.create_id==b.Id)
.WhereIF(input!=null,a=>a.equip_id==input!.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("data_source"),a=>a.data_source==queryJson!["data_source"])
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_name"),a=>a.label_name.Contains(queryJson!["label_name"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("label_point"),a=>a.label_point.Contains(queryJson!["label_point"]))
.Select((a,b) => new EquipDaqQueryOutput
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.WhereIF(input != null, a => a.equip_id == input!.equip_id)
.WhereIF(queryJson != null && queryJson.ContainsKey("data_source"), a => a.data_source == queryJson!["data_source"])
.WhereIF(queryJson != null && queryJson.ContainsKey("label_name"), a => a.label_name.Contains(queryJson!["label_name"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("label_point"), a => a.label_point.Contains(queryJson!["label_point"]))
.Select((a, b) => new EquipDaqQueryOutput
{
id = a.id,
data_source = a.data_source,
create_id = b.RealName,
create_time = a.create_time==null ? null : a.create_time.Value.ToString(DbTimeFormat.MM),
create_time = a.create_time == null ? null : a.create_time.Value.ToString(DbTimeFormat.MM),
data_type = a.data_type,
enabled = a.enabled==1 ? "是" : "否",
enabled = a.enabled == 1 ? "是" : "否",
equip_id = a.equip_id,
label_name = a.label_name,
label_point = a.label_point,
remark = a.remark
}).ToPagedListAsync((input?.currentPage??1), (input?.pageSize??50));
}).ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50));
return PageResult<EquipDaqQueryOutput>.SqlSugarPageResult(result);
}

31
EquipMgr/Tnb.EquipMgr/EqpEquipFileService.cs
View File

@@ -1,5 +1,4 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Filter;
using JNPF.Common.Models;
@@ -9,12 +8,6 @@ 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;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
@@ -45,13 +38,13 @@ namespace Tnb.EquipMgr
}
[HttpPost]
public async Task<string> Upload([FromForm]string equip_id,[FromForm] ChunkModel input)
public async Task<string> Upload([FromForm] string equip_id, [FromForm] ChunkModel input)
{
string msg = "";
try
{
var attachment = await _fileService.Uploader("annexpic", input);
EqpEquipFile eqpEquipFile = new EqpEquipFile()
{
file_name = input.file.FileName,
@@ -85,21 +78,21 @@ namespace Tnb.EquipMgr
queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
}
var result = await db.Queryable<EqpEquipFile>()
.LeftJoin<UserEntity >((a, b) => a.create_id == b.Id)
.LeftJoin<UserEntity >((a, b,c) => a.modify_id == c.Id)
.LeftJoin<EqpEquipment >((a, b,c,d) => a.equip_id == d.id)
.Where((a,b,c,d)=>a.equip_id==input.equip_id)
.WhereIF(queryJson!=null && queryJson.ContainsKey("file_name"),(a,b,c,d)=>a.file_name.Contains(queryJson!["file_name"]))
.Select((a, b, c,d) => new EquipFileQueryOutput
.LeftJoin<UserEntity>((a, b) => a.create_id == b.Id)
.LeftJoin<UserEntity>((a, b, c) => a.modify_id == c.Id)
.LeftJoin<EqpEquipment>((a, b, c, d) => a.equip_id == d.id)
.Where((a, b, c, d) => a.equip_id == input.equip_id)
.WhereIF(queryJson != null && 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==null ? null : a.create_time.Value.ToString("yyyy-MM-dd"),
equip_id=d.name,
equip_id_id= a.equip_id,
file_name=a.file_name,
create_time = a.create_time == null ? null : 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<EquipFileQueryOutput>.SqlSugarPageResult(result);

10
EquipMgr/Tnb.EquipMgr/EqpEquipScrapService.cs
View File

@@ -1,18 +1,12 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
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
@@ -51,10 +45,10 @@ namespace Tnb.EquipMgr
await db.Updateable<EqpEquipment>().SetColumns(x => x.life == EquipmentLife.SCRAP)
.Where(x => x.id == eqpEquipScrap.equip_id).ExecuteCommandAsync();
});
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "报废成功" : result.ErrorMessage;
}
}
}

13
EquipMgr/Tnb.EquipMgr/EqpEquipSparePartsService.cs
View File

@@ -3,7 +3,6 @@ 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;
@@ -67,13 +66,13 @@ namespace Tnb.EquipMgr
queryJson = JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson);
}
var result = await db.Queryable<EqpEquipSpareParts>()
.LeftJoin<EqpSpareParts>((a,b)=>a.spare_parts_id==b.id)
.LeftJoin<EqpSpareParts>((a, b) => a.spare_parts_id == b.id)
.LeftJoin<DictionaryTypeEntity>((a, b, c) => c.EnCode == Tnb.BasicData.DictConst.SparePartsType && c.DeleteMark == null)
.LeftJoin<DictionaryDataEntity>((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!=null && queryJson.ContainsKey("code"),(a,b,c,d)=>b.code.Contains(queryJson!["code"]))
.WhereIF(queryJson!=null && queryJson.ContainsKey("name"),(a,b,c,d)=>b.name.Contains(queryJson!["name"]))
.Select((a, b, c,d) => new EquipSparePartsQueryOutput
.LeftJoin<DictionaryDataEntity>((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 != null && queryJson.ContainsKey("code"), (a, b, c, d) => b.code.Contains(queryJson!["code"]))
.WhereIF(queryJson != null && 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,

13
EquipMgr/Tnb.EquipMgr/EqpMaintainTemEquipService.cs
View File

@@ -1,12 +1,11 @@
using JNPF.Common.Enums;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.EquipMgr.Interfaces;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Interfaces;
namespace Tnb.EquipMgr
{
@@ -15,7 +14,7 @@ namespace Tnb.EquipMgr
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
public class EqpMaintainTemEquipService : IEqpMaintainTemEquipService, IDynamicApiController, ITransient
public class EqpMaintainTemEquipService : IEqpMaintainTemEquipService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<EqpMaintainTemEquipH> _repository;
@@ -29,7 +28,7 @@ namespace Tnb.EquipMgr
public async Task Stop(Dictionary<string, string> parameters)
{
string id = parameters["id"];
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
DbResult<bool> result = await _repository.AsSugarClient().Ado.UseTranAsync(async () =>
{
await _repository.UpdateAsync(x => new EqpMaintainTemEquipH()
{
@@ -40,13 +39,13 @@ namespace Tnb.EquipMgr
.Select(x => x.id).ToListAsync();
await _repository.AsSugarClient().Deleteable<EqpMaintainRecordH>()
.Where(x => x.maintain_tem_equip_id == id && x.status == SpotInsRecordExecutionStatus.TOBEEXECUTED).ExecuteCommandAsync();
await _repository.AsSugarClient().Deleteable<EqpMaintainRecordD>()
.Where(x => ids.Contains(x.maintain_record_id)).ExecuteCommandAsync();
});
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
}
}
}

20
EquipMgr/Tnb.EquipMgr/EqpMaintainTemService.cs
View File

@@ -29,7 +29,7 @@ namespace Tnb.EquipMgr
_repository = repository;
_userManager = userManager;
}
/// <summary>
/// 根据模板id发布到设备
/// </summary>
@@ -37,10 +37,10 @@ namespace Tnb.EquipMgr
public async Task<string> Publish(SpotInsTemPublishInput input)
{
var db = _repository.AsSugarClient();
DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
{
EqpMaintainTemH eqpMaintainTemH = await _repository.GetSingleAsync(x => x.id == input.id);
List<EqpMaintainTemD> eqpMaintainTemDs = await db.Queryable<EqpMaintainTemD>().Where(x=>x.maintain_tem_id==input.id).ToListAsync();
List<EqpMaintainTemD> eqpMaintainTemDs = await db.Queryable<EqpMaintainTemD>().Where(x => x.maintain_tem_id == input.id).ToListAsync();
if (input.equipIds != null && input.equipIds.Length > 0)
{
@@ -54,7 +54,7 @@ namespace Tnb.EquipMgr
{
id = id,
code = code,
name = eqpMaintainTemH.name+equipId,
name = eqpMaintainTemH.name + equipId,
plan_cycle = eqpMaintainTemH.plan_cycle,
plan_cycle_unit = eqpMaintainTemH.plan_cycle_unit,
plan_run_notice = eqpMaintainTemH.plan_run_notice,
@@ -92,26 +92,26 @@ namespace Tnb.EquipMgr
}
EqpMaintainTemEquipH oldMaintainTemEquipH = await db.Queryable<EqpMaintainTemEquipH>().Where(x => x.maintain_tem_id == input.id && x.equip_id == equipId).FirstAsync();
await db.Deleteable<EqpMaintainTemEquipH>().Where(x => x.maintain_tem_id == input.id && x.equip_id==equipId).ExecuteCommandAsync();
if(oldMaintainTemEquipH!=null)
await db.Deleteable<EqpMaintainTemEquipD>().Where(x => x.maintain_tem_equip_id==oldMaintainTemEquipH.id).ExecuteCommandAsync();
await db.Deleteable<EqpMaintainTemEquipH>().Where(x => x.maintain_tem_id == input.id && x.equip_id == equipId).ExecuteCommandAsync();
if (oldMaintainTemEquipH != null)
await db.Deleteable<EqpMaintainTemEquipD>().Where(x => x.maintain_tem_equip_id == oldMaintainTemEquipH.id).ExecuteCommandAsync();
}
if (insertEqpMaintainTemEquipHs != null && insertEqpMaintainTemEquipHs.Count > 0)
{
await db.Insertable(insertEqpMaintainTemEquipHs).ExecuteCommandAsync();
}
if (insertEqpMaintainTemEquipDs != null && insertEqpMaintainTemEquipDs.Count > 0)
{
await db.Insertable(insertEqpMaintainTemEquipDs).ExecuteCommandAsync();
}
}
});
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "发布成功" : result.ErrorMessage;
}
}

Some files were not shown because too many files have changed in this diff Show More