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

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

@@ -1,12 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Aspose.Cells.Drawing;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
@@ -17,21 +9,12 @@ using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.BasicData;
using Tnb.EquipMgr.Entities;
using Tnb.ProductionMgr.Entities.Dto;
using Tnb.ProductionMgr.Entities;
using Tnb.QcMgr.Entities;
using Tnb.QcMgr.Entities;
using Tnb.QcMgr.Entities.Entity;
using Tnb.QcMgr.Interfaces;
using JNPF.Common.Extension;
using Microsoft.AspNetCore.Authorization;
namespace Tnb.QcMgr
{
@@ -79,7 +62,7 @@ namespace Tnb.QcMgr
.WhereIF(!string.IsNullOrEmpty(materialid), (a, b, c, d, e) => a.materialid == 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)
.Where((a, b, c, d, e) => a.status == list.Where(p => p.FullName == "待执行").First().Id)
.Select((a, b, c, d, e) => new QcCheckExecHOut
{
id = a.id,
@@ -145,7 +128,7 @@ namespace Tnb.QcMgr
Item.name = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().name!;
Item.setData = new ExecItemData();
Item.setData.extype = QcCheckExecD.extype!;
Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckExecD.excontent!);
Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckExecD.excontent!);
Item.setData.check = QcCheckExecD.check!;
if (!string.IsNullOrEmpty(QcCheckExecD.errorcause))
{
@@ -174,7 +157,7 @@ namespace Tnb.QcMgr
Item.setShow.extype = !string.IsNullOrEmpty(Item.setData.extype);
Item.setShow.excontent = !string.IsNullOrEmpty(QcCheckExecD.excontent);
Item.setShow.check = !string.IsNullOrEmpty(Item.setData.check);
Item.setShow.errorcause = Item.setData.errorcause==null|| Item.setData.errorcause?.Count == 0 ? false : true;
Item.setShow.errorcause = Item.setData.errorcause == null || Item.setData.errorcause?.Count == 0 ? false : true;
Item.setShow.errorlevel = Item.setData.errorlevel == null || Item.setData.errorlevel?.Count == 0 ? false : true;
Item.setShow.remark = !string.IsNullOrEmpty(Item.setData.remark);
Item.setShow.attachment = !string.IsNullOrEmpty(Item.setData.attachment);
@@ -197,8 +180,8 @@ namespace Tnb.QcMgr
try
{
var QcCheckExecH = await db.Queryable<QcCheckExecH>().Where(p => p.id == CheckTaskInput.mainid).FirstAsync();
var DictionaryType = await db.Queryable<DictionaryTypeEntity>().Where(p=>p.FullName== "质检状态").FirstAsync();
var DictionaryData = await db.Queryable< DictionaryDataEntity >().Where(p => p.DictionaryTypeId==DictionaryType.Id&&p.FullName== "已完成").FirstAsync();
var DictionaryType = await db.Queryable<DictionaryTypeEntity>().Where(p => p.FullName == "质检状态").FirstAsync();
var DictionaryData = await db.Queryable<DictionaryDataEntity>().Where(p => p.DictionaryTypeId == DictionaryType.Id && p.FullName == "已完成").FirstAsync();
QcCheckExecH.checknum = CheckTaskInput.checknum;
QcCheckExecH.status = DictionaryData.Id;
QcCheckExecH.result = CheckTaskInput.result;
@@ -209,7 +192,7 @@ namespace Tnb.QcMgr
var QcCheckExecDinsert = new List<QcCheckExecD>();
if (CheckTaskInput.checktypes?.Count > 0)
{
for (int i=0;i< CheckTaskInput.checktypes.Count;i++)
for (int i = 0; i < CheckTaskInput.checktypes.Count; i++)
{
if (CheckTaskInput.checktypes[i].Count > 0)
{
@@ -285,10 +268,10 @@ namespace Tnb.QcMgr
Result.status = QcCheckExecH.status!;
Result.checktypes = new List<List<Checktype>>();
Result.result = QcCheckExecH.result;
var groupkeys = QcCheckExecDs.Select(p=>p.checkindex).Distinct().ToList();
var groupkeys = QcCheckExecDs.Select(p => p.checkindex).Distinct().ToList();
foreach (var key in groupkeys)
{
var QcCheckExecDsbykey= QcCheckExecDs.Where(p=>p.checkindex==key).ToList();
{
var QcCheckExecDsbykey = QcCheckExecDs.Where(p => p.checkindex == key).ToList();
var checktype = new List<Checktype>();
foreach (var QcCheckExecD in QcCheckExecDsbykey)
{
@@ -349,7 +332,7 @@ namespace Tnb.QcMgr
}
Result.checktypes.Add(checktype);
}
return Result;
}