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:
qianjiawei
2023-10-23 17:35:09 +08:00
parent c01d2854dd
commit 846ff28c47
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs
View File

@@ -94,6 +94,8 @@ namespace Tnb.QcMgr.Entities
public string? greaterThanValue { get; set; } public string? greaterThanValue { get; set; }
public string? lessThanValue { get; set; } public string? lessThanValue { get; set; }
public string? excontentText { get; set; } public string? excontentText { get; set; }
public string? value { get; set; }
public List<ExcontentOption>? excontentOptions { get; set; } public List<ExcontentOption>? excontentOptions { get; set; }
} }
public class ExcontentOption public class ExcontentOption

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

@@ -284,6 +284,7 @@ namespace Tnb.QcMgr
Result.checknum = QcCheckExecH.checknum!; Result.checknum = QcCheckExecH.checknum!;
Result.status = QcCheckExecH.status!; Result.status = QcCheckExecH.status!;
Result.checktypes = new List<List<Checktype>>(); 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) foreach (var key in groupkeys)
{ {
@@ -304,6 +305,7 @@ namespace Tnb.QcMgr
Item.itemdid = QcCheckExecD.id!; Item.itemdid = QcCheckExecD.id!;
Item.code = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().code!; Item.code = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().code!;
Item.name = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().name!; Item.name = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().name!;
Item.result = QcCheckExecD.result;
Item.setData = new ExecItemData(); Item.setData = new ExecItemData();
Item.setData.extype = QcCheckExecD.extype!; Item.setData.extype = QcCheckExecD.extype!;
Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckExecD.excontent!); Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckExecD.excontent!);