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-06-16 17:31:02 +08:00
parent 66b8eb1ac3
commit f8828de7e4
11 changed files with 701 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
View File

@@ -83,11 +83,12 @@ namespace Tnb.QcMgr
Item.name = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().name!;
Item.setData = new PlanItemData();
Item.setData.extype = QcCheckPlanD.extype!;
Item.setData.excontent = QcCheckPlanD.excontent!;
Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckPlanD.excontent!);
Item.setData.check = QcCheckPlanD.check!;
if (!string.IsNullOrEmpty(QcCheckPlanD.errorcause))
Item.setData.errorcause = QcCheckPlanD.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
Item.setData.errorlevel = QcCheckPlanD.errorlevel!;
if (!string.IsNullOrEmpty(QcCheckPlanD.errorlevel))
Item.setData.errorlevel = QcCheckPlanD.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
Item.setData.remark = QcCheckPlanD.remark!;
Item.setData.attachment = QcCheckPlanD.attachment!;
Item.setData.customer = QcCheckPlanD.custom!;
@@ -95,10 +96,10 @@ namespace Tnb.QcMgr
Item.setData.isexec = JSON.Deserialize<IsexecP>(QcCheckPlanD.isexec!);
Item.setShow = new PlanItemShow();
Item.setShow.extype = !string.IsNullOrEmpty(Item.setData.extype);
Item.setShow.excontent = !string.IsNullOrEmpty(Item.setData.excontent);
Item.setShow.excontent = !string.IsNullOrEmpty(QcCheckPlanD.excontent);
Item.setShow.check = !string.IsNullOrEmpty(Item.setData.check);
Item.setShow.errorcause = Item.setData.errorcause == null ? false : true;
Item.setShow.errorlevel = !string.IsNullOrEmpty(Item.setData.errorlevel);
Item.setShow.errorlevel = Item.setData.errorlevel == null ? false : true;
Item.setShow.remark = !string.IsNullOrEmpty(Item.setData.remark);
Item.setShow.attachment = !string.IsNullOrEmpty(Item.setData.attachment);
Item.setShow.customer = !string.IsNullOrEmpty(Item.setData.customer);
@@ -129,8 +130,11 @@ namespace Tnb.QcMgr
TriggerPlan.code = triggerPlan.code!;
TriggerPlan.type = triggerPlan.type!;
TriggerPlan.cycle = triggerPlan.cycle!;
TriggerPlan.trieventid = triggerPlan.trievent!.Replace("[", "").Replace("]", "").Replace("\r\n", "").Replace("\"", "").Replace(" ","").Split(',', StringSplitOptions.RemoveEmptyEntries);
TriggerPlan.trievent = QcTriggerEvents.Where(p => TriggerPlan.trieventid.Contains(p.id)).Select(p => p.name!).ToArray();
if (!string.IsNullOrEmpty(triggerPlan.trievent))
{
TriggerPlan.trieventid = triggerPlan.trievent!.Replace("[", "").Replace("]", "").Replace("\r\n", "").Replace("\"", "").Replace(" ", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
TriggerPlan.trievent = QcTriggerEvents.Where(p => TriggerPlan.trieventid.Contains(p.id)).Select(p => p.name!).ToArray();
}
TriggerPlans.Add(TriggerPlan);
}
return TriggerPlans;
@@ -167,8 +171,8 @@ namespace Tnb.QcMgr
QcCheckPlanD.extype = item.extype;
QcCheckPlanD.excontent = item.excontent;
QcCheckPlanD.check = item.check;
QcCheckPlanD.errorcause = item.errorcause;
QcCheckPlanD.errorlevel = item.errorlevel;
QcCheckPlanD.errorcause = item.errorcause.Replace("\"", "").Trim();
QcCheckPlanD.errorlevel = item.errorlevel.Replace("\"", "").Trim();
QcCheckPlanD.remark = item.remark;
QcCheckPlanD.attachment = item.attachment;
QcCheckPlanD.isexec = item.isexec;