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

55
EquipMgr/Tnb.EquipMgr/EquipmentService.cs
View File

@@ -1,28 +1,21 @@
using Aop.Api.Domain;
using Aspose.Cells.Drawing;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Extras.CollectiveOAuth.Models;
using JNPF.FriendlyException;
using JNPF.Logging;
using JNPF.Systems.Entitys.Permission;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Senparc.NeuChar.ApiHandlers;
using SqlSugar;
using Tnb.BasicData;
using Tnb.BasicData.Entities;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
using Tnb.EquipMgr.Interfaces;
using Tnb.BasicData.Entities;
namespace Tnb.EquipMgr
{
@@ -75,7 +68,7 @@ namespace Tnb.EquipMgr
id = it.id,
eqp_code = it.code,
eqp_name = it.name,
eqp_type_code = SqlFunc.Subqueryable<EqpEquipType>().Where(x=>x.id == it.equip_type_id).Select(x=>x.code),
eqp_type_code = SqlFunc.Subqueryable<EqpEquipType>().Where(x => x.id == it.equip_type_id).Select(x => x.code),
//accept_status = it.accept_status,
//supplier_code = it.supplier_code,
install_date = it.install_date,
@@ -86,7 +79,7 @@ namespace Tnb.EquipMgr
.ToPagedListAsync(input.currentPage, input.pageSize);
return pagedList;
}
private async Task<dynamic> Create(VisualDevModelDataCrInput visualDevModelDataCrInput)
{
string qrcode = visualDevModelDataCrInput.data.ContainsKey("qrcode") ? visualDevModelDataCrInput.data["qrcode"]?.ToString() : "";
@@ -98,7 +91,7 @@ namespace Tnb.EquipMgr
{
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Create(templateEntity, visualDevModelDataCrInput);
string equipId = visualDevModelDataCrInput.data["ReturnIdentity"].ToString() ?? "";
if (!string.IsNullOrEmpty(qrcode))
@@ -117,18 +110,18 @@ namespace Tnb.EquipMgr
}
return await Task.FromResult(true);
}
private async Task<dynamic> Update(string id,VisualDevModelDataUpInput visualDevModelDataUpInput)
private async Task<dynamic> Update(string id, VisualDevModelDataUpInput visualDevModelDataUpInput)
{
string qrcode = visualDevModelDataUpInput.data.ContainsKey("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))
if (!string.IsNullOrEmpty(qrcode) && await _repository.AsSugarClient().Queryable<BasQrcode>().AnyAsync(x => x.code == visualDevModelDataUpInput.data["qrcode"] && x.source_id != id))
{
throw Oops.Bah("二维码总表中已存在该二维码");
}
else
{
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
await _runService.Update(id,templateEntity, visualDevModelDataUpInput);
await _runService.Update(id, templateEntity, visualDevModelDataUpInput);
if (!string.IsNullOrEmpty(qrcode))
{
@@ -157,7 +150,7 @@ namespace Tnb.EquipMgr
}
[HttpPost]
public async Task<EqpEquipment> GetEntityById(Dictionary<string,string> dic)
public async Task<EqpEquipment> GetEntityById(Dictionary<string, string> dic)
{
string id = dic["id"];
return await _repository.GetSingleAsync(x => x.id == id);
@@ -173,24 +166,24 @@ namespace Tnb.EquipMgr
}
[HttpPost]
public async Task<dynamic> GetWorklineAndEquipTree(Dictionary<string,string> dic)
public async Task<dynamic> GetWorklineAndEquipTree(Dictionary<string, string> dic)
{
string equipTypes = dic.ContainsKey("equipTypes") ? dic["equipTypes"] : "";
var db = _repository.AsSugarClient();
var queryable1 = db.Queryable<OrganizeEntity>()
.Where((a) => a.DeleteMark == null && a.Category==DictConst.RegionCategoryWorkshopCode)
.Where((a) => a.DeleteMark == null && a.Category == DictConst.RegionCategoryWorkshopCode)
.Select((a) => new WorklineAndEquipTreeOutput()
{
id = a.Id,
title = a.EnCode+"/"+a.FullName,
title = a.EnCode + "/" + a.FullName,
parentId = "0",
hasChildren = SqlFunc.Subqueryable<OrganizeEntity>().Where(b=>b.ParentId==a.Id && b.DeleteMark==null && b.Category==DictConst.RegionCategoryWorklineCode).Any(),
num = SqlFunc.Subqueryable<OrganizeEntity>().Where(b=>b.ParentId==a.Id && b.DeleteMark==null && b.Category==DictConst.RegionCategoryWorklineCode).Count(),
hasChildren = SqlFunc.Subqueryable<OrganizeEntity>().Where(b => b.ParentId == a.Id && b.DeleteMark == null && b.Category == DictConst.RegionCategoryWorklineCode).Any(),
num = SqlFunc.Subqueryable<OrganizeEntity>().Where(b => b.ParentId == a.Id && b.DeleteMark == null && b.Category == DictConst.RegionCategoryWorklineCode).Count(),
isLeaf = false,
children = SqlFunc.Subqueryable<OrganizeEntity>().Where(b=>b.ParentId==a.Id && b.DeleteMark==null && b.Category==DictConst.RegionCategoryWorklineCode).ToList(b=>new WorklineAndEquipTreeOutput()
children = SqlFunc.Subqueryable<OrganizeEntity>().Where(b => b.ParentId == a.Id && b.DeleteMark == null && b.Category == DictConst.RegionCategoryWorklineCode).ToList(b => new WorklineAndEquipTreeOutput()
{
id = b.Id,
title = b.EnCode+"/"+b.FullName,
title = b.EnCode + "/" + b.FullName,
parentId = b.ParentId,
hasChildren = false,
num = 0,
@@ -209,31 +202,31 @@ namespace Tnb.EquipMgr
id = a.id,
title = a.name,
parentId = "0",
hasChildren = SqlFunc.Subqueryable<EqpEquipment>().Where(b=>b.equip_type_id==a.id).Any(),
num = SqlFunc.Subqueryable<EqpEquipment>().Where(b=>b.equip_type_id==a.id).Count(),
hasChildren = SqlFunc.Subqueryable<EqpEquipment>().Where(b => b.equip_type_id == a.id).Any(),
num = SqlFunc.Subqueryable<EqpEquipment>().Where(b => b.equip_type_id == a.id).Count(),
isLeaf = false,
children = SqlFunc.Subqueryable<EqpEquipment>().Where(b=>b.equip_type_id==a.id).ToList(b=>new WorklineAndEquipTreeOutput()
children = SqlFunc.Subqueryable<EqpEquipment>().Where(b => b.equip_type_id == a.id).ToList(b => new WorklineAndEquipTreeOutput()
{
id = b.id,
title = b.code+"/"+b.name,
title = b.code + "/" + b.name,
parentId = b.equip_type_id,
hasChildren = false,
num = 0,
isLeaf = true,
})
}).ToListAsync();
}
// var list = await db.UnionAll(queryable1, queryable2).ToListAsync();
var list1 = await queryable1.ToListAsync();
list1.AddRange(list2);
return new AuthResponse(200, "", new Dictionary<string,object>()
return new AuthResponse(200, "", new Dictionary<string, object>()
{
["list"] = list1,
});
}
[HttpPost]
public async Task<EqpEquipment> GetEntityByQrcode(Dictionary<string, string> dic)
{