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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
FanLian
2023-07-07 16:49:47 +08:00
parent 630678ff23 844b76b823
commit 284b36a043
24 changed files with 507 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs
View File

@@ -129,5 +129,31 @@ public static class DictConst
/// 保养状态待保养Code
/// </summary>
public const string UnMaintainStatusCode = "UnMaintain";
/// <summary>
/// 模具在库TypeId
/// </summary>
public const string ZKTypeId = "26149307089941";
/// <summary>
/// 模具生产TypeId
/// </summary>
public const string SCTypeId = "26149309121045";
/// <summary>
/// 模具保养TypeId
/// </summary>
public const string BYTypeId = "26149311082005";
/// <summary>
/// 模具报废TypeId
/// </summary>
public const string BFTypeId = "26149314425877";
/// <summary>
/// 模具外协TypeId
/// </summary>
public const string WXXTypeId = "26149312750101";
/// <summary>
/// 模具维修TypeId
/// </summary>
public const string WXTypeId = "26149320818965";
#endregion
}

6
BasicData/Tnb.BasicData.Entities/Dto/BasDefect/DefectOutput.cs
View File

@@ -2,8 +2,8 @@ namespace Tnb.BasicData.Entities.Dto
{
public class DefectOutput
{
public string id { get; set; }
public string defect_code { get; set; }
public string defect_name { get; set; }
public string id { get; set; } = string.Empty;
public string? defect_code { get; set; }
public string? defect_name { get; set; }
}
}

2
BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomDataOutput.cs
View File

@@ -67,7 +67,7 @@ namespace Tnb.BasicData.Entities.Dto
public class MbomProcessOutDto
{
public string id { get; set; }
public string id { get; set; } = string.Empty;
/// <summary>
/// Desc:生产bomid

4
BasicData/Tnb.BasicData.Entities/Dto/BasMbom/MbomSaveDataInput.cs
View File

@@ -67,7 +67,7 @@ namespace Tnb.BasicData.Entities.Dto
public class MbomProcessDto
{
public string id { get; set; }
public string id { get; set; } = string.Empty;
/// <summary>
/// Desc:生产bomid
@@ -122,7 +122,7 @@ namespace Tnb.BasicData.Entities.Dto
/// <summary>
/// 工艺路线子表id
/// </summary>
public string route_detail_id { get; set; }
public string route_detail_id { get; set; } = string.Empty;
/// <summary>
/// Desc:投产方式

4
BasicData/Tnb.BasicData.Entities/Entity/BasMbomProcess.cs
View File

@@ -48,11 +48,11 @@ public partial class BasMbomProcess : BaseEntity<string>
/// 投产方式
/// </summary>
public string? production_method { get; set; }
/// <summary>
/// 工艺路线子表id
/// </summary>
public string route_detail_id { get; set; }
public string route_detail_id { get; set; } = string.Empty;
/// <summary>
/// 是否时最后一道工序

2
BasicData/Tnb.BasicData/BasDefectService.cs
View File

@@ -36,7 +36,7 @@ namespace Tnb.BasicData
string processId = dic["processId"];
var db = _repository.AsSugarClient();
List<string> defectIds = await db.Queryable<BasProcessDefective>().Where(x=>x.process_id==processId).Select(x=>x.defective_id).ToListAsync();
List<string> defectTypeIds = await db.Queryable<BasDefect>().Where(x=>defectIds.Contains(x.id) && x.enabled==1).Select(x=>x.defect_type_id).ToListAsync();
List<string?> defectTypeIds = await db.Queryable<BasDefect>().Where(x=>defectIds.Contains(x.id) && x.enabled==1).Select(x=>x.defect_type_id).ToListAsync();
return await _repository.AsSugarClient().Queryable<BasDefectType>()
.Where((a) => defectTypeIds.Contains(a.id))
.Select(a => new

24
BasicData/Tnb.BasicData/BasESopService.cs
View File

@@ -50,9 +50,9 @@ namespace Tnb.BasicData
{
var db = _repository.AsSugarClient();
Dictionary<string, object>? queryJson = string.IsNullOrEmpty(input.queryJson) ? null : input.queryJson.ToObject<Dictionary<string, object>>();
string code = queryJson!=null && queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
string name = queryJson!=null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string version = queryJson!=null && queryJson.ContainsKey("version") ? queryJson["version"].ToString() : "";
string? code = queryJson!=null && queryJson.ContainsKey("code") ? queryJson["code"].ToString() : "";
string? name = queryJson!=null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string? version = queryJson!=null && queryJson.ContainsKey("version") ? queryJson["version"].ToString() : "";
var list = await db.Queryable<BasESop, BasMbom, BasMbomProcess, UserEntity,BasProcess>((a, b, c, d,e) => new object[]
{
JoinType.Left, a.mbom_id == b.id,
@@ -60,17 +60,17 @@ namespace Tnb.BasicData
JoinType.Left, a.create_id == d.Id,
JoinType.Left, c.process_id == e.id,
})
.WhereIF(!string.IsNullOrEmpty(code), (a, b, c, d) => a.code.Contains(code))
.WhereIF(!string.IsNullOrEmpty(name), (a, b, c, d) => a.name.Contains(name))
.WhereIF(!string.IsNullOrEmpty(version), (a, b, c, d) => a.version.Contains(version))
.WhereIF(!string.IsNullOrEmpty(code), (a, b, c, d) => a.code.Contains(code!))
.WhereIF(!string.IsNullOrEmpty(name), (a, b, c, d) => a.name.Contains(name!))
.WhereIF(!string.IsNullOrEmpty(version), (a, b, c, d) => a.version.Contains(version!))
.Where((a,b,c)=>a.enabled==1)
.Select((a, b, c, d,e) => new ESopListOutput
{
id = a.id,
code = a.code,
name = a.name,
mbom_id = b.version,
mbom_process_id = e.process_name,
mbom_id = b.version!,
mbom_process_id = e.process_name!,
version = a.version,
enabled = a.enabled==1 ? "是" : "否",
attachment = a.attachment,
@@ -106,14 +106,14 @@ namespace Tnb.BasicData
.WhereIF(!string.IsNullOrEmpty(code), (a, b, c, d) => a.code.Contains(code))
.WhereIF(!string.IsNullOrEmpty(name), (a, b, c, d) => a.name.Contains(name))
.WhereIF(!string.IsNullOrEmpty(version), (a, b, c, d) => a.version.Contains(version))
.Where((a,b,c)=>a.mbom_id==input.mbom_id && a.mbom_process_id==input.mbom_process_id)
.Where((a,b,c)=>a.mbom_id==input!.mbom_id && a.mbom_process_id==input!.mbom_process_id)
.Select((a, b, c, d,e) => new ESopListOutput
{
id = a.id,
code = a.code,
name = a.name,
mbom_id = b.version,
mbom_process_id = e.process_name,
mbom_id = b.version!,
mbom_process_id = e.process_name!,
version = a.version,
enabled = a.enabled==1 ? "是" : "否",
attachment = a.attachment,
@@ -135,7 +135,7 @@ namespace Tnb.BasicData
return await _repository.GetFirstAsync(x => x.mbom_process_id == mbomProcessId && x.enabled == 1);
}
return null;
return null!;
}
[HttpPost]

10
BasicData/Tnb.BasicData/BasMaterialService.cs
View File

@@ -187,16 +187,16 @@ namespace Tnb.BasicData
}
List<string> typeList = new List<string>();
if(!string.IsNullOrEmpty(input.types))
if(!string.IsNullOrEmpty(input!.types))
{
typeList = JsonConvert.DeserializeObject<List<string>>(input.types);
typeList = JsonConvert.DeserializeObject<List<string>>((input?.types??"")) ?? new List<string>();
}
var query = db.Queryable<BasMaterial>()
.Where(x => x.state == "1")
.WhereIF(queryJson != null && queryJson.ContainsKey("name"), a => a.name.Contains(queryJson["name"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("code"), a => a.code.Contains(queryJson["code"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("name"), x => x.name.Contains(queryJson!["name"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("code"), x => x.code.Contains(queryJson!["code"]))
.WhereIF(queryJson != null && queryJson.ContainsKey("material_standard"),
a => a.material_standard.Contains(queryJson["material_standard"]))
x => x.material_standard!.Contains(queryJson!["material_standard"]))
.Select(x => x);
var list = new List<ISugarQueryable<BasMaterial>>();

40
BasicData/Tnb.BasicData/BasMbomService.cs
View File

@@ -297,15 +297,15 @@ namespace Tnb.BasicData
process_id = process?.process_id ?? "",
preparation_time = process?.preparation_time ?? 0,
station = process?.station ?? "",
byproduct_status = process.byproduct_status,
production_method = process.production_method,
route_detail_id = process.route_detail_id,
byproduct_status = process?.byproduct_status ?? 0,
production_method = process?.production_method,
route_detail_id = process?.route_detail_id ?? "",
ordinal = ++index,
is_last = index==mbomSaveDataInput.processes.Count ? 1 : 0,
});
if (process.inputs != null)
if (process!.inputs != null)
{
foreach (var input in process.inputs)
{
@@ -415,12 +415,12 @@ namespace Tnb.BasicData
decimal preparation_time = process?.preparation_time ?? 0;
await _repository.AsSugarClient().Updateable<BasMbomProcess>()
.SetColumns(x => x.preparation_time == preparation_time)
.SetColumns(x => x.station == process.station)
.SetColumns(x => x.byproduct_status == process.byproduct_status)
.SetColumns(x => x.production_method == process.production_method)
.Where(x => x.id == process.id).ExecuteCommandAsync();
.SetColumns(x => x.station == process!.station)
.SetColumns(x => x.byproduct_status == process!.byproduct_status)
.SetColumns(x => x.production_method == process!.production_method)
.Where(x => x.id == process!.id).ExecuteCommandAsync();
if (process.inputs != null)
if (process!.inputs != null)
{
foreach (var input in process.inputs)
{
@@ -572,14 +572,14 @@ namespace Tnb.BasicData
process_id = process?.process_id ?? "",
preparation_time = process?.preparation_time ?? 0,
station = process?.station ?? "",
byproduct_status = process.byproduct_status,
production_method = process.production_method,
route_detail_id = process.route_detail_id,
byproduct_status = process!.byproduct_status,
production_method = process!.production_method,
route_detail_id = process!.route_detail_id,
ordinal = ++index,
is_last = index==mbomSaveDataInput.processes.Count ? 1 : 0,
no = process.no,
last_process_no = process.last_process_no,
next_process_no = process.next_process_no,
no = process!.no,
last_process_no = process!.last_process_no,
next_process_no = process!.next_process_no,
});
@@ -693,12 +693,12 @@ namespace Tnb.BasicData
decimal preparation_time = process?.preparation_time ?? 0;
await _repository.AsSugarClient().Updateable<BasMbomProcess>()
.SetColumns(x => x.preparation_time == preparation_time)
.SetColumns(x => x.station == process.station)
.SetColumns(x => x.byproduct_status == process.byproduct_status)
.SetColumns(x => x.production_method == process.production_method)
.Where(x => x.id == process.id).ExecuteCommandAsync();
.SetColumns(x => x.station == process!.station)
.SetColumns(x => x.byproduct_status == process!.byproduct_status)
.SetColumns(x => x.production_method == process!.production_method)
.Where(x => x.id == process!.id).ExecuteCommandAsync();
if (process.inputs != null)
if (process!.inputs != null)
{
foreach (var input in process.inputs)
{

8
BasicData/Tnb.BasicData/BasPushRuleLogService.cs
View File

@@ -17,17 +17,11 @@ namespace Tnb.BasicData
public class BasPushRuleLogService : IBasPushRuleLogService, IDynamicApiController, ITransient
{
private readonly ISqlSugarRepository<BasPushRuleLog> _repository;
private readonly DataBaseManager _dbManager;
private readonly IUserManager _userManager;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
public BasPushRuleLogService(
ISqlSugarRepository<BasPushRuleLog> repository,
IUserManager userManager)
ISqlSugarRepository<BasPushRuleLog> repository)
{
_repository = repository;
_userManager = userManager;
}
[HttpPost]

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

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

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

@@ -2,8 +2,8 @@ namespace Tnb.EquipMgr.Entities.Dto
{
public class EquipRepairRefuseInput
{
public string id { get; set; }
public string reason { get; set; }
public string id { get; set; } = string.Empty;
public string reason { get; set; } = string.Empty;
}
}

15
EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolMoldRequisitionListOutput.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class ToolMoldRequisitionListOutput
{
public string id { get; set; } = string.Empty;
public string? code { get; set; } = string.Empty;
public string? mold_id { get; set; } = string.Empty;
public string? mo_task_id { get; set; } = string.Empty;
public string? equip_id { get; set; } = string.Empty;
public string? recipient_id { get; set; } = string.Empty;
public string? estimated_return_time { get; set; } = string.Empty;
public string? requisition_time { get; set; } = string.Empty;
public string? remark { get; set; } = string.Empty;
}
}

97
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldRequisition.cs Normal file
View File

@@ -0,0 +1,97 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 模具领用
/// </summary>
[SugarTable("tool_mold_requisition")]
public partial class ToolMoldRequisition : BaseEntity<string>
{
public ToolMoldRequisition()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 领用编号
/// </summary>
public string? code { get; set; }
/// <summary>
/// 模具ID
/// </summary>
public string? mold_id { get; set; }
/// <summary>
/// 领用人
/// </summary>
public string? recipient_id { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 修改用户
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// 生产任务单编号
/// </summary>
public string? mo_task_code { get; set; }
/// <summary>
/// 生产任务单id
/// </summary>
public string? mo_task_id { get; set; }
/// <summary>
/// 预计归还日期
/// </summary>
public DateTime? estimated_return_time { get; set; }
/// <summary>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 领用时间
/// </summary>
public DateTime? requisition_time { get; set; }
/// <summary>
/// 用于设备
/// </summary>
public string? equip_id { get; set; }
/// <summary>
/// 流程任务Id
/// </summary>
public string? f_flowtaskid { get; set; }
/// <summary>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
/// <summary>
/// 备注
/// </summary>
public string? remark { get; set; }
}

87
EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldReturn.cs Normal file
View File

@@ -0,0 +1,87 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.EquipMgr.Entities;
/// <summary>
/// 模具归还
/// </summary>
[SugarTable("tool_mold_return")]
public partial class ToolMoldReturn : BaseEntity<string>
{
public ToolMoldReturn()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 归还编号
/// </summary>
public string? code { get; set; }
/// <summary>
/// 模具ID
/// </summary>
public string? mold_id { get; set; }
/// <summary>
/// 归还人
/// </summary>
public string? return_id { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string? create_id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? create_time { get; set; }
/// <summary>
/// 修改用户
/// </summary>
public string? modify_id { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime? modify_time { get; set; }
/// <summary>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 归还时间
/// </summary>
public DateTime? return_time { get; set; }
/// <summary>
/// 用于设备
/// </summary>
public string? equip_id { get; set; }
/// <summary>
/// 流程任务Id
/// </summary>
public string? f_flowtaskid { get; set; }
/// <summary>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
/// <summary>
/// 备注
/// </summary>
public string? remark { get; set; }
/// <summary>
/// 归还库位id
/// </summary>
public string? location_id { get; set; }
}

10
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldRequisitionService.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Tnb.EquipMgr.Interfaces
{
/// <summary>
/// 模具领用服务
/// </summary>
public interface IToolMoldRequisitionService
{
}
}

9
EquipMgr/Tnb.EquipMgr.Interfaces/IToolMoldReturnService.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Tnb.EquipMgr.Interfaces
{
/// <summary>
/// 模具归还服务
/// </summary>
public interface IToolMoldReturnService
{
}
}

116
EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs Normal file
View File

@@ -0,0 +1,116 @@
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
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;
using Tnb.ProductionMgr.Entities;
namespace Tnb.EquipMgr
{
/// <summary>
/// 模具领用接口
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class ToolMoldRequisitionService : IOverideVisualDevService, IToolMoldRequisitionService,
IDynamicApiController, ITransient
{
private const string ModuleId = "27254745336853";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public ToolMoldRequisitionService(
ISqlSugarRepository<ToolMoldRequisition> repository,
IRunService runService,
IVisualDevService visualDevService
)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
OverideFuncs.GetListAsync = GetList;
OverideFuncs.CreateAsync = Create;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
Dictionary<string, object>? queryJson = new Dictionary<string, object>();
string requisitionCode = "";
DateTime[] requisitionTimeArr = null;
DateTime[] estimatedReturnArr = null;
if (input!=null && !string.IsNullOrEmpty(input.queryJson))
{
queryJson = JsonConvert.DeserializeObject<Dictionary<string, object>>(input?.queryJson ?? "");
}
if (queryJson.TryGetValue("requisition_code", out var value))
{
requisitionCode = value.ToString();
}
if (queryJson.TryGetValue("requisition_time", out var value1))
{
requisitionTimeArr = value1.ToObject<long[]>().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray();
}
if (queryJson.TryGetValue("estimated_return_time", out var value2))
{
estimatedReturnArr = value2.ToObject<long[]>().Select(x=>DateTimeOffset.FromUnixTimeSeconds(x/1000).ToLocalTime().DateTime).ToArray();
}
var result = await _db.Queryable<ToolMoldRequisition>()
.LeftJoin<PrdMoTask>((a, b) => a.mo_task_id == b.id)
.LeftJoin<EqpEquipment>((a, b, c) => a.equip_id == c.id)
.LeftJoin<UserEntity>((a, b, c, d) => a.recipient_id == d.Id)
.LeftJoin<ToolMolds>((a,b,c,d,e)=>a.mold_id==e.id)
.WhereIF(!string.IsNullOrEmpty(requisitionCode), (a, b, c, d) => a.code.Contains(requisitionCode))
.WhereIF(requisitionTimeArr!=null, (a, b, c, d) => a.requisition_time>=requisitionTimeArr[0] && a.requisition_time<=requisitionTimeArr[1])
.WhereIF(estimatedReturnArr!=null, (a, b, c, d) => a.estimated_return_time>=estimatedReturnArr[0] && a.estimated_return_time<=estimatedReturnArr[1])
.Select((a, b, c, d,e) => new ToolMoldRequisitionListOutput
{
id = a.id,
code = a.code,
mold_id = e.mold_code,
mo_task_id = b.mo_task_code,
equip_id = c.code+"/"+c.name,
recipient_id = d.RealName,
estimated_return_time = a.estimated_return_time==null ? "" : a.estimated_return_time.Value.ToString("yyyy-MM-dd"),
requisition_time = a.requisition_time==null ? "" : a.requisition_time.Value.ToString("yyyy-MM-dd"),
remark = a.remark
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<ToolMoldRequisitionListOutput>.SqlSugarPageResult(result);
}
private async Task<dynamic> Create(VisualDevModelDataCrInput input)
{
DbResult<bool> result = await _db.Ado.UseTranAsync(async () =>
{
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Create(templateEntity, input);
await _db.Updateable<ToolMolds>().SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.SCTypeId)
.Where(X => X.id == input.data["mold_id"]).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
}
}
}

67
EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs Normal file
View File

@@ -0,0 +1,67 @@
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
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 SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
using Tnb.ProductionMgr.Entities;
namespace Tnb.EquipMgr
{
/// <summary>
/// 模具归还接口
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class ToolMoldReturnService : IOverideVisualDevService, IToolMoldReturnService,IDynamicApiController, ITransient
{
private const string ModuleId = "27275901607701";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public ToolMoldReturnService(
ISqlSugarRepository<ToolMoldReturn> repository,
IRunService runService,
IVisualDevService visualDevService
)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
OverideFuncs.CreateAsync = Create;
}
private async Task<dynamic> Create(VisualDevModelDataCrInput input)
{
DbResult<bool> result = await _db.Ado.UseTranAsync(async () =>
{
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Create(templateEntity, input);
string locationId = "";
if (input.data.TryGetValue("location_id", out var value))
{
locationId = value.ToString();
}
await _db.Updateable<ToolMolds>()
.SetColumns(x => x.mold_status == Tnb.BasicData.DictConst.ZKTypeId)
.SetColumnsIF(!string.IsNullOrEmpty(locationId),x=>x.location_id==locationId)
.Where(X => X.id == input.data["mold_id"]).ExecuteCommandAsync();
});
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
}
}
}

34
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoListTreeOutput.cs
View File

@@ -18,7 +18,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// 工单id
/// </summary>
public string mo_id { get; set; }
public string mo_id { get; set; } = string.Empty;
/// <summary>
/// 工单代码
@@ -32,11 +32,11 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 物料名称
/// </summary>
public string material_name { get; set; }
public string material_name { get; set; } = string.Empty;
/// <summary>
/// 物料规格型号
/// </summary>
public string material_standard { get; set; }
public string material_standard { get; set; } = string.Empty;
/// <summary>
/// 工单类型：1-正常工单、2-返工工单、3-试制工单
@@ -51,37 +51,37 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 计划生产数量
/// </summary>
public string plan_qty { get; set; }
public string plan_qty { get; set; } = string.Empty;
/// <summary>
/// 已投入数量
/// </summary>
public string input_qty { get; set; }
public string input_qty { get; set; } = string.Empty;
/// <summary>
/// 已完工数量
/// </summary>
public string complete_qty { get; set; }
public string complete_qty { get; set; } = string.Empty;
/// <summary>
/// 报废数量
/// </summary>
public string scrap_qty { get; set; }
public string scrap_qty { get; set; } = string.Empty;
/// <summary>
/// 计划开始时间
/// </summary>
public string plan_start_date { get; set; }
public string plan_start_date { get; set; } = string.Empty;
/// <summary>
/// 计划结束时间
/// </summary>
public string plan_end_date { get; set; }
public string plan_end_date { get; set; } = string.Empty;
/// <summary>
/// 是否生派工单
/// </summary>
public string is_create_dispatch { get; set; }
public string is_create_dispatch { get; set; } = string.Empty;
/// <summary>
@@ -92,7 +92,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 是否合并
/// </summary>
public string is_merge { get; set; }
public string is_merge { get; set; } = string.Empty;
/// <summary>
/// 组合工单
@@ -112,7 +112,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 创建时间
/// </summary>
public string create_time { get; set; }
public string create_time { get; set; } = string.Empty;
/// <summary>
/// 修改用户
@@ -122,7 +122,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 修改时间
/// </summary>
public string modify_time { get; set; }
public string modify_time { get; set; } = string.Empty;
/// <summary>
/// 物料ID
/// </summary>
@@ -131,23 +131,23 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// <summary>
/// 已排产数量
/// </summary>
public string scheduled_qty { get; set; }
public string scheduled_qty { get; set; } = string.Empty;
/// <summary>
/// 父工单id
/// </summary>
public string parent_id { get; set; }
public string parent_id { get; set; } = string.Empty;
/// <summary>
/// 获取节点id.
/// </summary>
/// <returns></returns>
public string id { get; set; }
public string id { get; set; } = string.Empty;
/// <summary>
/// 获取节点父id.
/// </summary>
/// <returns></returns>
public string parentId { get; set; }
public string parentId { get; set; } = string.Empty;
/// <summary>
/// 是否有子级.

18
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdTaskManageListOutput.cs
View File

@@ -2,16 +2,16 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
{
public class PrdTaskManageListOutput
{
public string id { get; set; }
public string mo_task_code { get; set; }
public string material_id { get; set; }
public string mold_id { get; set; }
public string eqp_id { get; set; }
public string plan_start_date { get; set; }
public string plan_end_date { get; set; }
public string id { get; set; } = string.Empty;
public string mo_task_code { get; set; } = string.Empty;
public string material_id { get; set; } = string.Empty;
public string mold_id { get; set; } = string.Empty;
public string eqp_id { get; set; } = string.Empty;
public string plan_start_date { get; set; } = string.Empty;
public string plan_end_date { get; set; } = string.Empty;
public int? plan_qty { get; set; }
public int? complete_qty { get; set; }
public string mo_task_status { get; set; }
public string schedule_type { get; set; }
public string mo_task_status { get; set; } = string.Empty;
public string schedule_type { get; set; } = string.Empty;
}
}

8
taskschedule/Tnb.TaskScheduler/Listener/GenerateSpEquipCheckPlanTimeWorker.cs
View File

@@ -21,7 +21,7 @@ namespace JNPF.TaskScheduler.Listener
{
var db = _repository.AsSugarClient();
List<string> ids = _repository.GetList(x => x.status == "0").Select(x => x.equip_id).Distinct()
List<string?> ids = _repository.GetList(x => x.status == "0").Select(x => x.equip_id).Distinct()
.ToList();
List<EqpSpEquipCheckRecord> list = db.Queryable<EqpSpEquipCheckRecord>().GroupBy(x=>new
@@ -35,7 +35,7 @@ namespace JNPF.TaskScheduler.Listener
})
.MergeTable()
.LeftJoin<EqpSpEquipCheckRecord>((x,y)=>x.equip_id==y.equip_id && x.create_time.Value.ToString("yyyy-MM-dd")==y.create_time.Value.ToString("yyyy-MM-dd"))
.LeftJoin<EqpSpEquipCheckRecord>((x,y)=>x.equip_id==y.equip_id && x.create_time!.Value.ToString("yyyy-MM-dd")==y.create_time!.Value.ToString("yyyy-MM-dd"))
.Select((x,y)=>y)
.ToList();
@@ -48,7 +48,7 @@ namespace JNPF.TaskScheduler.Listener
{
if (item.warn_unit == "1")
{
if (item.end_time.Value.AddMonths(-item.warm_time.Value).ToString("yyyy-MM-dd") ==
if (item.end_time.Value.AddMonths(-item.warm_time!.Value).ToString("yyyy-MM-dd") ==
DateTime.Now.ToString("yyyy-MM-dd"))
{
insertList.Add(new EqpSpEquipCheckRecord()
@@ -61,7 +61,7 @@ namespace JNPF.TaskScheduler.Listener
}else if (item.warn_unit == "2")
{
if (item.end_time.Value.AddDays(-item.warm_time.Value).ToString("yyyy-MM-dd") ==
if (item.end_time.Value.AddDays(-item.warm_time!.Value).ToString("yyyy-MM-dd") ==
DateTime.Now.ToString("yyyy-MM-dd"))
{
insertList.Add(new EqpSpEquipCheckRecord()

8
taskschedule/Tnb.TaskScheduler/Listener/GenerateSpotInspectionPlanTimeWorker.cs
View File

@@ -180,13 +180,5 @@ namespace JNPF.TaskScheduler.Listener
Log.Information("----------------------结束生成点巡检计划----------------------");
}
/// <summary>
/// 最后一个点巡检记录
/// </summary>
private class SpotInsRecordLastDTO
{
public string spot_ins_tem_equip_id { get; set; }
public DateTime create_time { get; set; }
}
}
}

1
taskschedule/Tnb.TaskScheduler/TimeTaskService.cs
View File

@@ -449,7 +449,6 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie
})).ToList();
await _cacheManager.SetAsync(CommonConst.CACHEKEYTIMERJOB, taskMethods);
return taskMethods;
return new List<TaskMethodInfo>();
}
#endregion