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

模具领用归还

Browse Source
This commit is contained in:
周科达
2023-07-07 14:49:35 +08:00
parent 9488c6b6ca
commit dace6212de
8 changed files with 427 additions and 0 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 /// 保养状态待保养Code
/// </summary> /// </summary>
public const string UnMaintainStatusCode = "UnMaintain"; 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 #endregion
} }

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; }
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;
}
}
}