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:
yang.lee
2023-11-16 14:06:32 +08:00
parent 70b8700cc3 6d930b53e5
commit 1cf5b63c57
6 changed files with 89 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ public partial class ToolMolds : BaseEntity<string>
/// <summary>
/// 成长周期
/// </summary>
public int? growth_cycle { get; set; }
public decimal? growth_cycle { get; set; }
/// <summary>
/// 型腔数

46
EquipMgr/Tnb.EquipMgr/ToolMoldRequisitionService.cs
View File

@@ -1,4 +1,5 @@
using System.Dynamic;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Filter;
@@ -7,10 +8,12 @@ using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
@@ -34,12 +37,16 @@ namespace Tnb.EquipMgr
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IBillRullService _billRuleService;
private readonly IUserManager _userManager;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public ToolMoldRequisitionService(
ISqlSugarRepository<ToolMoldRequisition> repository,
IRunService runService,
IVisualDevService visualDevService
IVisualDevService visualDevService,
IBillRullService billRullService,
IUserManager userManager
)
{
_db = repository.AsSugarClient();
@@ -47,6 +54,8 @@ namespace Tnb.EquipMgr
_visualDevService = visualDevService;
OverideFuncs.GetListAsync = GetList;
OverideFuncs.CreateAsync = Create;
_billRuleService= billRullService;
_userManager= userManager;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
@@ -96,13 +105,42 @@ namespace Tnb.EquipMgr
return PageResult<ToolMoldRequisitionListOutput>.SqlSugarPageResult(result);
}
private DateTime GetDateTime(long value)
{
DateTime unixStartTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
DateTime dateTime = unixStartTime.AddMilliseconds(value);
return dateTime;
}
private async Task<dynamic> Create(VisualDevModelDataCrInput input)
{
string Code = await _billRuleService.GetBillNumber("moldRequisition");
DbResult<bool> result = await _db.Ado.UseTranAsync(async () =>
{
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Create(templateEntity, input);
ToolMoldRequisition toolMoldRequisition = new ToolMoldRequisition();
toolMoldRequisition.code = Code;
toolMoldRequisition.mold_id= input.data[nameof(ToolMoldRequisition.mold_id)].ToString();
toolMoldRequisition.mo_task_id = input.data[nameof(ToolMoldRequisition.mo_task_id)].ToString();
toolMoldRequisition.equip_id = input.data[nameof(ToolMoldRequisition.equip_id)].ToString();
if (input.data[nameof(ToolMoldRequisition.requisition_time)] != null)
{
toolMoldRequisition.requisition_time = GetDateTime(long.Parse(input.data[nameof(ToolMoldRequisition.requisition_time)].ToString()!));
}
if (input.data[nameof(ToolMoldRequisition.estimated_return_time)] != null)
{
toolMoldRequisition.estimated_return_time = GetDateTime(long.Parse(input.data[nameof(ToolMoldRequisition.estimated_return_time)].ToString()!));
}
toolMoldRequisition.recipient_id = input.data[nameof(ToolMoldRequisition.recipient_id)].ToString();
if (input.data.ContainsKey(nameof(ToolMoldRequisition.remark)))
{
toolMoldRequisition.remark = input.data[nameof(ToolMoldRequisition.remark)].ToString();
}
toolMoldRequisition.create_time = DateTime.Now;
toolMoldRequisition.create_id = _userManager.UserId;
await _db.Insertable(toolMoldRequisition).ExecuteCommandAsync();
// 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)

43
EquipMgr/Tnb.EquipMgr/ToolMoldReturnService.cs
View File

@@ -1,8 +1,10 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
@@ -25,29 +27,60 @@ namespace Tnb.EquipMgr
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IBillRullService _billRuleService;
private readonly IUserManager _userManager;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public ToolMoldReturnService(
ISqlSugarRepository<ToolMoldReturn> repository,
IRunService runService,
IVisualDevService visualDevService
IVisualDevService visualDevService,
IBillRullService billRullService,
IUserManager userManager
)
{
_db = repository.AsSugarClient();
_runService = runService;
_visualDevService = visualDevService;
OverideFuncs.CreateAsync = Create;
_billRuleService= billRullService;
_userManager = userManager;
}
private DateTime GetDateTime(long value)
{
DateTime unixStartTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
DateTime dateTime = unixStartTime.AddMilliseconds(value);
return dateTime;
}
private async Task<dynamic> Create(VisualDevModelDataCrInput input)
{
string Code = await _billRuleService.GetBillNumber("moldReturn");
DbResult<bool> result = await _db.Ado.UseTranAsync(async () =>
{
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Create(templateEntity, input);
ToolMoldReturn toolMoldReturn = new ToolMoldReturn();
toolMoldReturn.code = Code;
toolMoldReturn.mold_id = input.data[nameof(ToolMoldReturn.mold_id)].ToString();
toolMoldReturn.location_id = input.data[nameof(ToolMoldReturn.location_id)].ToString();
if (input.data[nameof(ToolMoldReturn.return_id)] != null)
{
toolMoldReturn.return_id = input.data[nameof(ToolMoldReturn.return_id)].ToString();
}
if (input.data[nameof(ToolMoldReturn.return_time)] != null)
{
toolMoldReturn.return_time = GetDateTime(long.Parse(input.data[nameof(ToolMoldReturn.return_time)].ToString()!));
}
if (input.data.ContainsKey(nameof(ToolMoldReturn.remark)))
{
toolMoldReturn.remark = input.data[nameof(ToolMoldReturn.remark)].ToString();
}
toolMoldReturn.create_time = DateTime.Now;
toolMoldReturn.create_id = _userManager.UserId;
// VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
//await _runService.Create(templateEntity, input);
await _db.Insertable(toolMoldReturn).ExecuteCommandAsync();
string? locationId = "";
string ? locationId = "";
if (input.data.TryGetValue("location_id", out object? value))
{
locationId = value.ToString();

7
EquipMgr/Tnb.EquipMgr/ToolMoldsService.cs
View File

@@ -72,7 +72,12 @@ namespace Tnb.EquipMgr
private async Task<dynamic> Update(string id, VisualDevModelDataUpInput visualDevModelDataUpInput)
{
string? qrcode = visualDevModelDataUpInput.data.ContainsKey("qrcode") ? visualDevModelDataUpInput.data["qrcode"].ToString() : "";
string? qrcode = string.Empty;
if (visualDevModelDataUpInput.data.ContainsKey("qrcode") && visualDevModelDataUpInput.data["qrcode"] != null)
{
qrcode = visualDevModelDataUpInput.data["qrcode"].ToString();
}
if (!string.IsNullOrEmpty(qrcode) && await _repository.AsSugarClient().Queryable<BasQrcode>().AnyAsync(x => x.code == visualDevModelDataUpInput.data["qrcode"] && x.source_id != id))
{
throw Oops.Bah("二维码总表中已存在该二维码");

2
QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs
View File

@@ -56,7 +56,7 @@ namespace Tnb.QcMgr
.LeftJoin<BasProcess>((a, b, c) => a.processid == c.id)
.LeftJoin<OrganizeEntity>((a, b, c, d) => a.workid == d.Id)
.LeftJoin<UserEntity>((a, b, c, d, e) => a.execuser == e.Id)
.WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid)
.WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => b.name.Contains(materialid))
.WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype)
.WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status)
.Where((a, b, c, d, e) => a.status == list.Where(p => p.FullName == "已完成").First().Id)

2
QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
View File

@@ -67,7 +67,7 @@ namespace Tnb.QcMgr
.LeftJoin<BasProcess>((a, b, c) => a.processid == c.id)
.LeftJoin<OrganizeEntity>((a, b, c, d) => a.workid == d.Id)
.LeftJoin<UserEntity>((a, b, c, d, e) => a.execuser == e.Id)
.WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == materialid)
.WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d,e) => b.name.Contains(materialid))
.WhereIF(!string.IsNullOrEmpty(checktype), (a, b, c, d, e) => a.checktype == checktype)
.WhereIF(!string.IsNullOrEmpty(status), (a, b, c, d, e) => a.status == status)
.Where((a, b, c, d, e) => a.status == list.Where(p => p.FullName == "待执行").First().Id)