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>