wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
QcMgr/Tnb.QcMgr/QcCheckItemService.cs
View File

@@ -34,14 +34,14 @@ namespace Tnb.QcMgr
private async Task Delete(string id)
{
var db = _repository.AsSugarClient();
var QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == id).FirstAsync();
var QcCheckItemsRs = await db.Queryable<QcCheckItemsR>().Where(p => p.itemshid == id).ToListAsync();
var QcCheckItemsDs = await db.Queryable<QcCheckItemsD>().Where(p => QcCheckItemsRs.Select(p => p.itemsdid).ToList().Contains(p.id)).ToListAsync();
ISqlSugarClient db = _repository.AsSugarClient();
QcCheckItemsH QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == id).FirstAsync();
List<QcCheckItemsR> QcCheckItemsRs = await db.Queryable<QcCheckItemsR>().Where(p => p.itemshid == id).ToListAsync();
List<QcCheckItemsD> QcCheckItemsDs = await db.Queryable<QcCheckItemsD>().Where(p => QcCheckItemsRs.Select(p => p.itemsdid).ToList().Contains(p.id)).ToListAsync();
await db.Ado.BeginTranAsync();
await db.Deleteable(QcCheckItemsH).ExecuteCommandAsync();
await db.Deleteable(QcCheckItemsRs).ExecuteCommandAsync();
await db.Deleteable(QcCheckItemsDs).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckItemsH).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckItemsRs).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckItemsDs).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
@@ -52,33 +52,37 @@ namespace Tnb.QcMgr
[HttpGet]
public async Task<dynamic> GetCheckItem()
{
var db = _repository.AsSugarClient();
List<CheckItemOut> CheckItemOuts = new List<CheckItemOut>();
ISqlSugarClient db = _repository.AsSugarClient();
List<CheckItemOut> CheckItemOuts = new();
var datas = await db.Queryable<QcCheckItem>().InnerJoin<QcCheckType>((a, b) => a.type == b.id).Select((a, b) => new
{
id = a.id,
name = a.name,
code = a.code,
type = a.type,
a.id,
a.name,
a.code,
a.type,
typename = b.name
}).ToListAsync();
foreach (var data in datas)
{
if (CheckItemOuts.Where(p => p.checktypeid == data.type).Any())
{
var CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
CheckItemOut CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
if (CheckItemOut.items == null)
{
CheckItemOut.items = new List<CheckItem>();
CheckItemOut.items.Add(new CheckItem { itemid = data.id, name = data.name!, code = data.code! });
CheckItemOut.items = new List<CheckItem>
{
new CheckItem { itemid = data.id, name = data.name!, code = data.code! }
};
}
else
{
CheckItemOut.items.Add(new CheckItem { itemid = data.id, name = data.name!, code = data.code! });
}
}
else
{
CheckItemOuts.Add(new CheckItemOut { checktypeid = data.type!, checktypename = data.typename!, items = new List<CheckItem>() });
var CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
CheckItemOut CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
CheckItemOut.items?.Add(new CheckItem() { itemid = data.id, name = data.name!, code = data.code! });
}
}
@@ -93,68 +97,92 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task<dynamic> GetCheckItems(CheckItemsInput CheckItemsInput)
{
var db = _repository.AsSugarClient();
var QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
var QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
var QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == CheckItemsInput.id).FirstAsync();
List<QcCheckItemsR> QcCheckItemsRs = new List<QcCheckItemsR>();
List<QcCheckItemsD> QcCheckItemsDs = new List<QcCheckItemsD>();
ISqlSugarClient db = _repository.AsSugarClient();
List<QcCheckItem> QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
List<QcCheckType> QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
QcCheckItemsH QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == CheckItemsInput.id).FirstAsync();
List<QcCheckItemsR> QcCheckItemsRs = new();
List<QcCheckItemsD> QcCheckItemsDs = new();
if (QcCheckItemsH != null)
{
QcCheckItemsRs = await db.Queryable<QcCheckItemsR>().Where(p => p.itemshid == QcCheckItemsH.id).ToListAsync();
if (QcCheckItemsRs != null)
{
QcCheckItemsDs = await db.Queryable<QcCheckItemsD>().Where(p => QcCheckItemsRs.Select(p => p.itemsdid).ToList().Contains(p.id)).ToListAsync();
}
}
else
{
throw Oops.Oh(ErrorCode.COM1005);
var CheckItemsOut = new CheckItemsOut();
CheckItemsOut.id = QcCheckItemsH.id;
CheckItemsOut.name = QcCheckItemsH.name!;
CheckItemsOut.status = QcCheckItemsH.status!;
CheckItemsOut.checktypes = new List<CheckTypeOut>();
}
CheckItemsOut CheckItemsOut = new()
{
id = QcCheckItemsH.id,
name = QcCheckItemsH.name!,
status = QcCheckItemsH.status!,
checktypes = new List<CheckTypeOut>()
};
if (QcCheckItemsRs != null && QcCheckItemsDs != null)
{
foreach (var QcCheckItemsR in QcCheckItemsRs)
foreach (QcCheckItemsR QcCheckItemsR in QcCheckItemsRs)
{
if (CheckItemsOut.checktypes.Where(p => p.checktypeid == QcCheckItemsR.typeid).ToList().Count == 0)
{
CheckTypeOut checkType = new CheckTypeOut();
checkType.checktypeid = QcCheckItemsR.typeid!;
checkType.checktypename = QcCheckTypes.Where(p => p.id == QcCheckItemsR.typeid).First().name!;
checkType.items = new List<ItemOut>();
CheckTypeOut checkType = new()
{
checktypeid = QcCheckItemsR.typeid!,
checktypename = QcCheckTypes.Where(p => p.id == QcCheckItemsR.typeid).First().name!,
items = new List<ItemOut>()
};
CheckItemsOut.checktypes.Add(checkType);
}
var item = QcCheckItemsDs.Where(p => p.id == QcCheckItemsR.itemsdid).FirstOrDefault();
QcCheckItemsD? item = QcCheckItemsDs.Where(p => p.id == QcCheckItemsR.itemsdid).FirstOrDefault();
if (item != null)
{
ItemOut Item = new ItemOut();
Item.itemid = QcCheckItemsR.itemid!;
Item.itemdid = item.id!;
Item.code = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().code!;
Item.name = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().name!;
Item.setData = new Data();
Item.setData.extype = item.extype!;
Item.setData.excontent = JSON.Deserialize<Excontent>(item.excontent!);
Item.setData.check = item.check!;
ItemOut Item = new()
{
itemid = QcCheckItemsR.itemid!,
itemdid = item.id!,
code = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().code!,
name = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().name!,
setData = new Data
{
extype = item.extype!,
excontent = JSON.Deserialize<Excontent>(item.excontent!),
check = item.check!
}
};
if (!string.IsNullOrEmpty(item.errorcause))
{
Item.setData.errorcause = item.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
}
if (!string.IsNullOrEmpty(item.errorlevel))
{
Item.setData.errorlevel = item.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
}
Item.setData.remark = item.remark!;
Item.setData.attachment = item.attachment!;
Item.setData.customer = item.custom!;
if (!string.IsNullOrEmpty(item.isexec))
{
Item.setData.isexec = JSON.Deserialize<Isexec>(item.isexec!);
Item.setShow = new Show();
Item.setShow.extype = !string.IsNullOrEmpty(Item.setData.extype);
Item.setShow.excontent = !string.IsNullOrEmpty(item.excontent);
Item.setShow.check = !string.IsNullOrEmpty(Item.setData.check);
Item.setShow.errorcause = Item.setData.errorcause == null ? false : true;
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);
Item.setShow.isexec = Item.setData.isexec == null ? false : true;
}
Item.setShow = new Show
{
extype = !string.IsNullOrEmpty(Item.setData.extype),
excontent = !string.IsNullOrEmpty(item.excontent),
check = !string.IsNullOrEmpty(Item.setData.check),
errorcause = Item.setData.errorcause != null,
errorlevel = Item.setData.errorlevel != null,
remark = !string.IsNullOrEmpty(Item.setData.remark),
attachment = !string.IsNullOrEmpty(Item.setData.attachment),
customer = !string.IsNullOrEmpty(Item.setData.customer),
isexec = Item.setData.isexec != null
};
CheckItemsOut.checktypes.Where(p => p.checktypeid == QcCheckItemsR.typeid).First().items?.Add(Item);
}
}
@@ -171,27 +199,32 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task SaveData(CheckItemsInput CheckItemsInput)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
try
{
if (!string.IsNullOrEmpty(CheckItemsInput.id))
{
await Delete(CheckItemsInput.id);
QcCheckItemsH QcCheckItemsH = new QcCheckItemsH();
QcCheckItemsH.name = CheckItemsInput.name;
QcCheckItemsH.status = CheckItemsInput.status;
QcCheckItemsH.create_time = DateTime.Now;
QcCheckItemsH.create_id = _userManager.UserId;
List<QcCheckItemsR> QcCheckItemsRs = new List<QcCheckItemsR>();
List<QcCheckItemsD> QcCheckItemsDs = new List<QcCheckItemsD>();
}
QcCheckItemsH QcCheckItemsH = new()
{
name = CheckItemsInput.name,
status = CheckItemsInput.status,
create_time = DateTime.Now,
create_id = _userManager.UserId
};
List<QcCheckItemsR> QcCheckItemsRs = new();
List<QcCheckItemsD> QcCheckItemsDs = new();
if (CheckItemsInput.checktypes != null)
{
foreach (var checktype in CheckItemsInput.checktypes)
foreach (CheckTypeInput checktype in CheckItemsInput.checktypes)
{
if (checktype.items != null)
{
foreach (var item in checktype.items)
foreach (ItemInput item in checktype.items)
{
var QcCheckItemsD = new QcCheckItemsD()
QcCheckItemsD QcCheckItemsD = new()
{
extype = item.extype,
excontent = item.excontent,
@@ -204,7 +237,7 @@ namespace Tnb.QcMgr
custom = item.customer
};
QcCheckItemsDs.Add(QcCheckItemsD);
var QcCheckItemsR = new QcCheckItemsR()
QcCheckItemsR QcCheckItemsR = new()
{
itemshid = QcCheckItemsH.id,
typeid = checktype.id,
@@ -224,9 +257,9 @@ namespace Tnb.QcMgr
});
await db.Ado.BeginTranAsync();
await db.Insertable(QcCheckItemsH).ExecuteCommandAsync();
await db.Insertable(QcCheckItemsRs).ExecuteCommandAsync();
await db.Insertable(QcCheckItemsDs).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckItemsH).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckItemsRs).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckItemsDs).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
catch (Exception)

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

@@ -41,21 +41,21 @@ namespace Tnb.QcMgr
}
private async Task Delete(string id)
{
var db = _repository.AsSugarClient();
var QcCheckPlanH = await db.Queryable<QcCheckPlanH>().Where(p => p.id == id).FirstAsync();
var QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
var QcCheckPlanAdds = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).ToListAsync();
var QcCheckPlanMaterials = await db.Queryable<QcCheckPlanMaterial>().Where(p => p.planid == id).ToListAsync();
var QcCheckPlanProcesss = await db.Queryable<QcCheckPlanProcess>().Where(p => p.planid == id).ToListAsync();
var QcCheckPlanWorks = await db.Queryable<QcCheckPlanWork>().Where(p => p.planid == id).ToListAsync();
ISqlSugarClient db = _repository.AsSugarClient();
QcCheckPlanH QcCheckPlanH = await db.Queryable<QcCheckPlanH>().Where(p => p.id == id).FirstAsync();
List<QcCheckPlanD> QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
List<QcCheckPlanAdd> QcCheckPlanAdds = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).ToListAsync();
List<QcCheckPlanMaterial> QcCheckPlanMaterials = await db.Queryable<QcCheckPlanMaterial>().Where(p => p.planid == id).ToListAsync();
List<QcCheckPlanProcess> QcCheckPlanProcesss = await db.Queryable<QcCheckPlanProcess>().Where(p => p.planid == id).ToListAsync();
List<QcCheckPlanWork> QcCheckPlanWorks = await db.Queryable<QcCheckPlanWork>().Where(p => p.planid == id).ToListAsync();
await _timeTaskService.DeleteByName("生成质检任务" + QcCheckPlanH.id);
await db.Ado.BeginTranAsync();
await db.Deleteable(QcCheckPlanH).ExecuteCommandAsync();
await db.Deleteable(QcCheckPlanDs).ExecuteCommandAsync();
await db.Deleteable(QcCheckPlanAdds).ExecuteCommandAsync();
await db.Deleteable(QcCheckPlanMaterials).ExecuteCommandAsync();
await db.Deleteable(QcCheckPlanProcesss).ExecuteCommandAsync();
await db.Deleteable(QcCheckPlanWorks).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckPlanH).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckPlanDs).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckPlanAdds).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckPlanMaterials).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckPlanProcesss).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckPlanWorks).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
/// <summary>
@@ -66,15 +66,17 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task<dynamic> GetCheckItems(string id)
{
var db = _repository.AsSugarClient();
var QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
var QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
var QcCheckPlanAdd = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).FirstAsync();
var QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
var CheckPlansOut = new CheckPlansOut();
CheckPlansOut.id = id;
CheckPlansOut.hasadd = false;
CheckPlansOut.hasitem = false;
ISqlSugarClient db = _repository.AsSugarClient();
List<QcCheckItem> QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
List<QcCheckType> QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
QcCheckPlanAdd QcCheckPlanAdd = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).FirstAsync();
List<QcCheckPlanD> QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
CheckPlansOut CheckPlansOut = new()
{
id = id,
hasadd = false,
hasitem = false
};
if (QcCheckPlanAdd != null)
{
CheckPlansOut.hasadd = true;
@@ -87,54 +89,61 @@ namespace Tnb.QcMgr
{
CheckPlansOut.hasitem = true;
CheckPlansOut.checktypes = new List<CheckPlanTypeOut>();
foreach (var QcCheckPlanD in QcCheckPlanDs)
foreach (QcCheckPlanD QcCheckPlanD in QcCheckPlanDs)
{
if (CheckPlansOut.checktypes.Where(p => p.checktypeid == QcCheckPlanD.typeid).ToList().Count == 0)
{
CheckPlanTypeOut checkType = new CheckPlanTypeOut();
checkType.checktypeid = QcCheckPlanD.typeid!;
checkType.checktypename = QcCheckTypes.Where(p => p.id == QcCheckPlanD.typeid).First().name!;
checkType.items = new List<PlanItemOut>();
CheckPlanTypeOut checkType = new()
{
checktypeid = QcCheckPlanD.typeid!,
checktypename = QcCheckTypes.Where(p => p.id == QcCheckPlanD.typeid).First().name!,
items = new List<PlanItemOut>()
};
CheckPlansOut.checktypes.Add(checkType);
}
PlanItemOut Item = new PlanItemOut();
Item.itemid = QcCheckPlanD.itemid!;
Item.itemdid = QcCheckPlanD.id!;
Item.code = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().code!;
Item.name = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().name!;
Item.setData = new PlanItemData();
Item.setData.extype = QcCheckPlanD.extype!;
Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckPlanD.excontent!);
Item.setData.check = QcCheckPlanD.check!;
PlanItemOut Item = new()
{
itemid = QcCheckPlanD.itemid!,
itemdid = QcCheckPlanD.id!,
code = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().code!,
name = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().name!,
setData = new PlanItemData
{
extype = QcCheckPlanD.extype!,
excontent = JSON.Deserialize<Excontent>(QcCheckPlanD.excontent!),
check = QcCheckPlanD.check!
}
};
if (!string.IsNullOrEmpty(QcCheckPlanD.errorcause))
{
Item.setData.errorcause = QcCheckPlanD.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
}
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!;
if (!string.IsNullOrEmpty(QcCheckPlanD.isexec))
{
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(QcCheckPlanD.excontent);
Item.setShow.check = !string.IsNullOrEmpty(Item.setData.check);
Item.setShow.errorcause = Item.setData.errorcause == null ? false : true;
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);
if (Item.setData.isexec == null)
{
Item.setShow.isexec = false;
}
else
Item.setShow = new PlanItemShow
{
if (!Item.setData.isexec.attachment && !Item.setData.isexec.remark)
Item.setShow.isexec = false;
else
Item.setShow.isexec = true;
}
extype = !string.IsNullOrEmpty(Item.setData.extype),
excontent = !string.IsNullOrEmpty(QcCheckPlanD.excontent),
check = !string.IsNullOrEmpty(Item.setData.check),
errorcause = Item.setData.errorcause != null,
errorlevel = Item.setData.errorlevel != null,
remark = !string.IsNullOrEmpty(Item.setData.remark),
attachment = !string.IsNullOrEmpty(Item.setData.attachment),
customer = !string.IsNullOrEmpty(Item.setData.customer)
};
Item.setShow.isexec = Item.setData.isexec != null && (Item.setData.isexec.attachment || Item.setData.isexec.remark);
CheckPlansOut.checktypes.Where(p => p.checktypeid == QcCheckPlanD.typeid).First()?.items?.Add(Item);
}
@@ -150,18 +159,20 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task<dynamic> GetTriggerPlans()
{
var db = _repository.AsSugarClient();
var QcTriggerPlans = await db.Queryable<QcTriggerPlan>().ToListAsync();
var QcTriggerEvents = await db.Queryable<QcTriggerEvent>().ToListAsync();
List<TriggerPlan> TriggerPlans = new List<TriggerPlan>();
foreach (var triggerPlan in QcTriggerPlans)
ISqlSugarClient db = _repository.AsSugarClient();
List<QcTriggerPlan> QcTriggerPlans = await db.Queryable<QcTriggerPlan>().ToListAsync();
List<QcTriggerEvent> QcTriggerEvents = await db.Queryable<QcTriggerEvent>().ToListAsync();
List<TriggerPlan> TriggerPlans = new();
foreach (QcTriggerPlan triggerPlan in QcTriggerPlans)
{
TriggerPlan TriggerPlan = new TriggerPlan();
TriggerPlan.id = triggerPlan.id;
TriggerPlan.name = triggerPlan.name!;
TriggerPlan.code = triggerPlan.code!;
TriggerPlan.type = triggerPlan.type!;
TriggerPlan.cycle = triggerPlan.cycle!;
TriggerPlan TriggerPlan = new()
{
id = triggerPlan.id,
name = triggerPlan.name!,
code = triggerPlan.code!,
type = triggerPlan.type!,
cycle = triggerPlan.cycle!
};
if (!string.IsNullOrEmpty(triggerPlan.trievent))
{
TriggerPlan.trieventid = triggerPlan.trievent!.Replace("[", "").Replace("]", "").Replace("\r\n", "").Replace("\"", "").Replace(" ", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
@@ -180,69 +191,81 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task SaveData(CheckPlanInput CheckPlanInput)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
try
{
if (string.IsNullOrEmpty(CheckPlanInput.mainid))
{
return;
}
await _timeTaskService.DeleteByName("生成质检任务" + CheckPlanInput.mainid);
await db.Deleteable<QcCheckPlanD>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
await db.Deleteable<QcCheckPlanAdd>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
QcCheckPlanAdd QcCheckPlanAdd = new QcCheckPlanAdd();
QcCheckPlanAdd.mainid = CheckPlanInput.mainid;
QcCheckPlanAdd.triggertype = CheckPlanInput.triggertype;
QcCheckPlanAdd.content = CheckPlanInput.content;
QcCheckPlanAdd.number = CheckPlanInput.number;
List<QcCheckPlanD> QcCheckPlanDs = new List<QcCheckPlanD>();
_ = await db.Deleteable<QcCheckPlanD>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
_ = await db.Deleteable<QcCheckPlanAdd>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
QcCheckPlanAdd QcCheckPlanAdd = new()
{
mainid = CheckPlanInput.mainid,
triggertype = CheckPlanInput.triggertype,
content = CheckPlanInput.content,
number = CheckPlanInput.number
};
List<QcCheckPlanD> QcCheckPlanDs = new();
if (CheckPlanInput.checktypes != null)
{
foreach (var checktype in CheckPlanInput.checktypes)
foreach (CheckPlanTypeInput checktype in CheckPlanInput.checktypes)
{
if (checktype.items != null)
{
foreach (var item in checktype.items)
foreach (PlanItemInput item in checktype.items)
{
QcCheckPlanD QcCheckPlanD = new QcCheckPlanD();
QcCheckPlanD.mainid = CheckPlanInput.mainid;
QcCheckPlanD.typeid = checktype.id;
QcCheckPlanD.itemid = item.itemid;
QcCheckPlanD.extype = item.extype;
QcCheckPlanD.excontent = item.excontent;
QcCheckPlanD.check = item.check;
QcCheckPlanD.errorcause = item.errorcause?.Replace("\"", "").Trim();
QcCheckPlanD.errorlevel = item.errorlevel?.Replace("\"", "").Trim();
QcCheckPlanD.remark = item.remark;
QcCheckPlanD.attachment = item.attachment;
QcCheckPlanD.isexec = item.isexec;
QcCheckPlanD.custom = item.customer;
QcCheckPlanD.create_id = _userManager.UserId;
QcCheckPlanD.create_time = DateTime.Now;
QcCheckPlanD QcCheckPlanD = new()
{
mainid = CheckPlanInput.mainid,
typeid = checktype.id,
itemid = item.itemid,
extype = item.extype,
excontent = item.excontent,
check = item.check,
errorcause = item.errorcause?.Replace("\"", "").Trim(),
errorlevel = item.errorlevel?.Replace("\"", "").Trim(),
remark = item.remark,
attachment = item.attachment,
isexec = item.isexec,
custom = item.customer,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
QcCheckPlanDs.Add(QcCheckPlanD);
}
}
}
}
await db.Ado.BeginTranAsync();
await db.Insertable(QcCheckPlanDs).ExecuteCommandAsync();
await db.Insertable(QcCheckPlanAdd).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckPlanDs).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckPlanAdd).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
if (QcCheckPlanAdd.triggertype == ((int)EnumTriggerType.周期触发).ToString() || QcCheckPlanAdd.triggertype == ((int)EnumTriggerType.一次性).ToString())
{
var comtentModel = new ContentModel();
comtentModel.cron = QcCheckPlanAdd.content!.Replace("\"", "");
comtentModel.interfaceId = "";
comtentModel.interfaceName = "";
comtentModel.parameter = new List<InterfaceParameter>();
ContentModel comtentModel = new()
{
cron = QcCheckPlanAdd.content!.Replace("\"", ""),
interfaceId = "",
interfaceName = "",
parameter = new List<InterfaceParameter>()
};
comtentModel.parameter!.Add(new InterfaceParameter() { field = "id", value = QcCheckPlanAdd.mainid, defaultValue = "" });
if (QcCheckPlanAdd.triggertype == ((int)EnumTriggerType.一次性).ToString())
{
comtentModel.parameter!.Add(new InterfaceParameter() { field = "doonce", value = true.ToString(), defaultValue = "" });
}
comtentModel.localHostTaskId = "QcTaskTimeWorker/CreateTask";
comtentModel.startTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
comtentModel.TenantId = _userManager?.TenantId!;
comtentModel.TenantDbName = _userManager?.TenantDbName!;
comtentModel.ConnectionConfig = _userManager?.ConnectionConfig!;
comtentModel.Token = _userManager?.ToKen!;
TimeTaskCrInput timeTaskCrInput = new TimeTaskCrInput()
TimeTaskCrInput timeTaskCrInput = new()
{
enCode = DateTime.Now.ToString("yyyyMMddHHmmss"),
fullName = "生成质检任务" + QcCheckPlanAdd.mainid,
@@ -271,7 +294,7 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task CreateTask(TriggerPlanEntity entity)
{
var Query = _repository.AsSugarClient().Queryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork>
ISugarQueryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork> Query = _repository.AsSugarClient().Queryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork>
((a, b, c, d, e) => new object[] {
JoinType.Inner,a.id== b.mainid,
JoinType.Left,a.id == c.planid,
@@ -279,9 +302,9 @@ namespace Tnb.QcMgr
JoinType.Left,a.id == e.planid,
});
GetQuery(Query, entity);
var list = await Query.ToListAsync();
List<string> removes = new List<string>();
foreach (var data in list)
List<QcCheckPlanH> list = await Query.ToListAsync();
List<string> removes = new();
foreach (QcCheckPlanH data in list)
{
if (!string.IsNullOrEmpty(entity.materialid))
{
@@ -322,25 +345,27 @@ namespace Tnb.QcMgr
// .WhereIF(!string.IsNullOrEmpty(entity.workid), (a, b, c, d, e) => e.workid == entity.workid).ToListAsync();
Filter(list, entity);
if (list.Count > 0)
{
await SaveTask(list, entity);
}
}
private void GetQuery(ISugarQueryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork> Query, TriggerPlanEntity entity)
{
var DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
List<DictionaryDataEntity> DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
((a, b) => new object[] { JoinType.Left, a.DictionaryTypeId == b.Id, })
.Where((a, b) => b.FullName == "质检类型选择").ToList();
var TriggerEvent = new QcTriggerEvent();
var enumTriggerEvent = entity.triggerevent;
var remark = RemarkAttribute.GetRemark(enumTriggerEvent);
var type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id;
QcTriggerEvent TriggerEvent = new();
EnumTriggerEvent? enumTriggerEvent = entity.triggerevent;
RemarkAttribute remark = RemarkAttribute.GetRemark(enumTriggerEvent);
string type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id;
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == type && p.name == remark.CheckContent).First();
Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id));
}
private void Filter(List<QcCheckPlanH> QcCheckPlanHs, TriggerPlanEntity entity)
{
var removePlanHs = new List<QcCheckPlanH>();
var enumTriggerEvent = entity.triggerevent;
foreach (var plan in QcCheckPlanHs)
List<QcCheckPlanH> removePlanHs = new();
EnumTriggerEvent? enumTriggerEvent = entity.triggerevent;
foreach (QcCheckPlanH plan in QcCheckPlanHs)
{
if (enumTriggerEvent == EnumTriggerEvent.首件检换模具)
{
@@ -378,9 +403,11 @@ namespace Tnb.QcMgr
}
if (enumTriggerEvent == EnumTriggerEvent.生产检定量)
{
var number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
if ((entity.newpronum + entity.oldpronum / number) <= (entity.oldpronum / number))
int? number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
if ((entity.newpronum + (entity.oldpronum / number)) <= (entity.oldpronum / number))
{
removePlanHs.Add(plan);
}
}
if (enumTriggerEvent == EnumTriggerEvent.生产检定码)
{
@@ -388,9 +415,11 @@ namespace Tnb.QcMgr
}
if (enumTriggerEvent == EnumTriggerEvent.生产检产出频次)
{
var number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
int? number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
if ((entity.pronum % number) != 0)
{
removePlanHs.Add(plan);
}
}
if (enumTriggerEvent == EnumTriggerEvent.生产检固定次数)
{
@@ -401,49 +430,53 @@ namespace Tnb.QcMgr
}
}
removePlanHs.ForEach(p => { QcCheckPlanHs.Remove(p); });
removePlanHs.ForEach(p => { _ = QcCheckPlanHs.Remove(p); });
}
private async Task SaveTask(List<QcCheckPlanH> planhs, TriggerPlanEntity entity)
{
var DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
DictionaryDataEntity DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
((a, b) => new object[] { JoinType.Left, a.DictionaryTypeId == b.Id, })
.Where((a, b) => b.FullName == "质检状态" && a.FullName == "待执行").First();
var plands = await _repository.AsSugarClient().Queryable<QcCheckPlanD>().Where(p => planhs.Select(p => p.id).ToList().Contains(p.mainid!)).ToListAsync();
foreach (var planh in planhs)
List<QcCheckPlanD> plands = await _repository.AsSugarClient().Queryable<QcCheckPlanD>().Where(p => planhs.Select(p => p.id).ToList().Contains(p.mainid!)).ToListAsync();
foreach (QcCheckPlanH planh in planhs)
{
var time = DateTime.Now;
QcCheckExecH qcCheckExecH = new QcCheckExecH();
qcCheckExecH.id = SnowflakeIdHelper.NextId();
qcCheckExecH.checktype = planh.checktype;
qcCheckExecH.status = DictionaryData.Id;
qcCheckExecH.tasktime = time.ToString("yyyy-MM-dd HH:mm:ss");
qcCheckExecH.materialid = entity.materialid;
qcCheckExecH.processid = entity.processid;
qcCheckExecH.workid = entity.workid;
qcCheckExecH.create_id = _userManager.UserId;
qcCheckExecH.create_time = time;
var ExecDs = new List<QcCheckExecD>();
foreach (var pland in plands.Where(p => p.mainid == planh.id).ToList())
DateTime time = DateTime.Now;
QcCheckExecH qcCheckExecH = new()
{
QcCheckExecD QcCheckExecD = new QcCheckExecD();
QcCheckExecD.mainid = qcCheckExecH.id;
QcCheckExecD.extype = pland.extype;
QcCheckExecD.excontent = pland.excontent;
QcCheckExecD.check = pland.check;
QcCheckExecD.errorcause = pland.errorcause;
QcCheckExecD.errorlevel = pland.errorlevel;
QcCheckExecD.remark = pland.remark;
QcCheckExecD.attachment = pland.attachment;
QcCheckExecD.isexec = pland.isexec;
QcCheckExecD.custom = pland.custom;
QcCheckExecD.typeid = pland.typeid;
QcCheckExecD.itemid = pland.itemid;
QcCheckExecD.create_id = _userManager.UserId;
QcCheckExecD.create_time = time;
id = SnowflakeIdHelper.NextId(),
checktype = planh.checktype,
status = DictionaryData.Id,
tasktime = time.ToString("yyyy-MM-dd HH:mm:ss"),
materialid = entity.materialid,
processid = entity.processid,
workid = entity.workid,
create_id = _userManager.UserId,
create_time = time
};
List<QcCheckExecD> ExecDs = new();
foreach (QcCheckPlanD? pland in plands.Where(p => p.mainid == planh.id).ToList())
{
QcCheckExecD QcCheckExecD = new()
{
mainid = qcCheckExecH.id,
extype = pland.extype,
excontent = pland.excontent,
check = pland.check,
errorcause = pland.errorcause,
errorlevel = pland.errorlevel,
remark = pland.remark,
attachment = pland.attachment,
isexec = pland.isexec,
custom = pland.custom,
typeid = pland.typeid,
itemid = pland.itemid,
create_id = _userManager.UserId,
create_time = time
};
ExecDs.Add(QcCheckExecD);
}
await _repository.AsSugarClient().Insertable(qcCheckExecH).ExecuteCommandAsync();
await _repository.AsSugarClient().Insertable(ExecDs).ExecuteCommandAsync();
_ = await _repository.AsSugarClient().Insertable(qcCheckExecH).ExecuteCommandAsync();
_ = await _repository.AsSugarClient().Insertable(ExecDs).ExecuteCommandAsync();
}
}

76
QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs
View File

@@ -34,22 +34,24 @@ namespace Tnb.QcMgr
}
private async Task<dynamic> GetListAsync(VisualDevModelListQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("ok", "合格");
dic.Add("no", "不合格");
dic.Add("barelyok", "让步合格");
dic.Add("await", "待检");
dic.Add("temporarily", "暂控");
Dictionary<string, string> queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, string> dic = new()
{
{ "ok", "合格" },
{ "no", "不合格" },
{ "barelyok", "让步合格" },
{ "await", "待检" },
{ "temporarily", "暂控" }
};
Dictionary<string, string>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
string materialid = queryJson.ContainsKey("materialid") ? queryJson["materialid"].ToString() : "";
string checktype = queryJson.ContainsKey("checktype") ? queryJson["checktype"].ToString() : "";
string status = queryJson.ContainsKey("status") ? queryJson["status"].ToString() : "";
var list = await db.Queryable<DictionaryDataEntity>()
List<DictionaryDataEntity> list = await db.Queryable<DictionaryDataEntity>()
.LeftJoin<DictionaryTypeEntity>((a, b) => a.DictionaryTypeId == b.Id)
.Where((a, b) => b.FullName == "质检状态" || b.FullName == "质检类型选择").ToListAsync();
var BasLocations = await db.Queryable<BasLocation>().ToListAsync();
var result = await db.Queryable<QcCheckExecH>()
List<BasLocation> BasLocations = await db.Queryable<BasLocation>().ToListAsync();
SqlSugarPagedList<QcCheckExecHOut> result = await db.Queryable<QcCheckExecH>()
.LeftJoin<BasMaterial>((a, b) => a.materialid == b.id)
.LeftJoin<BasProcess>((a, b, c) => a.processid == c.id)
.LeftJoin<OrganizeEntity>((a, b, c, d) => a.workid == d.Id)
@@ -69,11 +71,11 @@ namespace Tnb.QcMgr
checknum = a.checknum,
status = a.status,
result = a.result,
tasktime = a.tasktime == null ? "" : a.tasktime,
exectime = a.exectime == null ? "" : a.exectime,
execuser = e.RealName == null ? "" : e.RealName,
tasktime = a.tasktime ?? "",
exectime = a.exectime ?? "",
execuser = e.RealName ?? "",
}).OrderByDescending(a => DateTime.Parse(a.exectime)).ToPagedListAsync(input.currentPage, input.pageSize);
foreach (var item in result.list)
foreach (QcCheckExecHOut? item in result.list)
{
item.checktype = list.Select(p => p.Id).Contains(item.checktype) ? list.Where(p => p.Id == item.checktype).First().FullName : "";
item.status = list.Select(p => p.Id).Contains(item.status) ? list.Where(p => p.Id == item.status).First().FullName : "";
@@ -86,31 +88,27 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task<dynamic> GetCheckTask(VisualDevModelListQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("ok", "合格");
dic.Add("no", "不合格");
dic.Add("barelyOk", "让步合格");
dic.Add("await", "待检");
dic.Add("temporarily", "暂控");
Dictionary<string, string> queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, string> dic = new()
{
{ "ok", "合格" },
{ "no", "不合格" },
{ "barelyOk", "让步合格" },
{ "await", "待检" },
{ "temporarily", "暂控" }
};
Dictionary<string, string>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
string materialid = queryJson.ContainsKey("materialid") ? queryJson["materialid"].ToString() : "";
string checktype = queryJson.ContainsKey("checktype") ? queryJson["checktype"].ToString() : "";
string status = queryJson.ContainsKey("status") ? queryJson["status"].ToString() : "";
var list = await db.Queryable<DictionaryDataEntity>()
List<DictionaryDataEntity> list = await db.Queryable<DictionaryDataEntity>()
.LeftJoin<DictionaryTypeEntity>((a, b) => a.DictionaryTypeId == b.Id)
.Where((a, b) => b.FullName == "质检状态" || b.FullName == "质检类型选择").ToListAsync();
var BasLocations = await db.Queryable<BasLocation>().ToListAsync();
Expression<Func<QcCheckExecHOut, object>> expression;
if (list.Where(p => p.FullName == "待执行").First().Id == status)
{
expression = a => DateTime.Parse(a.tasktime!);
}
else
{
expression = a => DateTime.Parse(a.exectime!);
}
var result = await db.Queryable<QcCheckExecH>()
List<BasLocation> BasLocations = await db.Queryable<BasLocation>().ToListAsync();
Expression<Func<QcCheckExecHOut, object>> expression = list.Where(p => p.FullName == "待执行").First().Id == status
? (a => DateTime.Parse(a.tasktime!))
: (a => DateTime.Parse(a.exectime!));
SqlSugarPagedList<QcCheckExecHOut> result = await db.Queryable<QcCheckExecH>()
.LeftJoin<BasMaterial>((a, b) => a.materialid == b.id)
.LeftJoin<BasProcess>((a, b, c) => a.processid == c.id)
.LeftJoin<OrganizeEntity>((a, b, c, d) => a.workid == d.Id)
@@ -130,12 +128,12 @@ namespace Tnb.QcMgr
checknum = a.checknum,
status = a.status,
result = a.result,
tasktime = a.tasktime == null ? "" : a.tasktime,
exectime = a.exectime == null ? "" : a.exectime,
execuser = e.RealName == null ? "" : e.RealName,
tasktime = a.tasktime ?? "",
exectime = a.exectime ?? "",
execuser = e.RealName ?? "",
}).OrderByDescending(expression).ToPagedListAsync(input.currentPage, input.pageSize);
foreach (var item in result.list)
foreach (QcCheckExecHOut? item in result.list)
{
item.checktype = list.Select(p => p.Id).Contains(item.checktype) ? list.Where(p => p.Id == item.checktype).First().FullName : "";
item.status = list.Select(p => p.Id).Contains(item.status) ? list.Where(p => p.Id == item.status).First().FullName : "";

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

@@ -39,22 +39,24 @@ namespace Tnb.QcMgr
private async Task<dynamic> GetListAsync(VisualDevModelListQueryInput input)
{
var db = _repository.AsSugarClient();
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("ok", "合格");
dic.Add("no", "不合格");
dic.Add("barelyok", "让步合格");
dic.Add("await", "待检");
dic.Add("temporarily", "暂控");
Dictionary<string, string> queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, string> dic = new()
{
{ "ok", "合格" },
{ "no", "不合格" },
{ "barelyok", "让步合格" },
{ "await", "待检" },
{ "temporarily", "暂控" }
};
Dictionary<string, string>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, string>>(input.queryJson) : new Dictionary<string, string>();
string materialid = queryJson.ContainsKey("materialid") ? queryJson["materialid"].ToString() : "";
string checktype = queryJson.ContainsKey("checktype") ? queryJson["checktype"].ToString() : "";
string status = queryJson.ContainsKey("status") ? queryJson["status"].ToString() : "";
var list = await db.Queryable<DictionaryDataEntity>()
List<DictionaryDataEntity> list = await db.Queryable<DictionaryDataEntity>()
.LeftJoin<DictionaryTypeEntity>((a, b) => a.DictionaryTypeId == b.Id)
.Where((a, b) => b.FullName == "质检状态" || b.FullName == "质检类型选择").ToListAsync();
var BasLocations = await db.Queryable<BasLocation>().ToListAsync();
var result = await db.Queryable<QcCheckExecH>()
List<BasLocation> BasLocations = await db.Queryable<BasLocation>().ToListAsync();
SqlSugarPagedList<QcCheckExecHOut> result = await db.Queryable<QcCheckExecH>()
.LeftJoin<BasMaterial>((a, b) => a.materialid == b.id)
.LeftJoin<BasProcess>((a, b, c) => a.processid == c.id)
.LeftJoin<OrganizeEntity>((a, b, c, d) => a.workid == d.Id)
@@ -74,11 +76,11 @@ namespace Tnb.QcMgr
checknum = a.checknum,
status = a.status,
result = a.result,
tasktime = a.tasktime == null ? "" : a.tasktime,
exectime = a.exectime == null ? "" : a.exectime,
execuser = e.RealName == null ? "" : e.RealName,
tasktime = a.tasktime ?? "",
exectime = a.exectime ?? "",
execuser = e.RealName ?? "",
}).OrderByDescending(a => DateTime.Parse(a.tasktime)).ToPagedListAsync(input.currentPage, input.pageSize);
foreach (var item in result.list)
foreach (QcCheckExecHOut? item in result.list)
{
item.checktype = list.Select(p => p.Id).Contains(item.checktype) ? list.Where(p => p.Id == item.checktype).First().FullName : "";
item.status = list.Select(p => p.Id).Contains(item.status) ? list.Where(p => p.Id == item.status).First().FullName : "";
@@ -95,55 +97,66 @@ namespace Tnb.QcMgr
[HttpGet]
public async Task<dynamic> GetTaskItems(string id)
{
var db = _repository.AsSugarClient();
var QcCheckExecH = await db.Queryable<QcCheckExecH>().Where(p => p.id == id).FirstAsync();
var QcCheckExecDs = await db.Queryable<QcCheckExecD>().Where(p => p.mainid == id).ToListAsync();
var QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
var QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
var QcErrorCauses = await db.Queryable<QcErrorCause>().ToListAsync();
var QcErrorLevels = await db.Queryable<QcErrorLevel>().ToListAsync();
ISqlSugarClient db = _repository.AsSugarClient();
QcCheckExecH QcCheckExecH = await db.Queryable<QcCheckExecH>().Where(p => p.id == id).FirstAsync();
List<QcCheckExecD> QcCheckExecDs = await db.Queryable<QcCheckExecD>().Where(p => p.mainid == id).ToListAsync();
List<QcCheckItem> QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
List<QcCheckType> QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
List<QcErrorCause> QcErrorCauses = await db.Queryable<QcErrorCause>().ToListAsync();
List<QcErrorLevel> QcErrorLevels = await db.Queryable<QcErrorLevel>().ToListAsync();
CheckTaskOut CheckTaskOut = new CheckTaskOut();
CheckTaskOut.mainid = id;
CheckTaskOut.wareid = QcCheckExecH.wareid!;
CheckTaskOut.workid = QcCheckExecH.workid!;
CheckTaskOut.status = QcCheckExecH.status!;
CheckTaskOut CheckTaskOut = new()
{
mainid = id,
wareid = QcCheckExecH.wareid!,
workid = QcCheckExecH.workid!,
status = QcCheckExecH.status!
};
if (!string.IsNullOrEmpty(CheckTaskOut.workid))
{
CheckTaskOut.workname = db.Queryable<OrganizeEntity>().Where(p => p.Id == CheckTaskOut.workid).First().FullName;
}
CheckTaskOut.checktypes = new List<CheckExecTypeOut>();
foreach (var QcCheckExecD in QcCheckExecDs)
foreach (QcCheckExecD QcCheckExecD in QcCheckExecDs)
{
if (CheckTaskOut.checktypes.Where(p => p.checktypeid == QcCheckExecD.typeid).ToList().Count == 0)
{
CheckExecTypeOut checkType = new CheckExecTypeOut();
checkType.checktypeid = QcCheckExecD.typeid!;
checkType.checktypename = QcCheckTypes.Where(p => p.id == QcCheckExecD.typeid).First().name!;
checkType.items = new List<ExecItemOut>();
CheckExecTypeOut checkType = new()
{
checktypeid = QcCheckExecD.typeid!,
checktypename = QcCheckTypes.Where(p => p.id == QcCheckExecD.typeid).First().name!,
items = new List<ExecItemOut>()
};
CheckTaskOut.checktypes.Add(checkType);
}
ExecItemOut Item = new ExecItemOut();
Item.itemid = QcCheckExecD.itemid!;
Item.itemdid = QcCheckExecD.id!;
Item.code = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().code!;
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.check = QcCheckExecD.check!;
ExecItemOut Item = new()
{
itemid = QcCheckExecD.itemid!,
itemdid = QcCheckExecD.id!,
code = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().code!,
name = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().name!,
setData = new ExecItemData
{
extype = QcCheckExecD.extype!,
excontent = JSON.Deserialize<Excontent>(QcCheckExecD.excontent!),
check = QcCheckExecD.check!
}
};
if (!string.IsNullOrEmpty(QcCheckExecD.errorcause))
{
var strs = QcCheckExecD.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
string[] strs = QcCheckExecD.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
Item.setData.errorcause = new List<Error>();
foreach (var str in strs)
foreach (string str in strs)
{
Item.setData.errorcause.Add(new Error { id = str, name = QcErrorCauses.Where(p => p.id == str).First().name! });
}
}
if (!string.IsNullOrEmpty(QcCheckExecD.errorlevel))
{
var strs = QcCheckExecD.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
string[] strs = QcCheckExecD.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
Item.setData.errorlevel = new List<Error>();
foreach (var str in strs)
foreach (string str in strs)
{
Item.setData.errorlevel.Add(new Error { id = str, name = QcErrorLevels.Where(p => p.id == str).First().name! });
}
@@ -152,17 +165,22 @@ namespace Tnb.QcMgr
Item.setData.attachment = QcCheckExecD.attachment!;
Item.setData.customer = QcCheckExecD.custom!;
if (!string.IsNullOrEmpty(QcCheckExecD.isexec))
{
Item.setData.isexec = JSON.Deserialize<IsexecE>(QcCheckExecD.isexec!);
Item.setShow = new ExecItemShow();
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.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);
Item.setShow.customer = !string.IsNullOrEmpty(Item.setData.customer);
Item.setShow.isexec = Item.setData.isexec == null ? false : true;
}
Item.setShow = new ExecItemShow
{
extype = !string.IsNullOrEmpty(Item.setData.extype),
excontent = !string.IsNullOrEmpty(QcCheckExecD.excontent),
check = !string.IsNullOrEmpty(Item.setData.check),
errorcause = Item.setData.errorcause != null && (Item.setData.errorcause?.Count) != 0,
errorlevel = Item.setData.errorlevel != null && (Item.setData.errorlevel?.Count) != 0,
remark = !string.IsNullOrEmpty(Item.setData.remark),
attachment = !string.IsNullOrEmpty(Item.setData.attachment),
customer = !string.IsNullOrEmpty(Item.setData.customer),
isexec = Item.setData.isexec != null
};
CheckTaskOut.checktypes.Where(p => p.checktypeid == QcCheckExecD.typeid).First()?.items?.Add(Item);
}
return CheckTaskOut;
@@ -176,57 +194,68 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task SaveData(CheckTaskInput CheckTaskInput)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
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();
QcCheckExecH QcCheckExecH = await db.Queryable<QcCheckExecH>().Where(p => p.id == CheckTaskInput.mainid).FirstAsync();
DictionaryTypeEntity DictionaryType = await db.Queryable<DictionaryTypeEntity>().Where(p => p.FullName == "质检状态").FirstAsync();
DictionaryDataEntity 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;
QcCheckExecH.execuser = _userManager.UserId;
QcCheckExecH.exectime = DateTime.Now.ToString();
var QcCheckExecDs = await db.Queryable<QcCheckExecD>().Where(p => p.mainid == CheckTaskInput.mainid).ToListAsync();
var QcCheckExecDdel = new List<QcCheckExecD>();
var QcCheckExecDinsert = new List<QcCheckExecD>();
List<QcCheckExecD> QcCheckExecDs = await db.Queryable<QcCheckExecD>().Where(p => p.mainid == CheckTaskInput.mainid).ToListAsync();
List<QcCheckExecD> QcCheckExecDdel = new();
List<QcCheckExecD> QcCheckExecDinsert = new();
if (CheckTaskInput.checktypes?.Count > 0)
{
for (int i = 0; i < CheckTaskInput.checktypes.Count; i++)
{
if (CheckTaskInput.checktypes[i].Count > 0)
{
foreach (var exextype in CheckTaskInput.checktypes[i])
foreach (Exextype exextype in CheckTaskInput.checktypes[i])
{
if (exextype.items != null)
{
foreach (var item in exextype.items)
foreach (ExecItemInput item in exextype.items)
{
if (item.postItemForm == null)
{
throw Oops.Oh("执行失败");
var QcCheckExecD = QcCheckExecDs.Where(p => p.id == item.itemdid).FirstOrDefault();
}
QcCheckExecD? QcCheckExecD = QcCheckExecDs.Where(p => p.id == item.itemdid).FirstOrDefault();
if (QcCheckExecD == null)
{
continue;
}
if (QcCheckExecDdel.Where(p => p.id == QcCheckExecD.id).FirstOrDefault() == null)
{
QcCheckExecDdel.Add(QcCheckExecD);
var insert = new QcCheckExecD();
insert.mainid = QcCheckExecD.mainid;
insert.extype = QcCheckExecD.extype;
insert.excontent = QcCheckExecD.excontent;
insert.check = QcCheckExecD.check;
insert.errorcause = QcCheckExecD.errorcause;
insert.errorlevel = QcCheckExecD.errorlevel;
insert.remark = QcCheckExecD.remark;
insert.attachment = QcCheckExecD.attachment;
insert.isexec = QcCheckExecD.isexec;
insert.custom = QcCheckExecD.custom;
insert.typeid = QcCheckExecD.typeid;
insert.itemid = QcCheckExecD.itemid;
insert.create_id = QcCheckExecD.create_id;
insert.create_time = QcCheckExecD.create_time;
insert.postdata = item.postItemForm;
insert.result = item.result;
insert.checkindex = (i + 1).ToString();
}
QcCheckExecD insert = new()
{
mainid = QcCheckExecD.mainid,
extype = QcCheckExecD.extype,
excontent = QcCheckExecD.excontent,
check = QcCheckExecD.check,
errorcause = QcCheckExecD.errorcause,
errorlevel = QcCheckExecD.errorlevel,
remark = QcCheckExecD.remark,
attachment = QcCheckExecD.attachment,
isexec = QcCheckExecD.isexec,
custom = QcCheckExecD.custom,
typeid = QcCheckExecD.typeid,
itemid = QcCheckExecD.itemid,
create_id = QcCheckExecD.create_id,
create_time = QcCheckExecD.create_time,
postdata = item.postItemForm,
result = item.result,
checkindex = (i + 1).ToString()
};
QcCheckExecDinsert.Add(insert);
}
}
@@ -235,9 +264,9 @@ namespace Tnb.QcMgr
}
}
await db.Ado.BeginTranAsync();
await db.Updateable(QcCheckExecH).ExecuteCommandAsync();
await db.Deleteable(QcCheckExecDdel).ExecuteCommandAsync();
await db.Insertable(QcCheckExecDinsert).ExecuteCommandAsync();
_ = await db.Updateable(QcCheckExecH).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckExecDdel).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckExecDinsert).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
catch (Exception)
@@ -254,59 +283,67 @@ namespace Tnb.QcMgr
[HttpGet]
public async Task<dynamic> GetTaskResult(string id)
{
var db = _repository.AsSugarClient();
var QcCheckExecH = await db.Queryable<QcCheckExecH>().Where(p => p.id == id).FirstAsync();
var QcCheckExecDs = await db.Queryable<QcCheckExecD>().Where(p => p.mainid == id).ToListAsync();
var QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
var QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
var QcErrorCauses = await db.Queryable<QcErrorCause>().ToListAsync();
var QcErrorLevels = await db.Queryable<QcErrorLevel>().ToListAsync();
ISqlSugarClient db = _repository.AsSugarClient();
QcCheckExecH QcCheckExecH = await db.Queryable<QcCheckExecH>().Where(p => p.id == id).FirstAsync();
List<QcCheckExecD> QcCheckExecDs = await db.Queryable<QcCheckExecD>().Where(p => p.mainid == id).ToListAsync();
List<QcCheckItem> QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
List<QcCheckType> QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
List<QcErrorCause> QcErrorCauses = await db.Queryable<QcErrorCause>().ToListAsync();
List<QcErrorLevel> QcErrorLevels = await db.Queryable<QcErrorLevel>().ToListAsync();
Result Result = new Result();
Result.mainid = id;
Result.checknum = QcCheckExecH.checknum!;
Result.status = QcCheckExecH.status!;
Result.checktypes = new List<List<Checktype>>();
Result.result = QcCheckExecH.result;
var groupkeys = QcCheckExecDs.Select(p => p.checkindex).Distinct().ToList();
foreach (var key in groupkeys)
Result Result = new()
{
var QcCheckExecDsbykey = QcCheckExecDs.Where(p => p.checkindex == key).ToList();
var checktype = new List<Checktype>();
foreach (var QcCheckExecD in QcCheckExecDsbykey)
mainid = id,
checknum = QcCheckExecH.checknum!,
status = QcCheckExecH.status!,
checktypes = new List<List<Checktype>>(),
result = QcCheckExecH.result
};
List<string?> groupkeys = QcCheckExecDs.Select(p => p.checkindex).Distinct().ToList();
foreach (string? key in groupkeys)
{
List<QcCheckExecD> QcCheckExecDsbykey = QcCheckExecDs.Where(p => p.checkindex == key).ToList();
List<Checktype> checktype = new();
foreach (QcCheckExecD? QcCheckExecD in QcCheckExecDsbykey)
{
if (checktype.Where(p => p.checktypeid == QcCheckExecD.typeid).ToList().Count == 0)
{
Checktype checkType = new Checktype();
checkType.checktypeid = QcCheckExecD.typeid!;
checkType.checktypename = QcCheckTypes.Where(p => p.id == QcCheckExecD.typeid).First().name!;
checkType.items = new List<ExecItem>();
Checktype checkType = new()
{
checktypeid = QcCheckExecD.typeid!,
checktypename = QcCheckTypes.Where(p => p.id == QcCheckExecD.typeid).First().name!,
items = new List<ExecItem>()
};
checktype.Add(checkType);
}
ExecItem Item = new ExecItem();
Item.itemid = QcCheckExecD.itemid!;
Item.itemdid = QcCheckExecD.id!;
Item.code = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().code!;
Item.name = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().name!;
Item.result = QcCheckExecD.result;
Item.setData = new ExecItemData();
Item.setData.extype = QcCheckExecD.extype!;
Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckExecD.excontent!);
Item.setData.check = QcCheckExecD.check!;
ExecItem Item = new()
{
itemid = QcCheckExecD.itemid!,
itemdid = QcCheckExecD.id!,
code = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().code!,
name = QcCheckItems.Where(p => p.id == QcCheckExecD.itemid).First().name!,
result = QcCheckExecD.result,
setData = new ExecItemData
{
extype = QcCheckExecD.extype!,
excontent = JSON.Deserialize<Excontent>(QcCheckExecD.excontent!),
check = QcCheckExecD.check!
}
};
if (!string.IsNullOrEmpty(QcCheckExecD.errorcause))
{
var strs = QcCheckExecD.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
string[] strs = QcCheckExecD.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
Item.setData.errorcause = new List<Error>();
foreach (var str in strs)
foreach (string str in strs)
{
Item.setData.errorcause.Add(new Error { id = str, name = QcErrorCauses.Where(p => p.id == str).First().name! });
}
}
if (!string.IsNullOrEmpty(QcCheckExecD.errorlevel))
{
var strs = QcCheckExecD.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
string[] strs = QcCheckExecD.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
Item.setData.errorlevel = new List<Error>();
foreach (var str in strs)
foreach (string str in strs)
{
Item.setData.errorlevel.Add(new Error { id = str, name = QcErrorLevels.Where(p => p.id == str).First().name! });
}
@@ -315,19 +352,27 @@ namespace Tnb.QcMgr
Item.setData.attachment = QcCheckExecD.attachment!;
Item.setData.customer = QcCheckExecD.custom!;
if (!string.IsNullOrEmpty(QcCheckExecD.isexec))
{
Item.setData.isexec = JSON.Deserialize<IsexecE>(QcCheckExecD.isexec!);
Item.setShow = new ExecItemShow();
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?.Count == 0 ? false : true;
Item.setShow.errorlevel = Item.setData.errorlevel?.Count == 0 ? 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);
Item.setShow.isexec = Item.setData.isexec == null ? false : true;
}
Item.setShow = new ExecItemShow
{
extype = !string.IsNullOrEmpty(Item.setData.extype),
excontent = !string.IsNullOrEmpty(QcCheckExecD.excontent),
check = !string.IsNullOrEmpty(Item.setData.check),
errorcause = (Item.setData.errorcause?.Count) != 0,
errorlevel = (Item.setData.errorlevel?.Count) != 0,
remark = !string.IsNullOrEmpty(Item.setData.remark),
attachment = !string.IsNullOrEmpty(Item.setData.attachment),
customer = !string.IsNullOrEmpty(Item.setData.customer),
isexec = Item.setData.isexec != null
};
if (!string.IsNullOrEmpty(QcCheckExecD.postdata))
{
Item.postItemForm = JSON.Deserialize<PostItemForm>(QcCheckExecD.postdata!);
}
checktype.Where(p => p.checktypeid == QcCheckExecD.typeid).First()?.items?.Add(Item);
}
Result.checktypes.Add(checktype);
@@ -339,51 +384,55 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task CreateTaskData(CheckTaskData checkTaskData)
{
var db = _repository.AsSugarClient();
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 QcCheckExecH = new QcCheckExecH();
QcCheckExecH.checktype = checkTaskData.checktype;
QcCheckExecH.materialid = checkTaskData.materialid;
QcCheckExecH.processid = checkTaskData.processid;
QcCheckExecH.workid = checkTaskData.workid;
QcCheckExecH.wareid = checkTaskData.wareid;
QcCheckExecH.status = DictionaryData.Id;
QcCheckExecH.tasktime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
QcCheckExecH.create_id = _userManager.UserId;
QcCheckExecH.create_time = DateTime.Now;
List<QcCheckExecD> QcCheckExecDs = new List<QcCheckExecD>();
ISqlSugarClient db = _repository.AsSugarClient();
DictionaryTypeEntity DictionaryType = await db.Queryable<DictionaryTypeEntity>().Where(p => p.FullName == "质检状态").FirstAsync();
DictionaryDataEntity DictionaryData = await db.Queryable<DictionaryDataEntity>().Where(p => p.DictionaryTypeId == DictionaryType.Id && p.FullName == "待执行").FirstAsync();
QcCheckExecH QcCheckExecH = new()
{
checktype = checkTaskData.checktype,
materialid = checkTaskData.materialid,
processid = checkTaskData.processid,
workid = checkTaskData.workid,
wareid = checkTaskData.wareid,
status = DictionaryData.Id,
tasktime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
create_id = _userManager.UserId,
create_time = DateTime.Now
};
List<QcCheckExecD> QcCheckExecDs = new();
if (checkTaskData.checktypes != null)
{
foreach (var checktype in checkTaskData.checktypes)
foreach (CheckTaskDataInput checktype in checkTaskData.checktypes)
{
if (checktype.items != null)
{
foreach (var item in checktype.items)
foreach (TaskItemInput item in checktype.items)
{
QcCheckExecD QcCheckExecD = new QcCheckExecD();
QcCheckExecD.mainid = QcCheckExecH.id;
QcCheckExecD.typeid = checktype.id;
QcCheckExecD.itemid = item.itemid;
QcCheckExecD.extype = item.extype;
QcCheckExecD.excontent = item.excontent;
QcCheckExecD.check = item.check;
QcCheckExecD.errorcause = item.errorcause?.Replace("\"", "").Trim();
QcCheckExecD.errorlevel = item.errorlevel?.Replace("\"", "").Trim();
QcCheckExecD.remark = item.remark;
QcCheckExecD.attachment = item.attachment;
QcCheckExecD.isexec = item.isexec;
QcCheckExecD.custom = item.customer;
QcCheckExecD.create_id = _userManager.UserId;
QcCheckExecD.create_time = DateTime.Now;
QcCheckExecD QcCheckExecD = new()
{
mainid = QcCheckExecH.id,
typeid = checktype.id,
itemid = item.itemid,
extype = item.extype,
excontent = item.excontent,
check = item.check,
errorcause = item.errorcause?.Replace("\"", "").Trim(),
errorlevel = item.errorlevel?.Replace("\"", "").Trim(),
remark = item.remark,
attachment = item.attachment,
isexec = item.isexec,
custom = item.customer,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
QcCheckExecDs.Add(QcCheckExecD);
}
}
}
}
await db.Ado.BeginTranAsync();
await db.Insertable(QcCheckExecH).ExecuteCommandAsync();
await db.Insertable(QcCheckExecDs).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckExecH).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckExecDs).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}

8
QcMgr/Tnb.QcMgr/QcCheckTypeService.cs
View File

@@ -41,13 +41,13 @@ namespace Tnb.QcMgr
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
var data = await _runService.GetListResult(templateEntity, input);
JNPF.Common.Filter.PageResult<Dictionary<string, object>> data = await _runService.GetListResult(templateEntity, input);
if (data?.list?.Count > 0)
{
var items = await db.Queryable<QcCheckItem>().ToListAsync();
foreach (var row in data.list)
List<QcCheckItem> items = await db.Queryable<QcCheckItem>().ToListAsync();
foreach (Dictionary<string, object> row in data.list)
{
row["inspection_items"] = string.Join(",", items.Where(p => p.type == row["id"].ToString()).Select(p => p.name).ToList());
}

288
QcMgr/Tnb.QcMgr/QcSpcService.cs
View File

@@ -31,17 +31,19 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task<dynamic> GetSpcItems(string id)
{
var datas = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
List<SpcDataInput> SpcDataInputs = new List<SpcDataInput>();
List<QcSpcD> datas = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
List<SpcDataInput> SpcDataInputs = new();
datas.ForEach(p =>
{
SpcDataInput SpcDataInput = new SpcDataInput();
SpcDataInput.mainid = p.mainid;
SpcDataInput.checktime = p.checktime;
SpcDataInput.batch = p.batch;
SpcDataInput.data = Array.ConvertAll(p.data!.Split(","), float.Parse);
SpcDataInput.checknum = p.checknum;
SpcDataInput.defectivenum = p.defectivenum;
SpcDataInput SpcDataInput = new()
{
mainid = p.mainid,
checktime = p.checktime,
batch = p.batch,
data = Array.ConvertAll(p.data!.Split(","), float.Parse),
checknum = p.checknum,
defectivenum = p.defectivenum
};
SpcDataInputs.Add(SpcDataInput);
});
return SpcDataInputs;
@@ -54,29 +56,34 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task SaveData(List<SpcDataInput> SpcDataInput)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
try
{
if (!string.IsNullOrEmpty(SpcDataInput.First().mainid))
await db.Deleteable<QcSpcD>(p => p.mainid == SpcDataInput.First().mainid).ExecuteCommandAsync();
List<QcSpcD> QcSpcDs = new List<QcSpcD>();
{
_ = await db.Deleteable<QcSpcD>(p => p.mainid == SpcDataInput.First().mainid).ExecuteCommandAsync();
}
List<QcSpcD> QcSpcDs = new();
SpcDataInput.ForEach(p =>
{
QcSpcD QcSpcD = new QcSpcD();
QcSpcD.mainid = p.mainid;
QcSpcD.checktime = p.checktime;
QcSpcD.batch = p.batch;
QcSpcD.data = string.Join(",", p.data);
QcSpcD.checknum = p.checknum;
QcSpcD.defectivenum = p.defectivenum;
QcSpcD.create_id = _userManager.UserId;
QcSpcD.create_time = DateTime.Now;
QcSpcD QcSpcD = new()
{
mainid = p.mainid,
checktime = p.checktime,
batch = p.batch,
data = string.Join(",", p.data),
checknum = p.checknum,
defectivenum = p.defectivenum,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
QcSpcDs.Add(QcSpcD);
});
await db.Ado.BeginTranAsync();
await db.Insertable(QcSpcDs).ExecuteCommandAsync();
_ = await db.Insertable(QcSpcDs).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
catch (Exception)
@@ -91,41 +98,47 @@ namespace Tnb.QcMgr
/// <param name="id"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetSpcData(string id)
public async Task<dynamic?> GetSpcData(string id)
{
var QcSpcH = await _repository.AsSugarClient().Queryable<QcSpcH>().Where(p => p.id == id).FirstAsync();
var QcSpcDs = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
var cinfigs = await _repository.AsSugarClient().Queryable<QcSpcConfig>().ToListAsync();
QcSpcH QcSpcH = await _repository.AsSugarClient().Queryable<QcSpcH>().Where(p => p.id == id).FirstAsync();
List<QcSpcD> QcSpcDs = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
List<QcSpcConfig> cinfigs = await _repository.AsSugarClient().Queryable<QcSpcConfig>().ToListAsync();
if (QcSpcH.graphtype == "X-R控制图")
{
XRchart XRchart = new XRchart();
XRchart.xcharts = new List<XRxchart>();
XRchart.rcharts = new List<XRrchart>();
foreach (var QcSpcD in QcSpcDs)
XRchart XRchart = new()
{
xcharts = new List<XRxchart>(),
rcharts = new List<XRrchart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XRxchart xchart = new XRxchart();
xchart.x = datas.Average();
xchart.jc = datas.Max() - datas.Min();
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XRrchart rchart = new XRrchart();
rchart.r = datas.Max() - datas.Min();
XRxchart xchart = new()
{
x = datas.Average(),
jc = datas.Max() - datas.Min(),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
XRrchart rchart = new()
{
r = datas.Max() - datas.Min()
};
XRchart.xcharts.Add(xchart);
XRchart.rcharts.Add(rchart);
}
var xAverage = XRchart.xcharts.Select(p => p.x).Average();
var num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? xAverage = XRchart.xcharts.Select(p => p.x).Average();
float? num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
XRchart.xcharts.ForEach(p =>
{
p.uclx = xAverage + num;
p.clx = xAverage;
p.lclx = xAverage - num;
});
var D4 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var D3 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var rAverage = XRchart.rcharts.Select(p => p.r).Average();
float? D4 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? D3 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? rAverage = XRchart.rcharts.Select(p => p.r).Average();
XRchart.rcharts.ForEach(p =>
{
p.uclr = rAverage * D4;
@@ -136,34 +149,40 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "X-S控制图")
{
XSchart XSchart = new XSchart();
XSchart.xcharts = new List<XSxchart>();
XSchart.scharts = new List<XSschart>();
foreach (var QcSpcD in QcSpcDs)
XSchart XSchart = new()
{
xcharts = new List<XSxchart>(),
scharts = new List<XSschart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XSxchart xchart = new XSxchart();
xchart.x = datas.Average();
xchart.bzc = CalculateStdDev(datas);
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XSschart schart = new XSschart();
schart.s = CalculateStdDev(datas);
XSxchart xchart = new()
{
x = datas.Average(),
bzc = CalculateStdDev(datas),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
XSschart schart = new()
{
s = CalculateStdDev(datas)
};
XSchart.xcharts.Add(xchart);
XSchart.scharts.Add(schart);
}
var xAverage = XSchart.xcharts.Select(p => p.x).Average();
var num = XSchart.xcharts.Select(p => p.bzc).Average() * cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "A3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? xAverage = XSchart.xcharts.Select(p => p.x).Average();
float? num = XSchart.xcharts.Select(p => p.bzc).Average() * cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "A3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
XSchart.xcharts.ForEach(p =>
{
p.uclx = xAverage + num;
p.clx = xAverage;
p.lclx = xAverage - num;
});
var B4 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var B3 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var sAverage = XSchart.scharts.Select(p => p.s).Average();
float? B4 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? B3 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? sAverage = XSchart.scharts.Select(p => p.s).Average();
XSchart.scharts.ForEach(p =>
{
p.ucls = sAverage * B4;
@@ -174,34 +193,40 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "X中位数-R图")
{
XRchart XRchart = new XRchart();
XRchart.xcharts = new List<XRxchart>();
XRchart.rcharts = new List<XRrchart>();
foreach (var QcSpcD in QcSpcDs)
XRchart XRchart = new()
{
xcharts = new List<XRxchart>(),
rcharts = new List<XRrchart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XRxchart xchart = new XRxchart();
xchart.x = CalculateMedian(datas);
xchart.jc = datas.Max() - datas.Min();
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XRrchart rchart = new XRrchart();
rchart.r = datas.Max() - datas.Min();
XRxchart xchart = new()
{
x = CalculateMedian(datas),
jc = datas.Max() - datas.Min(),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
XRrchart rchart = new()
{
r = datas.Max() - datas.Min()
};
XRchart.xcharts.Add(xchart);
XRchart.rcharts.Add(rchart);
}
var xAverage = XRchart.xcharts.Select(p => p.x).Average();
var num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? xAverage = XRchart.xcharts.Select(p => p.x).Average();
float? num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
XRchart.xcharts.ForEach(p =>
{
p.uclx = xAverage + num;
p.clx = xAverage;
p.lclx = xAverage - num;
});
var D4 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var D3 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var rAverage = XRchart.rcharts.Select(p => p.r).Average();
float? D4 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? D3 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? rAverage = XRchart.rcharts.Select(p => p.r).Average();
XRchart.rcharts.ForEach(p =>
{
p.uclr = rAverage * D4;
@@ -212,27 +237,33 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "X-MR控制图")
{
XMRchart XMRchart = new XMRchart();
XMRchart.xmrxcharts = new List<XMRxchart>();
XMRchart.xmrmrcharts = new List<XMRmrschart>();
foreach (var QcSpcD in QcSpcDs)
XMRchart XMRchart = new()
{
xmrxcharts = new List<XMRxchart>(),
xmrmrcharts = new List<XMRmrschart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XMRxchart xchart = new XMRxchart();
xchart.x = datas.Average();
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XMRxchart xchart = new()
{
x = datas.Average(),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
if (XMRchart.xmrxcharts.Count > 0)
{
XMRmrschart rchart = new XMRmrschart();
rchart.mr = Math.Abs((float)(xchart.x - XMRchart.xmrxcharts.Last().x)!);
XMRmrschart rchart = new()
{
mr = Math.Abs((float)(xchart.x - XMRchart.xmrxcharts.Last().x)!)
};
XMRchart.xmrmrcharts.Add(rchart);
}
XMRchart.xmrxcharts.Add(xchart);
}
var xAverage = XMRchart.xmrxcharts.Select(p => p.x).Average();
var mrAverage = XMRchart.xmrmrcharts.Select(p => p.mr).Average();
float? xAverage = XMRchart.xmrxcharts.Select(p => p.x).Average();
float? mrAverage = XMRchart.xmrmrcharts.Select(p => p.mr).Average();
XMRchart.xmrxcharts.ForEach(p =>
{
p.uclx = xAverage + (float)(2.66 * mrAverage)!;
@@ -249,17 +280,19 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "P图")
{
List<Pchart> pcharts = new List<Pchart>();
foreach (var QcSpcD in QcSpcDs)
List<Pchart> pcharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
Pchart pchart = new Pchart();
pchart.p = QcSpcD.defectivenum / QcSpcD.checknum;
pchart.n = QcSpcD.checknum;
Pchart pchart = new()
{
p = QcSpcD.defectivenum / QcSpcD.checknum,
n = QcSpcD.checknum
};
pcharts.Add(pchart);
}
var pAverage = (pcharts.Select(p => p.n * p.p).Sum()) / (pcharts.Select(p => p.n).Sum());
var nAverage = pcharts.Select(p => p.n).Average();
float? pAverage = pcharts.Select(p => p.n * p.p).Sum() / pcharts.Select(p => p.n).Sum();
float? nAverage = pcharts.Select(p => p.n).Average();
pcharts.ForEach(p =>
{
p.cl = pAverage;
@@ -270,16 +303,18 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "U图")
{
List<Uchart> ucharts = new List<Uchart>();
foreach (var QcSpcD in QcSpcDs)
List<Uchart> ucharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
Uchart uchart = new Uchart();
uchart.u = QcSpcD.defectivenum / QcSpcD.checknum;
uchart.n = QcSpcD.checknum;
Uchart uchart = new()
{
u = QcSpcD.defectivenum / QcSpcD.checknum,
n = QcSpcD.checknum
};
ucharts.Add(uchart);
}
var uAverage = (ucharts.Select(p => p.u).Sum()) / (ucharts.Count());
var nAverage = ucharts.Select(p => p.n).Average();
float? uAverage = ucharts.Select(p => p.u).Sum() / ucharts.Count();
float? nAverage = ucharts.Select(p => p.n).Average();
ucharts.ForEach(p =>
{
p.cl = uAverage;
@@ -290,15 +325,17 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "nP图")
{
List<NPchart> npcharts = new List<NPchart>();
foreach (var QcSpcD in QcSpcDs)
List<NPchart> npcharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
NPchart npchart = new NPchart();
npchart.np = QcSpcD.defectivenum;
NPchart npchart = new()
{
np = QcSpcD.defectivenum
};
npcharts.Add(npchart);
}
var npAverage = (npcharts.Select(p => p.np).Sum()) / (npcharts.Count());
var pAverage = npcharts.Select(p => p.np).Sum() / (npcharts.Count() * QcSpcH.subcapacity);
float? npAverage = npcharts.Select(p => p.np).Sum() / npcharts.Count();
float? pAverage = npcharts.Select(p => p.np).Sum() / (npcharts.Count() * QcSpcH.subcapacity);
npcharts.ForEach(p =>
{
p.cl = npAverage;
@@ -309,14 +346,16 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "C图")
{
List<Cchart> ccharts = new List<Cchart>();
foreach (var QcSpcD in QcSpcDs)
List<Cchart> ccharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
Cchart cchart = new Cchart();
cchart.c = QcSpcD.defectivenum;
Cchart cchart = new()
{
c = QcSpcD.defectivenum
};
ccharts.Add(cchart);
}
var cAverage = (ccharts.Select(p => p.c).Sum()) / (ccharts.Count());
float? cAverage = ccharts.Select(p => p.c).Sum() / ccharts.Count();
ccharts.ForEach(p =>
{
p.cl = cAverage;
@@ -346,25 +385,20 @@ namespace Tnb.QcMgr
private static float CalculateMedian(IEnumerable<float> values)
{
float ret = 0;
var floats = values.OrderBy(d => d).ToArray();
if (floats.Count() % 2 == 0)
{
ret = (floats[floats.Count() / 2 - 1] + floats[(floats.Count() + 2) / 2 - 1]) / 2;
}
else
{
ret = floats[(floats.Count() + 1) / 2 - 1];
}
float[] floats = values.OrderBy(d => d).ToArray();
ret = floats.Count() % 2 == 0
? (floats[(floats.Count() / 2) - 1] + floats[((floats.Count() + 2) / 2) - 1]) / 2
: floats[((floats.Count() + 1) / 2) - 1];
return ret;
}
//移动极差平均值计算
private static float CalculateMovRange(IEnumerable<float> values)
{
List<float> floats = new List<float>();
var arr = values.ToArray();
List<float> floats = new();
float[] arr = values.ToArray();
for (int i = 0; i < arr.Length - 1; i++)
{
floats.Add(Math.Abs((arr[i + 1] - arr[i])));
floats.Add(Math.Abs(arr[i + 1] - arr[i]));
}
return floats.Average();
}