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

4
PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamOutput.cs
View File

@@ -3,9 +3,9 @@ namespace Tnb.PerMgr.Entities.Dto
public class ProcessParamOutput
{
public string? name { get; set; }
public decimal upper_value { get; set; }
public decimal lower_value { get; set; }
}
}

2
PerMgr/Tnb.PerMgr.Entities/Dto/ProcessParamTypeChildrenOutput.cs
View File

@@ -14,7 +14,7 @@ namespace Tnb.PerMgr.Entities.Dto
public decimal? value { get; set; }
public decimal upper_value { get; set; }
public decimal lower_value { get; set; }
public string? daq_id { get; set; }
}
}

4
PerMgr/Tnb.PerMgr.Entities/Entity/PerProcessStandardsD.cs
View File

@@ -18,7 +18,7 @@ public partial class PerProcessStandardsD : BaseEntity<string>
/// 工艺标准主表id
/// </summary>
public string process_standards_id { get; set; } = string.Empty;
/// <summary>
/// 工艺参数类型id
/// </summary>
@@ -43,7 +43,7 @@ public partial class PerProcessStandardsD : BaseEntity<string>
/// 下限
/// </summary>
public decimal? lower_value { get; set; }
/// <summary>
/// 数据采集id
/// </summary>

2
PerMgr/Tnb.PerMgr.Entities/Entity/PerProcessStandardsH.cs
View File

@@ -103,7 +103,7 @@ public partial class PerProcessStandardsH : BaseEntity<string>
/// 流程引擎Id
/// </summary>
public string? f_flowid { get; set; }
/// <summary>
/// 成型周期
/// </summary>

3
PerMgr/Tnb.PerMgr.Interfaces/IPerProcessParamService.cs
View File

@@ -1,4 +1,3 @@
using Microsoft.AspNetCore.Mvc;
using Tnb.PerMgr.Entities.Dto;
namespace Tnb.PerMgr.Interfaces
@@ -10,7 +9,7 @@ namespace Tnb.PerMgr.Interfaces
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
public Task<ProcessParamOutput> GetProcessParamInfo(Dictionary<string,string> dic);
public Task<ProcessParamOutput> GetProcessParamInfo(Dictionary<string, string> dic);
}
}

4
PerMgr/Tnb.PerMgr.Interfaces/IPerProcessParamTypeService.cs
View File

@@ -16,8 +16,8 @@ namespace Tnb.PerMgr.Interfaces
/// <param name="inpuy"></param>
/// <returns></returns>
public Task<string> SaveData(List<ProcessChildDataInput> input);
/// <summary>
/// 根据id获取修改信息
/// </summary>

6
PerMgr/Tnb.PerMgr.Interfaces/IPerProcessStandardsService.cs
View File

@@ -10,12 +10,12 @@ namespace Tnb.PerMgr.Interfaces
/// </summary>
/// <returns></returns>
public Task<IActionResult> ExportTemplate();
/// <summary>
/// 导入
/// </summary>
/// <returns></returns>
public Task<Dictionary<string,string>> Import(string id,ChunkModel input);
public Task<Dictionary<string, string>> Import(string id, ChunkModel input);
}
}

9
PerMgr/Tnb.PerMgr/PerProcessParamService.cs
View File

@@ -1,12 +1,7 @@
using JNPF.Common.Core.Manager;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using NPOI.SS.UserModel;
using NPOI.SS.Util;
using NPOI.XSSF.UserModel;
using SqlSugar;
using Tnb.PerMgr.Entities;
using Tnb.PerMgr.Entities.Dto;
@@ -23,13 +18,13 @@ namespace Tnb.PerMgr
{
private readonly ISqlSugarRepository<PerProcessParam> _repository;
private readonly IUserManager _userManager;
public PerProcessParamService(ISqlSugarRepository<PerProcessParam> repository, IUserManager userManager)
{
_userManager = userManager;
_repository = repository;
}
[HttpPost]
public async Task<ProcessParamOutput> GetProcessParamInfo(Dictionary<string, string> dic)
{

80
PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs
View File

@@ -22,7 +22,7 @@ namespace Tnb.PerMgr
{
private readonly ISqlSugarRepository<PerProcessParamType> _repository;
private readonly IUserManager _userManager;
public PerProcessParamTypeService(ISqlSugarRepository<PerProcessParamType> repository, IUserManager userManager)
{
_userManager = userManager;
@@ -40,27 +40,27 @@ namespace Tnb.PerMgr
//List<PerProcessParamType> perProcessParamTypes = await _repository.GetListAsync(x => x.equip_type_id == equipTypeId);
var result = await db.Queryable<PerProcessParamType>()
.Where(x => x.equip_type_id == equipTypeId)
.OrderBy(x=>x.ordinal)
.OrderBy(x => x.ordinal)
.Select(x => new
{
tab_id = x.id,
tab_name = x.name,
daq_list = SqlFunc.Subqueryable<EqpDaq>().Where(a=>a.equip_id==equipId).ToList<ProcessParamTypeDaqListOutput>(a=>new ProcessParamTypeDaqListOutput
daq_list = SqlFunc.Subqueryable<EqpDaq>().Where(a => a.equip_id == equipId).ToList<ProcessParamTypeDaqListOutput>(a => new ProcessParamTypeDaqListOutput
{
id = a.id,
label_name = a.label_name,
}),
children = SqlFunc.Subqueryable<PerProcessParam>()
.LeftJoin<PerToleranceCategory>((y,z)=>y.tolerance_category_id==z.id)
.Where(y=>y.process_param_type_id==x.id)
.OrderBy((y,z)=>y.ordinal)
.ToList<ProcessParamTypeChildrenOutput>((y,z)=>new ProcessParamTypeChildrenOutput
{
process_param_id = y.id,
name = y.name,
upper_value = z.upper_value,
lower_value = z.lower_value
}),
.LeftJoin<PerToleranceCategory>((y, z) => y.tolerance_category_id == z.id)
.Where(y => y.process_param_type_id == x.id)
.OrderBy((y, z) => y.ordinal)
.ToList<ProcessParamTypeChildrenOutput>((y, z) => new ProcessParamTypeChildrenOutput
{
process_param_id = y.id,
name = y.name,
upper_value = z.upper_value,
lower_value = z.lower_value
}),
}).ToListAsync();
@@ -105,10 +105,10 @@ namespace Tnb.PerMgr
};
await db.Insertable<PerProcessParamEditRecord>(record).ExecuteCommandAsync();
}
}
if (item==null || string.IsNullOrEmpty(item.id))
if (item == null || string.IsNullOrEmpty(item.id))
{
PerProcessStandardsD insertObj = new PerProcessStandardsD()
{
@@ -116,20 +116,20 @@ namespace Tnb.PerMgr
process_param_id = item?.process_param_id ?? "",
process_standards_id = item?.process_standards_id ?? "",
process_param_type_id = item?.process_param_type_id ?? "",
daq_id = item?.daq_id??"",
daq_id = item?.daq_id ?? "",
};
insertIds.Add(insertObj.id);
await db.Insertable<PerProcessStandardsD>(insertObj).ExecuteCommandAsync();
}
else
{
await db.Updateable<PerProcessStandardsD>()
.SetColumns(x=>x.value==item.value)
.SetColumns(x=>x.daq_id==item.daq_id)
.Where(x=>x.id==item.id).ExecuteCommandAsync();
.SetColumns(x => x.value == item.value)
.SetColumns(x => x.daq_id == item.daq_id)
.Where(x => x.id == item.id).ExecuteCommandAsync();
}
}
List<string> notDeleteIds = input.Select(x => x.id).ToList();
@@ -138,9 +138,9 @@ namespace Tnb.PerMgr
}
});
if(!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
if (!result.IsSuccess) throw Oops.Oh(ErrorCode.COM1008);
return result.IsSuccess ? "保存成功" : result.ErrorMessage;
}
@@ -156,31 +156,31 @@ namespace Tnb.PerMgr
var result = await db.Queryable<PerProcessParamType>()
.Where(a => a.equip_type_id == equipTypeId)
.OrderBy(a=>a.ordinal)
.OrderBy(a => a.ordinal)
.Select(a => new
{
tab_id = a.id,
tab_name = a.name,
daq_list = SqlFunc.Subqueryable<EqpDaq>().Where(e=>e.equip_id==perProcessStandardsH.equip_id).ToList<ProcessParamTypeDaqListOutput>(e=>new ProcessParamTypeDaqListOutput
daq_list = SqlFunc.Subqueryable<EqpDaq>().Where(e => e.equip_id == perProcessStandardsH.equip_id).ToList<ProcessParamTypeDaqListOutput>(e => new ProcessParamTypeDaqListOutput
{
id = e.id,
label_name = e.label_name,
}),
children = SqlFunc.Subqueryable<PerProcessStandardsD>()
.LeftJoin<PerProcessParam>((b,c)=>b.process_param_id==c.id)
.LeftJoin<PerToleranceCategory>((b,c,d)=>c.tolerance_category_id==d.id)
.Where((b,c,d)=>c.process_param_type_id==a.id && b.process_standards_id==id)
.OrderBy((b,c,d)=>c.ordinal)
.ToList<ProcessParamTypeChildrenOutput>((b,c,d)=>new ProcessParamTypeChildrenOutput
{
id = b.id,
process_param_id = c.id,
name = c.name,
value = b.value,
upper_value = d.upper_value,
lower_value = d.lower_value,
daq_id = b.daq_id
}),
.LeftJoin<PerProcessParam>((b, c) => b.process_param_id == c.id)
.LeftJoin<PerToleranceCategory>((b, c, d) => c.tolerance_category_id == d.id)
.Where((b, c, d) => c.process_param_type_id == a.id && b.process_standards_id == id)
.OrderBy((b, c, d) => c.ordinal)
.ToList<ProcessParamTypeChildrenOutput>((b, c, d) => new ProcessParamTypeChildrenOutput
{
id = b.id,
process_param_id = c.id,
name = c.name,
value = b.value,
upper_value = d.upper_value,
lower_value = d.lower_value,
daq_id = b.daq_id
}),
}).ToListAsync();

83
PerMgr/Tnb.PerMgr/PerProcessStandardsService.cs
View File

@@ -1,18 +1,12 @@
using System.Data;
using JNPF;
using JNPF.Common.Configuration;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Enums;
using JNPF.Common.Helper;
using JNPF.Common.Models;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Common;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
@@ -20,7 +14,6 @@ using NPOI.SS.Util;
using NPOI.XSSF.UserModel;
using SqlSugar;
using Tnb.PerMgr.Entities;
using Tnb.PerMgr.Entities.Dto;
using Tnb.PerMgr.Interfaces;
namespace Tnb.PerMgr
@@ -36,8 +29,8 @@ namespace Tnb.PerMgr
private readonly IUserManager _userManager;
private readonly FileManager _fileManager;
private readonly FileService _fileService;
public PerProcessStandardsService(ISqlSugarRepository<PerProcessStandardsH> repository,
public PerProcessStandardsService(ISqlSugarRepository<PerProcessStandardsH> repository,
FileService fileService,
FileManager fileManager,
IUserManager userManager)
@@ -47,7 +40,7 @@ namespace Tnb.PerMgr
_fileManager = fileManager;
_fileService = fileService;
}
[AllowAnonymous]
[HttpGet]
public async Task<IActionResult> ExportTemplate()
@@ -55,13 +48,13 @@ namespace Tnb.PerMgr
try
{
var db = _repository.AsSugarClient();
string[] perProcessParamTypes = await db.Queryable<PerProcessParamType>().OrderBy(x => x.ordinal).Select(x=>x.name).ToArrayAsync();
string[] perProcessParams = await db.Queryable<PerProcessParam>().OrderBy(x => x.ordinal).Select(x=>x.name).ToArrayAsync();
string[] perProcessParamTypes = await db.Queryable<PerProcessParamType>().OrderBy(x => x.ordinal).Select(x => x.name).ToArrayAsync();
string[] perProcessParams = await db.Queryable<PerProcessParam>().OrderBy(x => x.ordinal).Select(x => x.name).ToArrayAsync();
XSSFWorkbook workbook = new XSSFWorkbook();
NPOI.SS.UserModel.ISheet sheet = workbook.CreateSheet("BOM详情");
IRow row1 = sheet.CreateRow(0);
string[] titles = new[] { "工艺参数类型", "工艺参数", "设定值" };
@@ -69,11 +62,11 @@ namespace Tnb.PerMgr
{
ICell cell1 = row1.CreateCell(i);
cell1.SetCellValue(titles[i]);
sheet.SetColumnWidth(i,15 * 256);
sheet.SetColumnWidth(i, 15 * 256);
}
// int rowIndex = 1;
// var column = sheet.GetColumn(0);
// 设置下拉项
var validationHelper = sheet.GetDataValidationHelper();
@@ -81,15 +74,15 @@ namespace Tnb.PerMgr
var region = new CellRangeAddressList(1, 1000, 0, 0);
var validation = validationHelper.CreateValidation(constraint, region);
sheet.AddValidationData(validation);
var constraint2 = validationHelper.CreateExplicitListConstraint(perProcessParams);
var region2 = new CellRangeAddressList(1, 1000, 1, 1);
var validation2 = validationHelper.CreateValidation(constraint2, region2);
sheet.AddValidationData(validation2);
MemoryStream ms = new MemoryStream();
workbook.Write(ms);
MemoryStream ms2 = new MemoryStream(ms.ToArray());
ms2.Position = 0;
@@ -101,11 +94,11 @@ namespace Tnb.PerMgr
Console.WriteLine(e);
throw Oops.Bah("导出失败");
}
}
[HttpPost]
public async Task<Dictionary<string,string>> Import([FromForm]string id, [FromForm]ChunkModel input)
public async Task<Dictionary<string, string>> Import([FromForm] string id, [FromForm] ChunkModel input)
{
int rowIndex = 1;
bool flag = false;
@@ -114,16 +107,16 @@ namespace Tnb.PerMgr
{
using (Stream stream = input.file.OpenReadStream())
{
// 2007版本
if (input.fileName.IndexOf(".xlsx") > 0)
workbook = new XSSFWorkbook(stream);
else if (input.fileName.IndexOf(".xls") > 0)
workbook = new HSSFWorkbook(stream);
ISheet? sheet = workbook?.GetSheetAt(0);
if(workbook==null || sheet==null)
if (workbook == null || sheet == null)
throw Oops.Bah("无导入数据");
if (sheet?.LastRowNum <= 1)
@@ -133,12 +126,12 @@ namespace Tnb.PerMgr
List<PerProcessParamType> perProcessParamTypes = await db.Queryable<PerProcessParamType>().ToListAsync();
List<PerProcessParam> perProcessParams = await db.Queryable<PerProcessParam>().ToListAsync();
int errorColumnIndex = 5;
ICellStyle style = workbook.CreateCellStyle();
IFont font = workbook.CreateFont();
IFont font = workbook.CreateFont();
font.Color = IndexedColors.Red.Index; // 将字体颜色设置为红色
style.SetFont(font);
List<PerProcessStandardsD> list = new List<PerProcessStandardsD>() { };
for (rowIndex = 1; rowIndex <= sheet?.LastRowNum; rowIndex++)
{
@@ -170,14 +163,14 @@ namespace Tnb.PerMgr
else
{
ICell errorCell = row.GetCell(errorColumnIndex) ?? row.CreateCell(errorColumnIndex);
errorCell.SetCellValue(errorCell.StringCellValue+",无该工艺参数");
errorCell.SetCellValue(errorCell.StringCellValue + ",无该工艺参数");
errorCell.CellStyle = style;
flag = true;
}
if (!TrySetNumberCellValue(cell2, ref item))
{
ICell errorCell = row.GetCell(errorColumnIndex) ?? row.CreateCell(errorColumnIndex);
errorCell.SetCellValue(errorCell.StringCellValue+",设定值不是数字");
errorCell.SetCellValue(errorCell.StringCellValue + ",设定值不是数字");
errorCell.CellStyle = style;
flag = true;
}
@@ -186,7 +179,7 @@ namespace Tnb.PerMgr
list.Add(item);
}
if (row.GetCell(errorColumnIndex) != null)
{
row.GetCell(errorColumnIndex).SetCellValue(row.GetCell(errorColumnIndex).StringCellValue.Substring(1));
@@ -199,18 +192,18 @@ namespace Tnb.PerMgr
.FirstAsync(x =>
x.process_param_id == item.process_param_id &&
x.process_param_type_id == item.process_param_type_id && x.process_standards_id == id);
if (oldData!=null)
if (oldData != null)
{
if (oldData.value != item.value)
{
PerProcessStandardsH perProcessStandardsH = await _repository.AsSugarClient().Queryable<PerProcessStandardsH>().SingleAsync(x => x.id == oldData.process_standards_id);
PerProcessParam processParam = await _repository.AsSugarClient().Queryable<PerProcessParam>().SingleAsync(x => x.id == oldData.process_param_id);
await _repository.AsSugarClient().Updateable<PerProcessStandardsD>()
.SetColumns(x=>x.value==item.value)
.Where(x=>x.id==oldData.id).ExecuteCommandAsync();
.SetColumns(x => x.value == item.value)
.Where(x => x.id == oldData.id).ExecuteCommandAsync();
PerProcessParamEditRecord record = new PerProcessParamEditRecord
{
process_param_id = item.process_param_id,
@@ -234,14 +227,14 @@ namespace Tnb.PerMgr
if (flag)
{
MemoryStream ms = new MemoryStream();
workbook?.Write(ms);
string fileName = $"工艺标准导入报错{DateTime.Now.Ticks}.xlsx";
using (MemoryStream ms2 = new MemoryStream(ms.ToArray()))
{
ms2.Position = 0;
await _fileManager.UploadFileByType(ms2, FileVariable.TemporaryFilePath, fileName);
}
return new Dictionary<string, string>()
{
@@ -258,21 +251,21 @@ namespace Tnb.PerMgr
["msg"] = "导入成功",
};
}
}
}
catch (Exception e)
{
{
Console.WriteLine(e.Message);
JNPF.Logging.Log.Error("工艺标准导入失败", e);
throw Oops.Bah("导入失败");
}
}
private bool TrySetNumberCellValue(ICell cell,ref PerProcessStandardsD item)
private bool TrySetNumberCellValue(ICell cell, ref PerProcessStandardsD item)
{
try
{

4
PerMgr/Tnb.PerMgr/Tnb.PerMgr.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>